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

README.md

@@ -23,6 +23,12 @@
 | 1  | JDK          | JDK17  | JDK8不行 |
 | 2  | Apache Maven | 3.9.14 |        |
 
+## 相关命令
+```shell
+mvn clean
+mvn package -DskipTests
+mvn clean install -DskipTests
+```
 
 ## 其它
 

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostExternalAdd.java

@@ -49,6 +49,9 @@ public class PtlAgreementCostExternalAdd {
     @Schema(description = "对接人手机号")
     private String contactMobile;
 
+    @Schema(description = "优先级")
+    private String priorityLevel;
+
     @Schema(description = "费用类型集合")
     private List<PtlAgreementCostExternalTypeAdd> costExternalTypeAdds;
 

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

@@ -47,5 +47,10 @@ public class PtlAgreementCostExternal extends BaseModel {
 
     private String auditPerson;
 
+    /**
+     * 优先级
+     */
+    private String priorityLevel;
+
 
 }

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

@@ -82,6 +82,9 @@ public class CostExternalListVo {
     @Schema(description = "审核描述")
     private String reviewDescription;
 
+    @Schema(description = "优先级")
+    private String priorityLevel;
+
     @Schema(description = "费用类型")
     private List<CostExternalTypeVo>  costExternalTypeAdds;
 

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

@@ -25,6 +25,7 @@
         <result column="audit_time" property="auditTime" />
         <result column="review_description" property="reviewDescription" />
         <result column="agreement_title" property="agreementTitle" />
+        <result column="priority_level" property="priorityLevel" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
     </resultMap>
 
@@ -45,6 +46,7 @@
         <result column="contact_person" property="contactPerson" />
         <result column="contact_mobile" property="contactMobile" />
         <result column="audit_method" property="auditMethod" />
+        <result column="priority_level" property="priorityLevel" />
         <result column="create_time" property="createTime" />
         <result column="create_by" property="createBy" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
@@ -55,7 +57,7 @@
         SELECT
             ce.id,ce.ptl_agreement_id,ce.product_name,ce.product_id,ce.effective_time,ce.failure_time,ce.audit_method,ce.audit_status,ce.is_enabled,
             ce.review_description,ce.audit_person,ce.audit_time,ce.is_inquiry,ce.cost_describe,ce.contact_person,ce.contact_mobile,ce.is_delete,
-            pa.agreement_title
+            pa.agreement_title, ce.priority_level
         FROM
             ptl_agreement_cost_external ce
             LEFT JOIN ptl_agreement pa ON pa.id = ce.ptl_agreement_id