修改查询过滤条件

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

@@ -244,7 +244,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             List<HuzhouMergesplitinfo> mergesplitinfos = mergesplitinfoMapper.selectList(lambdaQueryWrapper);
             for (HuzhouMergesplitinfo mergesplitinfo : mergesplitinfos) {
                 HuzhouProjectinfo oldpj = projectinfoService.getById(mergesplitinfo.getId());
-                //oldpj.setStage("-1");
+                //被合并的项目状态 改为"已停止"
                 oldpj.setStage("0.1");
                 projectinfoService.updateById(oldpj);
             }

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

@@ -285,6 +285,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
                 HuzhouCommonUtils.setObjectAttributes(huzhouProjectinfo, name, value);
             }
             huzhouProjectinfo.setStage("0");//设置阶段为待入库
+            huzhouProjectinfo.setType("1");
             huzhouProjectinfos.add(huzhouProjectinfo);
             this.save(huzhouProjectinfo);//添加到数据库
             userprojectService.saveFromProject(huzhouProjectinfo, "0");//保存联系人
@@ -1329,6 +1330,15 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             cityNum=projectinfoOVList.stream().filter(x->x.getAdminDivision().equals("市本级")).collect(Collectors.toList()).size();
             countryNum=total-cityNum;
         }
+        int tmpSize = 0;
+            LambdaQueryWrapper<HuzhouProjectinfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(HuzhouProjectinfo::getStage,"0")
+                    .eq(HuzhouProjectinfo::getType,"1");
+            List<HuzhouProjectinfo> tmpList = this.list(queryWrapper);
+            if (CollectionUtils.isNotEmpty(tmpList)){
+                tmpSize= tmpList.size();
+            }
+        total+=tmpSize;
         CountNumberOV result=new CountNumberOV();
         result.setTotal(total);
         result.setCityNum(cityNum);
@@ -1350,14 +1360,27 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
         //入库项目:1,配套项目：2
         projectInfo.setType(type);
-        projectInfo.setStage("0");
+        projectInfo.setStage("0.2");
         ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
         List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect).stream().filter(x->!x.getStage().equals("-1")).collect(Collectors.toList());
+        // 待申报的项目数量 stage=0
+        int tmpSize = 0;
+        if (type =="1"){
+            LambdaQueryWrapper<HuzhouProjectinfo> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(HuzhouProjectinfo::getStage,"0")
+                    .eq(HuzhouProjectinfo::getType,"1");
+            List<HuzhouProjectinfo> tmpList = this.list(queryWrapper);
+            tmpSize= tmpList.size();
+        }
+
         if(projectinfoOVList.size()>0){
             total=projectinfoOVList.size();
             cityNum=projectinfoOVList.stream().filter(x->x.getAdminDivision().equals("市本级")).collect(Collectors.toList()).size();
             countryNum=total-cityNum;
         }
+        if (tmpSize>0){
+            total=total+tmpSize;
+        }
         CountNumberOV result=new CountNumberOV();
         result.setTotal(total);
         result.setCityNum(cityNum);