统计1.1

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouContractinfoService.java

@@ -31,4 +31,6 @@ public interface IHuzhouContractinfoService extends IService<HuzhouContractinfo>
     List<HuzhouContractinfo> getContractinfoByprojectId(String projectid);
 
     void approvalContractinfo(MultipartFile[] file, List<HuzhouContractinfo> contractList, String taskId, String flag, String projectid, String comment,boolean isEdit) throws IOException;
+
+    List<HuzhouContractinfo> ListByProjectIds(List<String> projectIds);
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java

@@ -96,7 +96,7 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
 
     List<Select> getTaskNameTypeDict(String projectid);
 
-    List<HuzhouPlaninfo> ListByProjectIds(String[] projectIds);
+    List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds);
 
 
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java

@@ -250,5 +250,16 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
         }
     }
 
+    @Override
+    public List<HuzhouContractinfo> ListByProjectIds(List<String> projectIds) {
+        LambdaQueryWrapper<HuzhouContractinfo> query = new LambdaQueryWrapper<>(new HuzhouContractinfo())
+                .in(HuzhouContractinfo::getProjectId,projectIds)
+                .select(HuzhouContractinfo::getProjectId,HuzhouContractinfo::getId);
+        List<HuzhouContractinfo> contractInfoList=contractinfoMapper.selectList(query);
+        List<String> contractIds = contractInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<HuzhouContractinfo> result = contractinfoMapper.selectBatchIds(contractIds);
+        return result;
+    }
+
 
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@@ -57,6 +57,7 @@ import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * (HuzhouPlaninfo)表服务实现类
@@ -971,8 +972,14 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
     }
 
     @Override
-    public List<HuzhouPlaninfo> ListByProjectIds(String[] projectIds) {
+    public List<HuzhouPlaninfo> ListByProjectIds(List<String> projectIds) {
-        return null;
+        LambdaQueryWrapper<HuzhouPlaninfo> query = new LambdaQueryWrapper<>(new HuzhouPlaninfo())
+                .in(HuzhouPlaninfo::getProjectId,projectIds)
+                .select(HuzhouPlaninfo::getProjectId,HuzhouPlaninfo::getId);
+        List<HuzhouPlaninfo> planInfoList=planinfoMapper.selectList(query);
+        List<String> planIds = planInfoList.stream().map(x -> x.getId()).collect(Collectors.toList());
+        List<HuzhouPlaninfo> result = planinfoMapper.selectBatchIds(planIds);
+        return result;
     }
 
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -86,8 +86,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
     @Autowired
     private IHuzhouUploadfileinfoService uploadfileinfoService;
 
-    @Autowired
+    @Autowired IHuzhouPlaninfoService planinfoService;
-    private IHuzhouPlaninfoService huzhouPlaninfoService;
+
+    @Autowired IHuzhouContractinfoService contractinfoService;
+
     @Override
 
     public void submitProject(MultipartFile[] multipartFile,HuzhouProjectinfo info) throws IOException {
@@ -514,13 +516,19 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             }
         }
         zIds.addAll(cIds);
-
+        List<HuzhouPlaninfo> planInfoList = planinfoService.ListByProjectIds(zIds);
-
+        int fininshNum = (int) planInfoList.stream().filter(x -> (x.getIsfinish().equals("2"))).count();
-        return null;
+        int unfininshNum=planInfoList.size()-fininshNum;
+        ProjectProgressOV result = ProjectProgressOV.builder().fininshNum(fininshNum).unfininshNum(unfininshNum).build();
+        return result;
     }
 
     @Override
     public FundOV countFund() {
+        //1、根据项目ids查合同支付总金额
+        //2、遍历每个合同，取支付阶段汇成列表
+        //3、根据项目ids查所有计划
+        //4、
         return null;
     }
 

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectProgressOV.java

@@ -1,4 +1,13 @@
 package com.easy.admin.modules.huzhou.vo;
 
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@Builder(toBuilder = true)
 public class ProjectProgressOV {
+    private Integer fininshNum;
+    private Integer unfininshNum;
 }