优化代码

java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java

@@ -34,6 +34,7 @@ public class ContractDto extends PageDto implements Serializable {
     private String startTime;
     private String endTime;
     private String state;
+    private String stateDesc;
     private String contractCode;
     private String objType;
     private String operatorLink;
@@ -246,4 +247,12 @@ public class ContractDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getStateDesc() {
+        return stateDesc;
+    }
+
+    public void setStateDesc(String stateDesc) {
+        this.stateDesc = stateDesc;
+    }
 }

java110-bean/src/main/java/com/java110/po/contract/ContractPo.java

@@ -22,6 +22,7 @@ public class ContractPo implements Serializable {
     private String startTime;
     private String endTime;
     private String state;
+    private String stateDesc;
     private String contractCode;
     private String objType;
     private String operatorLink;
@@ -193,4 +194,12 @@ public class ContractPo implements Serializable {
     public void setOperatorLink(String operatorLink) {
         this.operatorLink = operatorLink;
     }
+
+    public String getStateDesc() {
+        return stateDesc;
+    }
+
+    public void setStateDesc(String stateDesc) {
+        this.stateDesc = stateDesc;
+    }
 }

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

@@ -24,7 +24,7 @@
         partyB,t.contract_id,t.contract_id contractId,t.obj_id,t.obj_id objId,t.contract_name,t.contract_name
         contractName,t.start_time,t.start_time startTime,t.end_time,t.end_time
         endTime,t.state,t.contract_code,t.contract_code contractCode,t.obj_type,t.obj_type
-        objType,t.operator_link,t.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName
+        objType,t.operator_link,t.operator_link operatorLink,ct.type_name contractTypeName,td.`name` stateName,t.state_desc stateDesc
         from contract t
         LEFT JOIN contract_type ct on t.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id = t.store_id
         LEFT JOIN t_dict td on td.status_cd = t.state and td.table_name = 'contract' and td.table_columns = 'state'
@@ -154,6 +154,9 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
+        <if test="stateDesc !=null and stateDesc != ''">
+            , t.state_desc= #{stateDesc}
+        </if>
         <if test="contractCode !=null and contractCode != ''">
             , t.contract_code= #{contractCode}
         </if>

service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -139,6 +139,25 @@ public class ContractApi {
         return updateContractBMOImpl.update(contractPo, reqJson);
     }
 
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /contract/auditContract
+     * @path /app/contract/auditContract
+     */
+    @RequestMapping(value = "/auditContract", method = RequestMethod.POST)
+    public ResponseEntity<String> auditContract(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含状态");
+        Assert.hasKeyAndValue(reqJson, "stateDesc", "请求报文中未包含状态");
+        Assert.hasKeyAndValue(reqJson, "contractId", "contractId不能为空");
+
+
+        ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
+        return updateContractBMOImpl.update(contractPo, reqJson);
+    }
+
     /**
      * 微信删除消息模板
      *