协议费用添加优先级 分销员添加审核时间

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

@@ -50,6 +50,9 @@ public class CostManagementVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String failureTime;
 
+    @Schema(description = "优先级")
+    private Integer priorityLevel;
+
     @Schema(description = "0-生效中；1-已失效")
     private String isValid;
 

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

@@ -53,6 +53,9 @@ public class PtlAgreementCostAdd {
     @Schema(description = "是否启用0-启用-1失效")
     private String isEnabled;
 
+    @Schema(description = "优先级")
+    private Integer priorityLevel;
+
     @Schema(description = "费用类型集合")
     private List<PtlAgreementCostTypeDto> ptlAgreementCostTypeList;
 

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

@@ -56,6 +56,10 @@ public class PtlAgreementCostEnd {
     @NotBlank(message = "审核方式不能为空")
     private String auditMethod;
 
+    @Schema(description = "优先级")
+    @NotNull(message = "优先级不能为空")
+    private Integer priorityLevel;
+
     @Schema(description = "费用描述")
     private String costDescribe;
 

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

@@ -302,7 +302,7 @@ public class SysDistributionSettingServiceImpl extends ServiceImpl<SysDistributi
                 pendingAmount = pendingAmount.add(fee);
             }
         }
-        resultVo.setAuditApprovalTime(sysDistributionAudit.getAuditApprovalTime());
+        resultVo.setAuditApprovalTime(sysDistributionAudit.getAuditApprovalTime() != null ? sysDistributionAudit.getAuditApprovalTime() : null);
         resultVo.setTotalAmount(totalFee); // 累计佣金
         resultVo.setPendingAmount(pendingAmount); // 待结算佣金
         resultVo.setTotalPremium(totalPremium); // 累计保费

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

@@ -116,6 +116,7 @@
         <result column="cost_rules" property="costRules" jdbcType="VARCHAR"/>
         <result column="effective_time" property="effectiveTime" jdbcType="VARCHAR"/>
         <result column="failure_time" property="failureTime" jdbcType="VARCHAR"/>
+        <result column="priority_level" property="priorityLevel" jdbcType="INTEGER"/>
         <result column="costId" property="costId" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
         <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
@@ -319,6 +320,7 @@
             pc.ptl_agreement_id,
             pc.cover_rule_id,
             pc.approved,
+            pc.priority_level,
             pc.is_enabled,
             pc.create_time,
             pc.create_by,