历史表

purchase-common/src/main/java/com/ozs/common/enums/SysFileRefEnum.java

@@ -20,7 +20,7 @@ public enum SysFileRefEnum {
     PM_ANNOUNCEMENT_FILE(9, "公告文件"),
     PM_BID_WINNING_FILE(10, "中标文件"),
     PM_BID_FAILURE_FILE(11, "流标文件"),
-    PM_BID_CALL_QEUSTION_FILE(12, "质疑文件"),
+    PM_BID_CALL_QEUSTION_FILE(12, "标后质疑文件"),
     PM_BID_WINNING_NOTIFICATION(13, "中标通知书"),
     PM_CONTRACT_INFO(14, "合同信息附件"),
     PM_PROJECT_CONSTRUCTION(15, "建设文档附件"),

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinningOpeningRef.java

@@ -37,16 +37,18 @@ public class PmBidWinningOpeningRef implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-
     @ApiModelProperty("中标ID")
     @TableField("WINNING_ID")
     private Long winningId;
 
-
     @ApiModelProperty("开标ID")
     @TableField("OPENING_ID")
     private Long openingId;
 
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
+    private Long demandId;
+
     @ApiModelProperty("状态：0正常，1被替换，2被质疑流标")
     @TableField("STATUS")
     private String status;

purchase-system/src/main/java/com/ozs/pm/doman/PmBidWinningOpeningRefHis.java

@@ -41,7 +41,6 @@ public class PmBidWinningOpeningRefHis implements Serializable {
     @TableField("ID")
     private Long id;
 
-
     @ApiModelProperty("中标ID")
     @TableField("WINNING_ID")
     private Long winningId;
@@ -51,6 +50,9 @@ public class PmBidWinningOpeningRefHis implements Serializable {
     @TableField("OPENING_ID")
     private Long openingId;
 
+    @ApiModelProperty("需求ID")
+    @TableField("DEMAND_ID")
+    private Long demandId;
 
     @ApiModelProperty("状态：0正常，1被替换，2被质疑流标")
     @TableField("STATUS")

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandHisServiceImpl.java

@@ -348,37 +348,77 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                         sysFileRefService.updateBatchById(fileRefs);
                     }
 
-                    //8中标开标关联表
-                    LambdaQueryWrapper<PmBidWinningOpeningRef> pmBidWinningOpeningRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                    pmBidWinningOpeningRefLambdaQueryWrapper.eq(PmBidWinningOpeningRef::getWinningId,pmBidWinningDb.getId());
-                    List<PmBidWinningOpeningRef> pmBidWinningOpeningRefDbList = this.pmBidWinningOpeningRefService.list(pmBidWinningOpeningRefLambdaQueryWrapper);
-                    if(!ObjectUtils.isEmpty(pmBidWinningOpeningRefDbList)) {
-                        LambdaQueryWrapper<PmBidWinningOpeningRefHis> pmBidWinningOpeningRefHisLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                        pmBidWinningOpeningRefHisLambdaQueryWrapper.eq(PmBidWinningOpeningRefHis::getWinningId,demandId)
-                                .orderByDesc(PmBidWinningOpeningRefHis::getReturnOrderNumber).last(" limit 1");
-                        PmBidWinningOpeningRefHis pmBidWinningOpeningRefHisDb = this.pmBidWinningOpeningRefHisService.getOne(pmBidWinningOpeningRefHisLambdaQueryWrapper);
-
-                        for(PmBidWinningOpeningRef pmBidWinningOpeningRefDb : pmBidWinningOpeningRefDbList) {
-                            PmBidWinningOpeningRefHis pmBidWinningOpeningRefHis = new PmBidWinningOpeningRefHis();
-                            BeanUtils.copyProperties(pmBidWinningOpeningRefDb,pmBidWinningOpeningRefHis);
-
-                            if(pmBidWinningOpeningRefHisDb != null){
-                                pmBidWinningOpeningRefHis.setReturnOrderNumber(pmBidWinningOpeningRefHisDb.getReturnOrderNumber() + 1);
-                            } else {
-                                pmBidWinningOpeningRefHis.setReturnOrderNumber(1);
-                            }
-                            if(this.pmBidWinningOpeningRefHisService.save(pmBidWinningOpeningRefHis)){
-                                this.pmBidWinningOpeningRefService.removeById(pmBidWinningOpeningRefDb.getId());
-                            }
-                        }
-                    }
-
                     this.pmBidWinningService.removeById(pmBidWinningDb.getId());
                 }
             }
         }
 
