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

commons/src/main/java/com/jzg/commons/entity/vo/AgreementRulesVo.java

@@ -5,12 +5,15 @@ import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
 import java.util.List;
 
 @Schema(description = "协议规则列表VO")
 @Data
 public class AgreementRulesVo extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = -5729790602450150534L;
     /** 主键 */
     @Schema(description = "主键")
     private String id;

tenant/organization/src/main/java/com/jzg/organization/controller/AgreementRulesController.java

@@ -28,7 +28,7 @@ public class AgreementRulesController extends BaseController {
 
     @GetMapping("/rulesList")
     @Operation(summary = "协议承保规则列表")
-    public HttpResult rulesList(String agreementId){
+    public HttpResult<List<AgreementRulesVo>> rulesList(String agreementId){
         List<AgreementRulesVo> rulesVos = agreementRulesService.queryList(agreementId);
         return HttpResult.ok(rulesVos);
     }

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -58,7 +58,7 @@ public class PtlAgreementCostController {
 
     @Operation(summary = "协议费用管理查询")
     @GetMapping("queryById")
-    public HttpResult queryById(@NotNull(message = "id不能为空") Long id){
+    public HttpResult<PtlAgreementCostVo> queryById(@NotNull(message = "id不能为空") Long id){
         return ptlAgreementCostService.queryById(id);
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementCostService.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.PtlAgreementCost;
 import com.jzg.commons.entity.vo.CostListVo;
 import com.jzg.commons.entity.vo.CostsListVo;
+import com.jzg.commons.entity.vo.PtlAgreementCostVo;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 
@@ -29,8 +30,14 @@ public interface PtlAgreementCostService extends IService<PtlAgreementCost> {
      */
     HttpResult<String> update(PtlAgreementCostEnd costEndList);
 
-
-    HttpResult queryById(@NotNull(message = "id不能为空") Long id);
+    /**
+     * 查询协议的费用信息
+     *
+     * @param id 费用id
+     * @author lipf
+     * @date 2026/5/23 14:34
+     */
+    HttpResult<PtlAgreementCostVo> queryById(@NotNull(message = "id不能为空") Long id);
 
     List<CostListVo> queryByAgreementIdAndCoverRuleId(CostAgreementParam costAgreementParam);
 

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementUndwrtRulesService.java

@@ -9,15 +9,17 @@ import com.jzg.commons.entity.vo.AgreementRulesVo;
 import java.util.List;
 
 /**
-* @author dongxin
-* @description 针对表【ptl_agreement_undwrt_rules(协议承保规则)】的数据库操作Service
-* @createDate 2025-02-20 09:32:09
-*/
+ * 针对表【ptl_agreement_undwrt_rules(协议承保规则)】的数据库操作Service
+ *
+ * @author dongxin
+ * @date 2025-02-20 09:32:09
+ */
 public interface PtlAgreementUndwrtRulesService extends IService<PtlAgreementUndwrtRules> {
 
     /**
      * 协议规则列表
-     * @return
+     *
+     * @return List<AgreementRulesVo> 协议规则
      */
     List<AgreementRulesVo> queryList(String agreementId);
 

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

@@ -43,6 +43,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -214,8 +215,15 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         return false;
     }
 
+    /**
+     * 查询协议的费用信息
+     *
+     * @param id 费用id
+     * @author lipf
+     * @date 2026/5/23 14:34
+     */
     @Override
-    public HttpResult queryById(Long id) {
+    public HttpResult<PtlAgreementCostVo> queryById(Long id) {
         log.info("查询协议的费用信息：协议费用id=[{}]", id);
         PtlAgreementCostVo ptlAgreementCostVo = ptlAgreementCostMapper.queryById(id);
         if (ObjectUtil.isEmpty(ptlAgreementCostVo)){
@@ -229,6 +237,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
                     ruleCondition.setMinArray(Arrays.asList(ruleCondition.getMin().split(",")));
                 }else {
                     ruleCondition.setMinArray(Arrays.asList(ruleCondition.getMin()));
+                    //ruleCondition.setMinArray(Collections.singletonList(ruleCondition.getMin()));
                 }
 
             }

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

@@ -59,6 +59,11 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
     @Autowired
     private PtlAgreementCostService ptlAgreementCostService;
 
+    /**
+     * 协议规则列表
+     *
+     * @return List<AgreementRulesVo> 协议规则
+     */
     @Override
     public List<AgreementRulesVo> queryList(String agreementId) {
         log.info("查询协议承保规则列表。 agreementId=[{}]", JSONUtil.toJsonStr(agreementId));
@@ -270,14 +275,14 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
 
     private String checkBoxIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementUndwrtRulesAttrLink linkList) {
         StringBuilder returnMsg = new StringBuilder();
-        returnMsg.append(ptlAgreementUndwrtRulesAttr.getAttrName() + "为");
+        returnMsg.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("为");
         for(int i=0;i<linkList.getMinArray().length;i++) {
             int finalI = i;
             if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseArea")) {
-                returnMsg.append(linkList.getMinArray()[i] + ",");
+                returnMsg.append(linkList.getMinArray()[i]).append(",");
             }else {
                 PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
-                returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName() + ",");
+                returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName()).append(",");
             }
         }
         return returnMsg.toString();

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

@@ -180,6 +180,7 @@
     <select id="selectCostById"  resultMap="CostResultMap">
         SELECT
             t.id,
+            t.priority_level,
             t.ptl_agreement_id,
             t.product_name,
             t.product_id,