suntianwu %!s(int64=2) %!d(string=hai) anos
pai
achega
b880b88401

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

@@ -140,7 +140,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                 List<SysFileRef> fileRefs = getSysFileRefList(pmBookBuildingDb.getId(), SysFileRefEnum.PM_BOOK_BUILDING.getType());
                 if (!ObjectUtils.isEmpty(fileRefs)) {
                     for (SysFileRef sysFileRef : fileRefs) {
-                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BOOK_BUILDING.getType() + "" + pmBookBuildingHis.getReturnOrderNumber()));
+                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BOOK_BUILDING.getType() + "00" + pmBookBuildingHis.getReturnOrderNumber()));
                     }
                     sysFileRefService.updateBatchById(fileRefs);
                 }
@@ -171,7 +171,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                 List<SysFileRef> fileRefs = getSysFileRefList(pmExpertFeedbackDb.getId(), SysFileRefEnum.PM_EXPERT_FEEDBACK.getType());
                 if (!ObjectUtils.isEmpty(fileRefs)) {
                     for (SysFileRef sysFileRef : fileRefs) {
-                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_EXPERT_FEEDBACK.getType() + "" + pmExpertFeedbackHis.getReturnOrderNumber()));
+                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_EXPERT_FEEDBACK.getType() + "00" + pmExpertFeedbackHis.getReturnOrderNumber()));
                     }
                     sysFileRefService.updateBatchById(fileRefs);
                 }
@@ -202,7 +202,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                 List<SysFileRef> fileRefs = getSysFileRefList(pmProcurementDocumentsReviewDb.getId(), SysFileRefEnum.PM_BID_FILE.getType());
                 if (!ObjectUtils.isEmpty(fileRefs)) {
                     for (SysFileRef sysFileRef : fileRefs) {
-                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FILE.getType() + "" + pmProcurementDocumentsReviewHis.getReturnOrderNumber()));
+                        sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FILE.getType() + "00" + pmProcurementDocumentsReviewHis.getReturnOrderNumber()));
                     }
                     sysFileRefService.updateBatchById(fileRefs);
                 }
@@ -237,7 +237,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     List<SysFileRef> fileRefs = getSysFileRefList(pmReleaseAnnouncementDb.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                     if (!ObjectUtils.isEmpty(fileRefs)) {
                         for (SysFileRef sysFileRef : fileRefs) {
-                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType() + "" + pmReleaseAnnouncementHis.getReturnOrderNumber()));
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType() + "00" + pmReleaseAnnouncementHis.getReturnOrderNumber()));
                         }
                         sysFileRefService.updateBatchById(fileRefs);
                     }
@@ -278,7 +278,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     List<SysFileRef> fileRefs = getSysFileRefList(pmCallQuestionDb.getId(), sysFileRefType);
                     if (!ObjectUtils.isEmpty(fileRefs)) {
                         for (SysFileRef sysFileRef : fileRefs) {
-                            sysFileRef.setType(Integer.parseInt(sysFileRefType + "" + pmCallQuestionHis.getReturnOrderNumber()));
+                            sysFileRef.setType(Integer.parseInt(sysFileRefType + "00" + pmCallQuestionHis.getReturnOrderNumber()));
                         }
                         sysFileRefService.updateBatchById(fileRefs);
                     }
@@ -362,7 +362,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     List<SysFileRef> fileRefs = getSysFileRefList(pmBidWinningDb.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
                     if (!ObjectUtils.isEmpty(fileRefs)) {
                         for (SysFileRef sysFileRef : fileRefs) {
-                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "" + pmBidWinningHis.getReturnOrderNumber()));
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "00" + pmBidWinningHis.getReturnOrderNumber()));
                         }
                         sysFileRefService.updateBatchById(fileRefs);
                     }
@@ -421,7 +421,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     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()));
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_FILE.getType() + "00" + pmBidFailureHis.getReturnOrderNumber()));
                         }
                         sysFileRefService.updateBatchById(fileRefs);
                     }
