Merge branch 'yafan' into dev1.0

src/main/java/com/sunxung/factoring/service/biddingManagement/impl/BiddingGuaranteeMethodServiceImpl.java

@@ -112,15 +112,16 @@ public class BiddingGuaranteeMethodServiceImpl extends ServiceImpl<BiddingGuaran
                 throw new ValidatorException(CodeUtil.FAIL, "保证方式不正确！");
         }
 
-        //投标方式附件
-        List<Long> bidDescriptionFileIds = biddingGuaranteeMethod.getBidDescriptionFileIds();
-
-        if (CollectionUtil.isEmpty(bidDescriptionFileIds)) {
-            throw new BusinessException(CodeUtil.FAIL,"投标说明文件不能为空！");
-        }
-        AttachmentDto upstreamPurchDto = AttachmentDto.builder().setEntityId(biddingGuaranteeMethod.getId())
-                .setChildEnum(FileModuleDict.ChildEnum.BIDING_DESCRIPTION_FILE).build();
-        sysAttachmentRefService.saveRef(bidDescriptionFileIds,upstreamPurchDto);
+        //需求变更
+        //投标说明字段取消
+//        List<Long> bidDescriptionFileIds = biddingGuaranteeMethod.getBidDescriptionFileIds();
+//
+//        if (CollectionUtil.isEmpty(bidDescriptionFileIds)) {
+//            throw new BusinessException(CodeUtil.FAIL,"投标说明文件不能为空！");
+//        }
+//        AttachmentDto upstreamPurchDto = AttachmentDto.builder().setEntityId(biddingGuaranteeMethod.getId())
+//                .setChildEnum(FileModuleDict.ChildEnum.BIDING_DESCRIPTION_FILE).build();
+//        sysAttachmentRefService.saveRef(bidDescriptionFileIds,upstreamPurchDto);
 
         //完成审核流程流转到下一流程或者完成流程
         //查询项目
@@ -156,10 +157,10 @@ public class BiddingGuaranteeMethodServiceImpl extends ServiceImpl<BiddingGuaran
         }
 
         //投标说明
-        AttachmentDto upstreamPurchDto = AttachmentDto.builder().setEntityId(biddingGuaranteeMethod.getId())
-                .setChildEnum(FileModuleDict.ChildEnum.BIDING_DESCRIPTION_FILE).build();
-        List<FileStorage> files = sysAttachmentRefService.getFiles(upstreamPurchDto);
-        biddingGuaranteeMethod.setBidDescriptionFiles(files);
+//        AttachmentDto upstreamPurchDto = AttachmentDto.builder().setEntityId(biddingGuaranteeMethod.getId())
+//                .setChildEnum(FileModuleDict.ChildEnum.BIDING_DESCRIPTION_FILE).build();
+//        List<FileStorage> files = sysAttachmentRefService.getFiles(upstreamPurchDto);
+//        biddingGuaranteeMethod.setBidDescriptionFiles(files);
 
         return biddingGuaranteeMethod;
     }

src/main/java/com/sunxung/factoring/service/loanmanagement/impl/ExemptionMattersServiceImpl.java

@@ -169,8 +169,8 @@ public class ExemptionMattersServiceImpl extends ServiceImpl<ExemptionMattersMap
         PaymentInfo paymentInfo = paymentInfoService.getById(paymentApply.getPaymentInfoId());
 
         List<PaymentCondition> conditions = paymentApplyService.findConditions(paymentApplyId);
-        boolean anyMatch = conditions.stream().anyMatch(r -> r.getFollow().equals("1"));
-        if (anyMatch){
+        boolean anyMatch = conditions.stream().anyMatch(r -> r.getFollow() != null && r.getFollow().equals("1"));
+        if (anyMatch) {
             //获取项目经理
             ProjectInformationVo projectInformationVo = projectInformationService.getByBusinessNo(paymentInfo.getBusinessNo());
             ProjectInformation projectInformation = projectInformationService.get(projectInformationVo.getProjectInformationId());