Jelajahi Sumber

合同详情

ljy121 1 tahun lalu
induk
melakukan
12bc239af6

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

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

+ 2 - 0
zjugis-business/src/main/java/com/zjugis/business/service/ContractSubService.java

@@ -63,5 +63,7 @@ public interface ContractSubService {
 
 
     ContractSubStatisticResp statistic(ContractSubDto contractSubDto);
+
+    List<ContractSub> selectListByParentId(String id);
 }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.*;
 import com.zjugis.business.bean.entity.Contract;
+import com.zjugis.business.bean.entity.ContractSub;
 import com.zjugis.business.bean.entity.Project;
 import com.zjugis.business.bean.entity.ProjectAmount;
 import com.zjugis.business.bean.request.ContractRequest;
@@ -320,6 +321,8 @@ public class ContractServiceImpl implements ContractService{
                     }).collect(Collectors.toList()));
                 }
             }
+            List<ContractSub> subList = contractSubService.selectListByParentId(dbParent.getId());
+            r.setContractSubList(subList);
             parents.add(r);
         }
         return parents;

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

@@ -6,7 +6,6 @@ import com.zjugis.business.bean.dto.ContractSubDto;
 import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.ContractApply;
 import com.zjugis.business.bean.entity.ContractSub;
-import com.zjugis.business.bean.entity.Supplier;
 import com.zjugis.business.bean.response.ContractSubResp;
 import com.zjugis.business.bean.response.ContractSubStatisticResp;
 import com.zjugis.business.constants.ContractApplyConstants;
@@ -69,6 +68,18 @@ public class ContractSubServiceImpl implements ContractSubService {
     public ContractSubStatisticResp statistic(ContractSubDto contractSubDto) {
         return contractSubMapper.statistic(contractSubDto);
     }
+
+    /**
+     * @param id
+     * @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);
+    }
+
     /**
      * 通过ID查询单条数据
      *