优化代码

java110-bean/src/main/java/com/java110/dto/contractChangePlanDetail/ContractChangePlanDetailDto.java

@@ -30,6 +30,8 @@ public class ContractChangePlanDetailDto extends PageDto implements Serializable
     private String contractId;
     private String objId;
     private String planId;
+    private String planType;
+    private String planTypeName;
     private String contractName;
     private String startTime;
     private String endTime;
@@ -161,6 +163,14 @@ public class ContractChangePlanDetailDto extends PageDto implements Serializable
         this.planId = planId;
     }
 
+    public String getPlanTypeName() {
+        return planTypeName;
+    }
+
+    public void setPlanTypeName(String planTypeName) {
+        this.planTypeName = planTypeName;
+    }
+
     public String getContractName() {
         return contractName;
     }
@@ -232,4 +242,12 @@ public class ContractChangePlanDetailDto extends PageDto implements Serializable
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getPlanType() {
+        return planType;
+    }
+
+    public void setPlanType(String planType) {
+        this.planType = planType;
+    }
 }

java110-db/src/main/resources/mapper/store/ContractChangePlanDetailServiceDaoImplMapper.xml

@@ -27,8 +27,10 @@
         partyB,t.contract_id,t.contract_id contractId,t.obj_id,t.obj_id objId,t.plan_id,t.plan_id
         planId,t.contract_name,t.contract_name contractName,t.start_time,t.start_time startTime,t.end_time,t.end_time
         endTime,t.contract_code,t.contract_code contractCode,t.obj_type,t.obj_type
-        objType,t.operator_link,t.operator_link operatorLink,t.operate
+        objType,t.operator_link,t.operator_link operatorLink,t.operate,td.`name` planTypeName,ccp.plan_type planType
         from contract_change_plan_detail t
+        inner join contract_change_plan ccp on t.plan_id = ccp.plan_id and ccp.status_cd = '0' and ccp.store_id = t.store_id
+        left join t_dict td on ccp.plan_type = td.status_cd and td.table_name = 'contract_change_plan' and td.table_columns = 'plan_type'
         where 1 =1
         <if test="aLink !=null and aLink != ''">
             and t.a_link= #{aLink}