Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/dto/PtlAgreementDispatchRulesAttrLink.java

@@ -31,11 +31,18 @@ public class PtlAgreementDispatchRulesAttrLink implements Serializable {
     @Schema(description = "左操作符")
     private String min;
 
+    @Schema(description = "左操作符号转义后的值")
+    @TableField(exist = false)
+    private String minName;
+
     @Schema(description = "操作符")
     private String operator;
 
     @Schema(description = "右操作符")
     private String max;
+    @Schema(description = "右操作符号转义后的值")
+    @TableField(exist = false)
+    private String maxName;
 
     @TableField(exist = false)
     private List<String> minArray = new ArrayList<>();

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/vo/PtlAgreementDispatchVo.java

@@ -1,6 +1,5 @@
 package com.jzg.commons.entity.agreement.dispatch.vo;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatch;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAction;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAfterAction;
@@ -9,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 @Data

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreementUndwrtRulesDictLabal.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.util.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
+import java.util.Objects;
 
 @TableName(value = "ptl_agreement_undwrt_rules_dict_labal", autoResultMap = true)
 @Data
@@ -19,6 +21,13 @@ public class PtlAgreementUndwrtRulesDictLabal {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    public String getIdStr(){
+        if(id == null){
+            return StringUtils.EMPTY;
+        }
+        return Objects.toString(this.id);
+    }
+
     @TableField(value = "parent_id")
     private Integer parentId;
 

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);
     }

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementDispatchMapper.java

@@ -3,9 +3,16 @@ package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatch;
+import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface PtlAgreementDispatchMapper extends BaseMapper<PtlAgreementDispatch> {
 
+
+    @Select("select * from ptl_agreement_undwrt_rules_dict_labal paurdl where paurdl.is_delete =0")
+    List<PtlAgreementUndwrtRulesDictLabal> queryAllDictLabal();
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementDispatchServiceImpl.java

@@ -141,6 +141,10 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
             // 获取保司的报价失败之后的动作
             List<PtlAgreementDispatchAfterAction> ptlAgreementDispatchAfterActions = afterActionMapper.getAfterActions(ptlAgreementDispatchQuery.getCompanyId());
             int index = 1;
+            // add by lipf， 对协议配置中的字典序号进行转义 2026年5月20日16:43:34
+            List<PtlAgreementUndwrtRulesDictLabal> ptlAgreementUndwrtRulesDictLabals = baseMapper.queryAllDictLabal();
+            Map<String, String> dictLabalId2Name = ptlAgreementUndwrtRulesDictLabals.stream()
+                    .collect(Collectors.toMap(PtlAgreementUndwrtRulesDictLabal::getIdStr, PtlAgreementUndwrtRulesDictLabal::getName));
             for(PtlAgreementDispatch dispatch : ptlAgreementDispatches){
                 if(dispatch.getDispatchName().isEmpty()){
                     dispatch.setDispatchName("规则" + index);
@@ -168,6 +172,10 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                     }else{
                         attrlink.setOperatorDesc("未知");
                     }
+                    String minName = dictLabalId2Name.getOrDefault(attrlink.getMin(),attrlink.getMin());
+                    String maxName = dictLabalId2Name.getOrDefault(attrlink.getMax(),attrlink.getMax());
+                    attrlink.setMinName(minName);
+                    attrlink.setMaxName(maxName);
                     PtlAgreementUndwrtRulesAttr undwrtRuleAttrByAttrCode = ptlAgreementUndwrtRulesAttrService.getUndwrtRuleAttrByAttrCode(attrlink.getAttrCode());
                     if(undwrtRuleAttrByAttrCode != null && undwrtRuleAttrByAttrCode.getDictId() != null){
                         attrlink.setAttrCodeName(undwrtRuleAttrByAttrCode.getAttrName());

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);
                 }
             }

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