@@ -429,7 +429,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     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()));
+                            sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType() + "00" + pmBidFailureHis.getReturnOrderNumber()));
                         }
                         sysFileRefService.updateBatchById(fileRefs2);
                     }
@@ -473,7 +473,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
             List<SysFileRef> fileRefs = getSysFileRefList(demandId, SysFileRefEnum.PM_DEMAND_EXAMINE.getType());
             if (!ObjectUtils.isEmpty(fileRefs)) {
                 for (SysFileRef sysFileRef : fileRefs) {
-                    sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_DEMAND_EXAMINE.getType() + "" + pmDemandHis.getReturnOrderNumber()));
+                    sysFileRef.setType(Integer.parseInt(SysFileRefEnum.PM_DEMAND_EXAMINE.getType() + "00" + pmDemandHis.getReturnOrderNumber()));
                 }
                 sysFileRefService.updateBatchById(fileRefs);
             }
@@ -586,7 +586,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
             } else if ("2".equals(detailType)) { //需求建档
 
                 //采购需求审核文件
-                List<SysFileInfo> auditFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_DEMAND_EXAMINE.getType() + "" + pmDemandHis.getReturnOrderNumber()));
+                List<SysFileInfo> auditFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_DEMAND_EXAMINE.getType() + "00" + pmDemandHis.getReturnOrderNumber()));
                 if (!ObjectUtils.isEmpty(auditFileInfos)) {
                     vo.setAuditFileInfos(auditFileInfos);
                 }
@@ -598,7 +598,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     PmBookBuildingResVo responseVo = new PmBookBuildingResVo();
                     BeanUtils.copyProperties(pmBookBuildingHis, responseVo);
 
-                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmBookBuildingHis.getId(), Integer.parseInt(SysFileRefEnum.PM_BOOK_BUILDING.getType() + "" + pmBookBuildingHis.getReturnOrderNumber()));
+                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmBookBuildingHis.getId(), Integer.parseInt(SysFileRefEnum.PM_BOOK_BUILDING.getType() + "00" + pmBookBuildingHis.getReturnOrderNumber()));
                     if (!ObjectUtils.isEmpty(fileInfos)) {
                         if (!ObjectUtils.isEmpty(auditFileInfos)) {
                             fileInfos.addAll(auditFileInfos);
@@ -610,7 +610,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
             } else if ("3".equals(detailType)) { //任务下达
                 vo.setTaskReleaseTime(pmDemandHis.getTaskReleaseTime());
                 //任务下达文件
-                List<SysFileInfo> taskReleaseFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_TAST_RELEASE.getType() + "" + pmDemandHis.getReturnOrderNumber()));
+                List<SysFileInfo> taskReleaseFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_TAST_RELEASE.getType() + "00" + pmDemandHis.getReturnOrderNumber()));
                 if (!ObjectUtils.isEmpty(taskReleaseFileInfos)) {
                     vo.setTaskReleaseFileInfos(taskReleaseFileInfos);
                 }
@@ -629,7 +629,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     PmExpertFeedbackResVo pmExpertFeedbackResVo = new PmExpertFeedbackResVo();
                     BeanUtils.copyProperties(pmExpertFeedbackHis,pmExpertFeedbackResVo);
 
-                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmExpertFeedbackResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_EXPERT_FEEDBACK.getType() + "" + pmExpertFeedbackHis.getReturnOrderNumber()));
+                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmExpertFeedbackResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_EXPERT_FEEDBACK.getType() + "00" + pmExpertFeedbackHis.getReturnOrderNumber()));
                     if (!ObjectUtils.isEmpty(fileInfos)) {
                         pmExpertFeedbackResVo.setFileInfos(fileInfos);
                     }
@@ -644,7 +644,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     PmProcurementDocumentsReviewResVo pmProcurementDocumentsReviewResVo = new PmProcurementDocumentsReviewResVo();
                     BeanUtils.copyProperties(pmProcurementDocumentsReviewHis,pmProcurementDocumentsReviewResVo);
 
