优化代码

java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java

@@ -20,6 +20,7 @@ public class ContractChangePlanDto extends ContractDto implements Serializable {
     public static final String STATE_S = "22";//11 待审核 22 审核通过 33 审核失败
     public static final String STATE_F = "33";//11 待审核 22 审核通过 33 审核失败
     private String planType;
+    private String planTypeName;
     private String contractId;
     private String planId;
     private String remark;
@@ -105,4 +106,12 @@ public class ContractChangePlanDto extends ContractDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPlanTypeName() {
+        return planTypeName;
+    }
+
+    public void setPlanTypeName(String planTypeName) {
+        this.planTypeName = planTypeName;
+    }
 }

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

@@ -26,11 +26,12 @@
         partyB,c.contract_id,c.contract_id contractId,c.obj_id,c.obj_id objId,c.contract_name,c.contract_name
         contractName,c.start_time,c.start_time startTime,c.end_time,c.end_time
         endTime,c.contract_code,c.contract_code contractCode,c.obj_type,c.obj_type
-        objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName
+        objType,c.operator_link,c.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,td1.name planTypeName
         from contract_change_plan t
-        inner join contract c on t.contract_id = c.contract_id and c.status_cd = '0' and c.store_id = t.store_id
+        inner join contract_change_plan_detail c on t.contract_id = c.contract_id  and c.store_id = t.store_id and c.operate = 'ADD'
         inner JOIN contract_type ct on c.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = c.store_id
         left JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract_change_plan' and td.table_columns = 'state'
+        left JOIN t_dict td1 on td1.status_cd = t.plan_type and td1.table_name = 'contract_change_plan' and td1.table_columns = 'plan_type'
         where 1 =1
         <if test="planType !=null and planType != ''">
             and t.plan_type= #{planType}