@@ -144,7 +144,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     public InsPlyIncome getUnauditedOrder(ReceivableQueryVo receivableQueryVo) {
         InsPlyIncome auditedOrder = baseMapper.getAuditedOrder(receivableQueryVo.getOrderNo(), receivableQueryVo.getQueryType(), InsOrderStatusEnum.UNDERWRITED.getCode(), receivableQueryVo.getAgreementType());
         if (receivableQueryVo.getQueryType().equals("3") || receivableQueryVo.getQueryType().equals("4")) {
-            if (Objects.isNull(auditedOrder.getJyPolicyNo()) && auditedOrder.getJyPolicyNo().equals("")) {
+            if (Objects.isNull(auditedOrder.getJyPolicyNo()) && auditedOrder.getJyPolicyNo().isEmpty()) {
                 return null;
             }
         }
@@ -1321,19 +1321,14 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if("30".equals(settlementQueryVo.getStatus())){
             settlementQueryVo.setStatus(null);
         }
-//        if("30".equals(settlementQueryVo.getAccountsReceivable())){
-//            settlementQueryVo.setAccountsReceivable(null);
-//        }
-//        if("accountsReceivable"){
-//
-//        }
         Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
         exportSuperviseSettlementExcelDtos.getRecords().forEach(dto -> {
-            if (dto.getInvoiceParty().equals("1")) {
+            if ("1".equals(dto.getInvoiceParty())) {
                 dto.setInvoiceParty("我方开票");
-            } else if (dto.getInvoiceParty().equals("2")) {
+            } else if ("2".equals(dto.getInvoiceParty())) {
                 dto.setInvoiceParty("保司开票");
             }
+            dto.setInvoiceType(Objects.toString(dto.getInvoiceType(),""));
             switch (dto.getInvoiceType()) {
                 case "1" -> dto.setInvoiceType("手续费");
                 case "2" -> dto.setInvoiceType("跟单费");
@@ -1341,9 +1336,21 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 case "4" -> dto.setInvoiceType("驾意险跟单费");
             }
             dto.setInvoiceTypeName(Constant.invoiceRiskTypeMap.get(Objects.toString(dto.getInvoiceType())));
-            SysUploadFiles file = sysUploadFilesMapper.selectById(dto.getFileId());
-            if (file != null) {
-                dto.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", file.getFileName()));
+            LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile> wrapper = new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlementFile>();
+            List<InsPlyIncomeInvoiceSettlementFile> insPlyIncomeInvoiceSettlementFiles = insPlyIncomeInvoiceSettlementFileMapper.selectList(wrapper.eq(InsPlyIncomeInvoiceSettlementFile::getSettlementId, dto.getSettlementId()));
+            if(CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlementFiles)){
+                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(fileId);
+                    if (file != null) {
+                        return MinioUtils.getPresignedObjectUrl("jzg", file.getFileName());
+                    }
+                    return null;
+                }).filter(Objects::nonNull).collect(Collectors.joining(","));
+                if(StrUtil.isNotEmpty(fileUrls)){
+                    dto.setFileUrl(fileUrls);
+                }
             }
         });
         return exportSuperviseSettlementExcelDtos;

tenant/organization/src/main/resources/mapper/PtlAgreementDispatchMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.PtlAgreementDispatchMapper">
+
+
+</mapper>

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -509,11 +509,9 @@
         ipiis.actual_received_amount as actualReceivedAmount,
         ipiis.receive_payment_date as receivePaymentDate,
         ipiis.create_by as createBy,
-        ipiis.create_time as createTime,
-        ipiisf.file_id as fileId
+        ipiis.create_time as createTime
         FROM
         ins_ply_income_invoice_settlement ipiis
-        LEFT JOIN ins_ply_income_invoice_settlement_file ipiisf ON ipiisf.settlement_id = ipiis.id
         LEFT JOIN ins_ply_income_invoice ipii ON ipii.id = ipiis.invoice_id
         LEFT JOIN ins_ply_income_invoice_link ipil ON ipil.invoice_id = ipiis.invoice_id
         LEFT JOIN ins_ply_income ipi ON ipi.id = ipil.income_id