-                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmProcurementDocumentsReviewResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FILE.getType() + "" + pmProcurementDocumentsReviewHis.getReturnOrderNumber()));
+                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmProcurementDocumentsReviewResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FILE.getType() + "00" + pmProcurementDocumentsReviewHis.getReturnOrderNumber()));
                     if (!ObjectUtils.isEmpty(fileInfos)) {
                         pmProcurementDocumentsReviewResVo.setFileInfos(fileInfos);
                     }
@@ -662,7 +662,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                         PmReleaseAnnouncementResVo pmReleaseAnnouncementResVo = new PmReleaseAnnouncementResVo();
                         BeanUtils.copyProperties(pmReleaseAnnouncementHis, pmReleaseAnnouncementResVo);
 
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncementResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType() + "" + pmReleaseAnnouncementHis.getReturnOrderNumber()));
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncementResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType() + "00" + pmReleaseAnnouncementHis.getReturnOrderNumber()));
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             fileInfosAll.addAll(fileInfos);
                         }
@@ -683,7 +683,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     for(PmCallQuestionHis pmCallQuestionHis : pmCallQuestionHisList){
                         PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
                         BeanUtils.copyProperties(pmCallQuestionHis,pmCallQuestionResVo);
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_PRE_BID_CALL_QUESTION.getType() + "" + pmCallQuestionHis.getReturnOrderNumber()));
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_PRE_BID_CALL_QUESTION.getType() + "00" + pmCallQuestionHis.getReturnOrderNumber()));
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             fileInfosAll.addAll(fileInfos);
                         }
@@ -715,7 +715,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                         BeanUtils.copyProperties(pmBidWinningHis, pmBidWinningResVo);
                         pmBidWinningResVoList.add(pmBidWinningResVo);
 
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "" + pmBidWinningHis.getReturnOrderNumber()));
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "00" + pmBidWinningHis.getReturnOrderNumber()));
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             fileInfosAll.addAll(fileInfos);
                         }
@@ -736,7 +736,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                     for(PmCallQuestionHis pmCallQuestionHis : pmCallQuestionHisList2){
                         PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
                         BeanUtils.copyProperties(pmCallQuestionHis,pmCallQuestionResVo);
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType() + "" + pmCallQuestionHis.getReturnOrderNumber()));
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType() + "00" + pmCallQuestionHis.getReturnOrderNumber()));
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             fileInfosAll.addAll(fileInfos);
                         }
@@ -762,7 +762,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                         pmBidFailureResVoList.add(pmBidFailureResVo);
 
                         //流标文件
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailureResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_FILE.getType() + "" + pmBidFailureHis.getReturnOrderNumber()));
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailureResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_FILE.getType() + "00" + pmBidFailureHis.getReturnOrderNumber()));
                         if (!ObjectUtils.isEmpty(fileInfos)) {
                             pmBidFailureFileInfos.addAll(fileInfos);
                         }
@@ -774,7 +774,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                             pmCallQuestionBidFailureResVoList.add(pmCallQuestionResVo);
 
                             //流废标质疑文件
-                            List<SysFileInfo> fileInfos2 = getSysFileInfoList(pmBidFailureHis.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType() + "" + pmBidFailureHis.getReturnOrderNumber()));
+                            List<SysFileInfo> fileInfos2 = getSysFileInfoList(pmBidFailureHis.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType() + "00" + pmBidFailureHis.getReturnOrderNumber()));
                             if (!ObjectUtils.isEmpty(fileInfos2)) {
                                 pmCallRequestBidFailureFileInfos.addAll(fileInfos2);
                             }
@@ -790,7 +790,7 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                 }
 
                 //中标通知书
-                List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType() + "" + pmDemandHis.getReturnOrderNumber()));
+                List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType() + "00" + pmDemandHis.getReturnOrderNumber()));
                 pmPurchaseExecutionResVo.setFileInfos(pmBidWinningNotificationFileInfos);
 
                 vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);