Explorar o código

解决上传凭证多个时,导致查出来的结算记录多条的bug

lipf hai 4 meses
pai
achega
1a7599adef

+ 6 - 5
tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementDispatchController.java

@@ -2,14 +2,10 @@ package com.jzg.organization.controller;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.enums.ActionEnum;
-import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAction;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAfterAction;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchQuery;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
-import com.jzg.commons.entity.dto.CostExternalParam;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
-import com.jzg.commons.entity.vo.CostExternalListVo;
 import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.organization.action.ActionExecutor;
 import com.jzg.organization.service.PtlAgreementDispatchService;
@@ -44,9 +40,14 @@ public class PtlAgreementDispatchController {
         return HttpResult.ok(ptlAgreementDispatchService.getAgreementDispatch(ptlAgreementDispatchQuery));
     }
 
+    /**
+     * 添加协议调度
+     * @author lipf modify by lipf
+     * @date 2026/5/20 15:46
+     */
     @PostMapping("addAgreementDispatch")
     @Operation(summary = "添加协议调度")
-    public HttpResult addAgreementDispatch(@RequestBody PtlAgreementDispatchVo.DispatchVo ptlAgreementDispatchVo){
+    public HttpResult<String> addAgreementDispatch(@RequestBody PtlAgreementDispatchVo.DispatchVo ptlAgreementDispatchVo){
         String dispatchId = ptlAgreementDispatchService.addAgreementDispatch(ptlAgreementDispatchVo);
         return HttpResult.ok("添加协议调度成功",dispatchId);
     }

+ 15 - 17
tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreementUndwrtRulesMapper, PtlAgreementUndwrtRules>
     implements PtlAgreementUndwrtRulesService {
 
-    private static final Logger log = LoggerFactory.getLogger(PtlAgreementUndwrtRulesServiceImpl.class);;
+    private static final Logger log = LoggerFactory.getLogger(PtlAgreementUndwrtRulesServiceImpl.class);
 
     @Autowired
     private PtlAgreementUndwrtRulesAttrLinkMapper agreementUndwrtRulesAttrLinkMapper;
@@ -61,7 +61,7 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
 
     @Override
     public List<AgreementRulesVo> queryList(String agreementId) {
-        log.info("查询协议承保规则列表。 agreementId=[]", JSONUtil.toJsonStr(agreementId));
+        log.info("查询协议承保规则列表。 agreementId=[{}]", JSONUtil.toJsonStr(agreementId));
         List<AgreementRulesVo> rulesVos = baseMapper.queryList(agreementId);
         LocalDateTime now = LocalDateTime.now();
         if(CollUtil.isNotEmpty(rulesVos)){
@@ -71,22 +71,20 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
                 param.setCoverRuleId(rulesVo.getId());
                 List<CostListVo> costVos = ptlAgreementCostService.queryByAgreementIdAndCoverRuleId(param);
                 if(CollUtil.isNotEmpty(costVos)){
-                    costVos.forEach(cost->{
-                        cost.getPtlAgreementCostVoList().forEach(vo->{
-                            LocalDateTime effectiveTime = vo.getEffectiveTime().toInstant()
-                                    .atZone(ZoneId.systemDefault())
-                                    .toLocalDateTime();
-                            LocalDateTime failureTime = vo.getFailureTime().toInstant()
-                                   .atZone(ZoneId.systemDefault())
-                                   .toLocalDateTime();
-                            if(now.isAfter(effectiveTime) && now.isBefore(failureTime)){
-                                vo.setIsValid(0);
-                            }else{
-                                vo.setIsValid(1);
-                            }
+                    costVos.forEach(cost-> cost.getPtlAgreementCostVoList().forEach(vo->{
+                        LocalDateTime effectiveTime = vo.getEffectiveTime().toInstant()
+                                .atZone(ZoneId.systemDefault())
+                                .toLocalDateTime();
+                        LocalDateTime failureTime = vo.getFailureTime().toInstant()
+                               .atZone(ZoneId.systemDefault())
+                               .toLocalDateTime();
+                        if(now.isAfter(effectiveTime) && now.isBefore(failureTime)){
+                            vo.setIsValid(0);
+                        }else{
+                            vo.setIsValid(1);
+                        }
 
-                        });
-                    });
+                    }));
                     rulesVo.setCostVoList(costVos);
                 }
             }

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1342,7 +1342,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 String fileIds = insPlyIncomeInvoiceSettlementFiles.stream().map(InsPlyIncomeInvoiceSettlementFile::getFileId).collect(Collectors.joining(","));
                 dto.setFileId(fileIds);
                 String fileUrls = insPlyIncomeInvoiceSettlementFiles.stream().map(InsPlyIncomeInvoiceSettlementFile::getFileId).map(fileId -> {
-                    SysUploadFiles file = sysUploadFilesMapper.selectById(dto.getFileId());
+                    SysUploadFiles file = sysUploadFilesMapper.selectById(fileId);
                     if (file != null) {
                         return MinioUtils.getPresignedObjectUrl("jzg", file.getFileName());
                     }