6.12bug修正

@@ -340,6 +340,8 @@ public class TblTradePriceInquiryController {
      */
      */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        SimpleDateFormat sft = new SimpleDateFormat("yyyy-MM-dd");
+
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Iterator<String> fileNames = multipartRequest.getFileNames();
         Iterator<String> fileNames = multipartRequest.getFileNames();
         while (fileNames.hasNext()) {
         while (fileNames.hasNext()) {
@@ -387,7 +389,7 @@ public class TblTradePriceInquiryController {
 
 
                         tblTradeBidSubInfo.setBidTotalPrice(new BigDecimal(cellTypeToString(row.getCell(10)))); // 总价（不含税，元）
                         tblTradeBidSubInfo.setBidTotalPrice(new BigDecimal(cellTypeToString(row.getCell(10)))); // 总价（不含税，元）
                         tblTradeBidSubService.updateById(tblTradeBidSubInfo);
                         tblTradeBidSubService.updateById(tblTradeBidSubInfo);
-
+                        TblTradeBidSub tblTradeBidSub = tblTradeBidSubService.getById(tblTradeBidSubInfo.getId());
 
 
 
 
 //                        TblTradeBidMaterialDetails materialInfo = new TblTradeBidMaterialDetails();
 //                        TblTradeBidMaterialDetails materialInfo = new TblTradeBidMaterialDetails();
@@ -431,6 +433,15 @@ public class TblTradePriceInquiryController {
 
 
                         TblTradeBidMaterialDetails materialInfo = new TblTradeBidMaterialDetails();
                         TblTradeBidMaterialDetails materialInfo = new TblTradeBidMaterialDetails();
                         try {
                         try {
+                            QueryWrapper<TblTradeTenderInfo> infoQueryWrapper = new QueryWrapper<>();
+                            infoQueryWrapper.eq("code", materialCode)
+                                    .eq("xjbswjh", projectNumber);
+                            TblTradeTenderInfo tradeTenderInfo = tblTradeTenderInfoService.getOne(infoQueryWrapper);
+                            if (tradeTenderInfo != null) {
+
+                                String format = sft.format(tradeTenderInfo.getXqjhq());
+                                materialInfo.setRequiredDeliveryTime(format); // 需求交货期
+                            }
                             // 设置标段（包）名称，处理可能的空单元格
                             // 设置标段（包）名称，处理可能的空单元格
                             materialInfo.setPackageName(cellTypeToString(row.getCell(1)));
                             materialInfo.setPackageName(cellTypeToString(row.getCell(1)));
 
 

@@ -2,9 +2,11 @@ package org.jeecg.modules.erp.trade.service.impl;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.erp.trade.entity.*;
 import org.jeecg.modules.erp.trade.entity.*;
 import org.jeecg.modules.erp.trade.mapper.TblTradeInquiryInfoMapper;
 import org.jeecg.modules.erp.trade.mapper.TblTradeInquiryInfoMapper;
 import org.jeecg.modules.erp.trade.mapper.TblTradeBidSubMapper;
 import org.jeecg.modules.erp.trade.mapper.TblTradeBidSubMapper;
@@ -57,6 +59,17 @@ public class TblTradeBidSubServiceImpl extends ServiceImpl<TblTradeBidSubMapper,
 		// 投标审核状态：0-询价中、1-询价完成、2-投标待审核、3-投标审核完成
 		// 投标审核状态：0-询价中、1-询价完成、2-投标待审核、3-投标审核完成
 		tblTradeBidSub.setStatus("2");
 		tblTradeBidSub.setStatus("2");
 		tblTradeBidSubMapper.updateById(tblTradeBidSub);
 		tblTradeBidSubMapper.updateById(tblTradeBidSub);
+		// 修改综合管理的响应品牌，响应单价，税率
+		if (StringUtils.isNotBlank(tblTradeBidSub.getXjbswjh()) && StringUtils.isNotBlank(tblTradeBidSub.getWlbm())){
+			UpdateWrapper<TblTradeTenderInfo> updateWrapper = new UpdateWrapper<>();
+			updateWrapper.eq("xjbswjh", tblTradeBidSub.getXjbswjh())
+					.eq("code",tblTradeBidSub.getWlbm());
+			TblTradeTenderInfo tblTradeTenderInfo = new TblTradeTenderInfo();
+			tblTradeTenderInfo.setXypp(tblTradeBidSub.getXypp());
+			tblTradeTenderInfo.setXydj(tblTradeBidSub.getXydj());
+			tblTradeTenderInfo.setSl(tblTradeBidSub.getSl());
+			tblTradeTenderInfoMapper.update(tblTradeTenderInfo,updateWrapper);
+		}
 
 
 	}
 	}