bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/domain/vo/XzdBiddingDocumentVo.java

@@ -68,6 +68,12 @@ public class XzdBiddingDocumentVo implements Serializable {
     @ExcelProperty(value = "项目名称")
     private String projectName;
 
+    /**
+     * 项目名称
+     */
+    @ExcelProperty(value = "项目名称")
+    private String projectNames;
+
     /**
      * 项目类型ID
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/biddingDocumentList/service/impl/XzdBiddingDocumentServiceImpl.java

@@ -15,6 +15,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.XzdBidPreProject;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.QuerListXzdBidPreVo;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.service.IXzdBidPreProjectService;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjBusinessBid;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdTbwjTechnicalBid;
@@ -70,6 +74,8 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
 
     private final IXzdProjectTypeService xzdProjectTypeService;
 
+    private final XzdBidPreProjectMapper xzdBidPreProjectMapper;
+
     /**
      * 查询投标文件
      *
@@ -86,6 +92,7 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
         List<XzdTbwjZsyq> xzdTbwjZsyqs = iXzdTbwjZsyqService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdTbwjZsyq>().eq(XzdTbwjZsyq::getMasterId, id));
 
 
+        getName(xzdBiddingDocumentVo);
         bylist.setXzdBiddingDocument(xzdBiddingDocumentVo);
         bylist.setXzdTbwjTechnicalBidVo(xzdTbwjTechnicalBid);
         bylist.setXzdTbwjBusinessBidVo(xzdTbwjBusinessBid);
@@ -120,6 +127,13 @@ public class XzdBiddingDocumentServiceImpl extends ServiceImpl<XzdBiddingDocumen
                     xzdBiddingDocumentVo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
                 }
             }
+            String projectName = xzdBiddingDocumentVo.getProjectName();
+            if (StringUtils.isNotBlank(projectName)){
+                XzdBidPreProjectVo xzdBidPreProjectVo = xzdBidPreProjectMapper.selectVoById(Long.parseLong(projectName));
+                if (xzdBidPreProjectVo != null){
+                    xzdBiddingDocumentVo.setProjectNames(xzdBidPreProjectVo.getProjectName());
+                }
+            }
         }
 
     }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/domain/vo/XzdPostBidAnalysisVo.java

@@ -56,6 +56,13 @@ public class XzdPostBidAnalysisVo implements Serializable {
     @ExcelProperty(value = "项目名称")
     private String projectName;
 
+
+    /**
+     * 项目名称
+     */
+    @ExcelProperty(value = "项目名称")
+    private String projectNames;
+
     /**
      * 工程造价(万元)
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/biddingManagement/postAnalysis/service/impl/XzdPostBidAnalysisServiceImpl.java

@@ -13,7 +13,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.utils.BatchNumberGenerator;
 import org.dromara.system.service.impl.SysOssServiceImpl;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo;
+import org.dromara.xzd.biddingManagement.biaoqianlixiang.mapper.XzdBidPreProjectMapper;
 import org.dromara.xzd.biddingManagement.biddingDocumentList.domain.XzdBiddingDocument;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdBhfxDwpm;
 import org.dromara.xzd.biddingManagement.postAnalysis.domain.XzdPostBidAnalysis;
@@ -24,6 +27,7 @@ import org.dromara.xzd.biddingManagement.postAnalysis.domain.vo.XzdPostBidAnalys
 import org.dromara.xzd.biddingManagement.postAnalysis.mapper.XzdPostBidAnalysisMapper;
 import org.dromara.xzd.biddingManagement.postAnalysis.service.IXzdBhfxDwpmService;
 import org.dromara.xzd.biddingManagement.postAnalysis.service.IXzdPostBidAnalysisService;
+import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
 import org.dromara.xzd.settlement.domain.vo.XzdJsCgJungonVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
@@ -50,6 +54,8 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
     @Autowired
     private SysOssServiceImpl sysOssService;
 
+    private final XzdBidPreProjectMapper xzdBidPreProjectMapper;
+
     /**
      * 查询标后分析
      *
@@ -61,6 +67,8 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
         XzdPostBidAnalysisVo vo = baseMapper.selectVoById(id);
         List<XzdBhfxDwpm> xzdBhfxDwpms = xzdBhfxDwpmService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdBhfxDwpm>().eq(XzdBhfxDwpm::getMasterId, id).orderByAsc(XzdBhfxDwpm::getRanking));
         vo.setPm(MapstructUtils.convert(xzdBhfxDwpms, XzdBhfxDwpmVo.class));
+        getName( vo);
+
         return vo;
     }
 
@@ -75,9 +83,23 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
     public TableDataInfo<XzdPostBidAnalysisVo> queryPageList(XzdPostBidAnalysisBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<XzdPostBidAnalysis> lqw = buildQueryWrapper(bo);
         Page<XzdPostBidAnalysisVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::getName);
         return TableDataInfo.build(result);
     }
 
+    private void getName(XzdPostBidAnalysisVo xzdPostBidAnalysisVo) {
+
+        if (xzdPostBidAnalysisVo != null){
+            String projectName = xzdPostBidAnalysisVo.getProjectName();
+            if (StringUtils.isNotBlank(projectName)){
+                XzdBidPreProjectVo xzdBidPreProjectVo = xzdBidPreProjectMapper.selectVoById(Long.parseLong(projectName));
+                if (xzdBidPreProjectVo != null){
+                    xzdPostBidAnalysisVo.setProjectNames(xzdBidPreProjectVo.getProjectName());
+                }
+            }
+        }
+    }
+
     /**
      * 查询符合条件的标后分析列表
      *
@@ -124,6 +146,9 @@ public class XzdPostBidAnalysisServiceImpl extends ServiceImpl<XzdPostBidAnalysi
     @Override
     public Boolean insertByBo(XzdPostBidAnalysisBo bo) {
         XzdPostBidAnalysis add = MapstructUtils.convert(bo, XzdPostBidAnalysis.class);
+        String banBen = BatchNumberGenerator.generateBatchNumber("BHFX-");
+        add.setProjectCode(banBen);
+
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         List<XzdBhfxDwpmBo> pm = bo.getPm();