java110 5 lat temu
rodzic
commit
7678c9ddae

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

@@ -56,6 +56,9 @@ public class ContractDto extends PageDto implements Serializable {
     private String contractTypeName;
     private String stateName;
 
+    private String parentContractCode;
+    private String parentContractName;
+
     private List<ContractAttrDto> attrs;
 
     public String getaLink() {
@@ -281,4 +284,20 @@ public class ContractDto extends PageDto implements Serializable {
     public void setContractParentId(String contractParentId) {
         this.contractParentId = contractParentId;
     }
+
+    public String getParentContractCode() {
+        return parentContractCode;
+    }
+
+    public void setParentContractCode(String parentContractCode) {
+        this.parentContractCode = parentContractCode;
+    }
+
+    public String getParentContractName() {
+        return parentContractName;
+    }
+
+    public void setParentContractName(String parentContractName) {
+        this.parentContractName = parentContractName;
+    }
 }

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

@@ -212,4 +212,6 @@ public class ContractPo implements Serializable {
     public void setContractParentId(String contractParentId) {
         this.contractParentId = contractParentId;
     }
+
+
 }

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

@@ -27,11 +27,13 @@
         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,t.state_desc stateDesc,t.contract_parent_id contractParentId
+        stateName,t.state_desc stateDesc,t.contract_parent_id contractParentId,tt.contract_code parentContractCode,
+        tt.contract_name parentContractName
         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'
+        left join contract tt on t.contract_parent_id = tt.contract_id and tt.status_cd = '0' and tt.store_id = t.store_id
         where 1 =1
         <if test="aLink !=null and aLink != ''">
             and t.a_link= #{aLink}