+        //8中标开标关联表
+        LambdaQueryWrapper<PmBidWinningOpeningRef> pmBidWinningOpeningRefLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidWinningOpeningRefLambdaQueryWrapper.eq(PmBidWinningOpeningRef::getDemandId,demandId);
+        List<PmBidWinningOpeningRef> pmBidWinningOpeningRefDbList = this.pmBidWinningOpeningRefService.list(pmBidWinningOpeningRefLambdaQueryWrapper);
+        if(!ObjectUtils.isEmpty(pmBidWinningOpeningRefDbList)) {
+            LambdaQueryWrapper<PmBidWinningOpeningRefHis> pmBidWinningOpeningRefHisLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            pmBidWinningOpeningRefHisLambdaQueryWrapper.eq(PmBidWinningOpeningRefHis::getDemandId,demandId)
+                    .orderByDesc(PmBidWinningOpeningRefHis::getReturnOrderNumber).last(" limit 1");
+            PmBidWinningOpeningRefHis pmBidWinningOpeningRefHisDb = this.pmBidWinningOpeningRefHisService.getOne(pmBidWinningOpeningRefHisLambdaQueryWrapper);
+
+            for(PmBidWinningOpeningRef pmBidWinningOpeningRefDb : pmBidWinningOpeningRefDbList) {
+                PmBidWinningOpeningRefHis pmBidWinningOpeningRefHis = new PmBidWinningOpeningRefHis();
+                BeanUtils.copyProperties(pmBidWinningOpeningRefDb,pmBidWinningOpeningRefHis);
+
+                if(pmBidWinningOpeningRefHisDb != null){
+                    pmBidWinningOpeningRefHis.setReturnOrderNumber(pmBidWinningOpeningRefHisDb.getReturnOrderNumber() + 1);
+                } else {
+                    pmBidWinningOpeningRefHis.setReturnOrderNumber(1);
+                }
+                if(this.pmBidWinningOpeningRefHisService.save(pmBidWinningOpeningRefHis)){
+                    this.pmBidWinningOpeningRefService.removeById(pmBidWinningOpeningRefDb.getId());
+                }
+            }
+        }
 
+        //9流标基本情况表
+        LambdaQueryWrapper<PmBidFailure> pmBidFailureLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmBidFailureLambdaQueryWrapper.eq(PmBidFailure::getDemandId,demandId);
+        List<PmBidFailure> pmBidFailureDbList = this.pmBidFailureService.list(pmBidFailureLambdaQueryWrapper);
+        if(!ObjectUtils.isEmpty(pmBidFailureDbList)) {
+            LambdaQueryWrapper<PmBidFailureHis> pmBidFailureHisLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            pmBidFailureHisLambdaQueryWrapper.eq(PmBidFailureHis::getDemandId,demandId)
+                    .orderByDesc(PmBidFailureHis::getReturnOrderNumber).last(" limit 1");
+            PmBidFailureHis pmBidFailureHisDb = this.pmBidFailureHisService.getOne(pmBidFailureHisLambdaQueryWrapper);
+
+            for(PmBidFailure pmBidFailureDb : pmBidFailureDbList) {
+                PmBidFailureHis pmBidFailureHis = new PmBidFailureHis();
+                BeanUtils.copyProperties(pmBidFailureDb,pmBidFailureHis);
+
+                if(pmBidFailureHisDb != null){
+                    pmBidFailureHis.setReturnOrderNumber(pmBidFailureHisDb.getReturnOrderNumber() + 1);
+                } else {
+                    pmBidFailureHis.setReturnOrderNumber(1);
+                }
+                if(this.pmBidFailureHisService.save(pmBidFailureHis)){
+                    //文件
+                    List<SysFileRef> fileRefs = getSysFileRefList(pmBidFailureDb.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
+                    if (!ObjectUtils.isEmpty(fileRefs)) {
+                        for (SysFileRef sysFileRef : fileRefs) {
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_FILE.getType() + "" + pmBidFailureHis.getReturnOrderNumber()));
+                        }
+                        sysFileRefService.updateBatchById(fileRefs);
+                    }
+
+                    List<SysFileRef> fileRefs2 = getSysFileRefList(pmBidFailureDb.getId(), SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType());
+                    if (!ObjectUtils.isEmpty(fileRefs2)) {
+                        for (SysFileRef sysFileRef : fileRefs2) {
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType() + "" + pmBidFailureHis.getReturnOrderNumber()));
+                        }
+                        sysFileRefService.updateBatchById(fileRefs2);
+                    }
+
+                    this.pmBidFailureService.removeById(pmBidFailureDb.getId());
+                }
+            }
+        }
 
         PmDemandHis pmDemandHis = new PmDemandHis();
         BeanUtils.copyProperties(pmDemand,pmDemandHis);

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -404,18 +404,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
                         pmBidFailureResVoList.add(pmBidFailureResVo);
 
+                        //流标文件
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             pmBidFailureFileInfos.addAll(fileInfos);
                         }
 
 
-                        if("1".equals(pmBidFailure.getCallQuestion())){
+                        if("1".equals(pmBidFailure.getCallQuestion())){ //有质疑
                             PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
                             pmCallQuestionResVo.setCallQuestion(pmBidFailure.getCallQuestion());
                             pmCallQuestionResVo.setCallQuestionTime(pmBidFailure.getCallQuestionTime());
                             pmCallQuestionBidFailureResVoList.add(pmCallQuestionResVo);
 
+                            //流废标质疑文件
                             List<SysFileInfo> fileInfos2 = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType());
                             if (!ObjectUtils.isEmpty(fileInfos2)) {
                                 pmCallRequestBidFailureFileInfos.addAll(fileInfos2);