From cf7ca83e06bef317c8d49145061db99518b58a86 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 九月 2020 18:01:52 +0800
Subject: [PATCH] 优化代码
---
java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java | 9 +++++++++
java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml | 5 ++++-
java110-bean/src/main/java/com/java110/po/contract/ContractPo.java | 9 +++++++++
service-store/src/main/java/com/java110/store/api/ContractApi.java | 19 +++++++++++++++++++
4 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java b/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
index 1459694..6a34de7 100644
--- a/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
@@ -34,6 +34,7 @@
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 void setStateName(String stateName) {
this.stateName = stateName;
}
+
+ public String getStateDesc() {
+ return stateDesc;
+ }
+
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/po/contract/ContractPo.java b/java110-bean/src/main/java/com/java110/po/contract/ContractPo.java
index 6c41615..55fd092 100644
--- a/java110-bean/src/main/java/com/java110/po/contract/ContractPo.java
+++ b/java110-bean/src/main/java/com/java110/po/contract/ContractPo.java
@@ -22,6 +22,7 @@
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 void setOperatorLink(String operatorLink) {
this.operatorLink = operatorLink;
}
+
+ public String getStateDesc() {
+ return stateDesc;
+ }
+
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
}
diff --git a/java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml
index 30ec9cb..d749bbb 100644
--- a/java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml
+++ b/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>
diff --git a/service-store/src/main/java/com/java110/store/api/ContractApi.java b/service-store/src/main/java/com/java110/store/api/ContractApi.java
index c2c79e0..5b3aa51 100644
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -140,6 +140,25 @@
}
/**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @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);
+ }
+
+ /**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
* @param reqJson
--
Gitblit v1.8.0