合同详情

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractResponse.java

@@ -1,6 +1,5 @@
 package com.zjugis.business.bean.response;
 
-import com.zjugis.business.bean.entity.ContractSub;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -217,7 +216,7 @@ public class ContractResponse {
 
     private List<ContractChildResponse> children;
 
-    private List<ContractSub> contractSubList;
+    private List<ContractSubResp> contractSubList;
 
     private Integer flowStatus;
 

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractSubResp.java

@@ -112,6 +112,8 @@ public class ContractSubResp {
 
     private String qualityController;
 
+    private String supplier;
+
     private String xmmc;
 
     private String xmbh;

zjugis-business/src/main/java/com/zjugis/business/mapper/ContractSubMapper.java

@@ -9,6 +9,8 @@ import com.zjugis.business.bean.response.ContractSubStatisticResp;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * (ContractSub)表数据库访问层
  *
@@ -26,5 +28,7 @@ public interface ContractSubMapper extends BaseMapper<ContractSub> {
     ContractSub selectByApplyId(String contractId);
 
     int relContractSubSize(String applyId);
+
+    List<ContractSubResp> selectListByParentId(String id);
 }
 

zjugis-business/src/main/java/com/zjugis/business/service/ContractSubService.java

@@ -64,6 +64,6 @@ public interface ContractSubService {
 
     ContractSubStatisticResp statistic(ContractSubDto contractSubDto);
 
-    List<ContractSub> selectListByParentId(String id);
+    List<ContractSubResp> selectListByParentId(String id);
 }
 

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -10,10 +10,7 @@ import com.zjugis.business.bean.entity.Project;
 import com.zjugis.business.bean.entity.ProjectAmount;
 import com.zjugis.business.bean.request.ContractRequest;
 import com.zjugis.business.bean.request.InfoRequest;
-import com.zjugis.business.bean.response.ContractChildResponse;
-import com.zjugis.business.bean.response.ContractInfoResp;
-import com.zjugis.business.bean.response.ContractMessageCountResp;
-import com.zjugis.business.bean.response.ContractResponse;
+import com.zjugis.business.bean.response.*;
 import com.zjugis.business.constants.ContractConstants;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.flow.usemoney.controller.vo.UseMoneyBondVO;
@@ -321,7 +318,7 @@ public class ContractServiceImpl implements ContractService{
                     }).collect(Collectors.toList()));
                 }
             }
-            List<ContractSub> subList = contractSubService.selectListByParentId(dbParent.getId());
+            List<ContractSubResp> subList = contractSubService.selectListByParentId(dbParent.getId());
             r.setContractSubList(subList);
             parents.add(r);
         }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractSubServiceImpl.java

@@ -74,10 +74,8 @@ public class ContractSubServiceImpl implements ContractSubService {
      * @return
      */
     @Override
-    public List<ContractSub> selectListByParentId(String id) {
-        QueryWrapper<ContractSub> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("FLOW_STATUS",90).eq("PARENT_ID",id);
-        return contractSubMapper.selectList(queryWrapper);
+    public List<ContractSubResp> selectListByParentId(String id) {
+        return contractSubMapper.selectListByParentId(id);
     }
 
     /**

zjugis-business/src/main/resources/mapper/oracle/ContractSubMapper.xml

@@ -67,5 +67,13 @@
     <select id="relContractSubSize" resultType="int">
         SELECT count(1) FROM CONTRACT_SUB WHERE CONTRACT_APPLY_ID = #{applyId,jdbcType=VARCHAR} and ISVALID = 1
     </select>
+
+    <select id="selectListByParentId" resultType="com.zjugis.business.bean.response.ContractSubResp">
+        SELECT t.*,t2.CUSTOMER_NAME as supplier,t3.NICKNAME as qualityController FROM CONTRACT_SUB t
+        LEFT JOIN CONTRACT_APPLY t1 on t1.ID = t.CONTRACT_APPLY_ID
+        LEFT JOIN SUPPLIER t2 on t2.ID = t1.SUPPLIER_ID
+        LEFT JOIN ZJUGIS_OA.SYSTEM_USERS t3 ON t3.ID = t.QUALITY_CONTROLLER_ID
+        where t.ISVALId = 1 and t.FLOW_STATUS = 90
+    </select>
 </mapper>