浏览代码

费用管理列表返回值新增返回字段companyId

wanghao 1 月之前
父节点
当前提交
3cbdcb61a0

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/dto/CostManagementVo.java

@@ -76,6 +76,8 @@ public class CostManagementVo {
 
 
     @Schema(description = "保司名称")
     @Schema(description = "保司名称")
     private String companyName;
     private String companyName;
+    @Schema(description = "保司id")
+    private String companyId;
 
 
     @Schema(description = "规则条件集合")
     @Schema(description = "规则条件集合")
     private List<PtlAgreementCostRuleVo> ruleConditions;
     private List<PtlAgreementCostRuleVo> ruleConditions;

+ 3 - 0
tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -127,6 +127,8 @@
         <result column="priority_level" property="priorityLevel" jdbcType="INTEGER"/>
         <result column="priority_level" property="priorityLevel" jdbcType="INTEGER"/>
         <result column="costId" property="costId" jdbcType="VARCHAR"/>
         <result column="costId" property="costId" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
+        <result column="company_name" property="companyName" jdbcType="VARCHAR"/>
+        <result column="company_id" property="companyId" jdbcType="VARCHAR"/>
         <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
         <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
         <collection property="ruleConditions" column="{costId=costId}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
         <collection property="ruleConditions" column="{costId=costId}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
     </resultMap>
     </resultMap>
@@ -382,6 +384,7 @@
                 ELSE pr_raw.rule_description
                 ELSE pr_raw.rule_description
             END AS rule_description,
             END AS rule_description,
             eic.name as company_name,
             eic.name as company_name,
+            pa.company_id as company_id,
             pa.docking_person,
             pa.docking_person,
             pc.update_time,
             pc.update_time,
             CASE
             CASE