修改BUG

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -177,10 +177,12 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
         lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
         if ("indoor_engin".equals(bo.getEnginClassification())) {
-            izMaterialStatisticsService.insert(bo);
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) && !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) && bo.getzEngineeringNodeBoList().size() > 0)
+                izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
             boolean flag = baseMapper.insert(add) > 0;
@@ -202,7 +204,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             }
             return flag;
         } else {
-            if (ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList())) {
                 for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
                     zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
                     zEngineeringNodeBo.setCreateTime(zEngineeringCivilVo.getCreateTime());
@@ -213,7 +215,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
 
-            } else {
+            } else if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
                 ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
                 zEngineeringNodeBo.setCivliId(zEngineeringCivilVo.getId());
                 zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
@@ -223,6 +225,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                     zEngineeringNodeBo.setId(query.getId());
                 }
                 zEngineeringNodeService.insert(zEngineeringNodeBo);
+            } else {
+                throw new RuntimeException("已存在工程,请填写施工信息");
             }
             return true;
         }
@@ -380,7 +384,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
          * 线程执行插入量
          */
         int count = 500;
-//        List<ZEngineeringCivil> newList = new ArrayList();
+        //        List<ZEngineeringCivil> newList = new ArrayList();
         if (sumcount > 0) {
             //线程数量（根据查询总数量进行分配线程数量）
             int runSize = (int) (sumcount / count + 1);
@@ -389,19 +393,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             CountDownLatch countDownLatch = new CountDownLatch(runSize);
             for (int i = 1; i <= runSize; i++) {
                 Page page = new Page<>(i, count);
-//                Page<ZEngineeringCivil> zEngineeringCivilPage = baseMapper.selectPage(page, lqw);
-//                if((i+1)==runSize){
-//                    int startIndex = (i*count);;
-//                    int endIndex = zEngineeringCivilList.size();
-//                    newList =zEngineeringCivilList.subList(startIndex,endIndex);
-//                }else{
-//                    int startIndex = i*count;;
-//                    int endIndex = (i+1)*count;
-//                    newList =zEngineeringCivilList.subList(startIndex,endIndex);
-//                }
-                System.out.println("第"+i+"次查询："+page.getSize());
-                threadPoolTaskExecutor.execute(new RiewTask( zEngineeringNodeBo, countDownLatch,page,lqw));
-                threadPoolTaskExecutor.execute(new photoTask( zEngineeringNodeBo, countDownLatch,page,lqw));
+                //                Page<ZEngineeringCivil> zEngineeringCivilPage = baseMapper.selectPage(page, lqw);
+                //                if((i+1)==runSize){
+                //                    int startIndex = (i*count);;
+                //                    int endIndex = zEngineeringCivilList.size();
+                //                    newList =zEngineeringCivilList.subList(startIndex,endIndex);
+                //                }else{
+                //                    int startIndex = i*count;;
+                //                    int endIndex = (i+1)*count;
+                //                    newList =zEngineeringCivilList.subList(startIndex,endIndex);
+                //                }
+                System.out.println("第" + i + "次查询：" + page.getSize());
+                threadPoolTaskExecutor.execute(new RiewTask(zEngineeringNodeBo, countDownLatch, page, lqw));
+                threadPoolTaskExecutor.execute(new photoTask(zEngineeringNodeBo, countDownLatch, page, lqw));
             }
             threadPoolTaskExecutor.shutdown();
             //            try {
@@ -419,41 +423,36 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     @Override
     @DynamicName(spel = "#zEngineeringReviewBo.createTime")
     public int Civilinsert(ZEngineeringReviewBo zEngineeringReviewBo) {
-        ZEngineeringNode zEngineeringNode=  zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
-        ZEngineeringCivil zEngineeringCivil= baseMapper.selectById(zEngineeringNode.getCivliId());
-        ZEngineeringCivilBo zEngineeringCivilBo=BeanUtil.copyProperties(zEngineeringCivil,ZEngineeringCivilBo.class);
-        ZEngineeringNodeBo zEngineeringNodeBo=BeanUtil.copyProperties(zEngineeringNode,ZEngineeringNodeBo.class);
+        ZEngineeringNode zEngineeringNode = zEngineeringNodeMapper.selectById(zEngineeringReviewBo.getEngInfoId());
+        ZEngineeringCivil zEngineeringCivil = baseMapper.selectById(zEngineeringNode.getCivliId());
+        ZEngineeringCivilBo zEngineeringCivilBo = BeanUtil.copyProperties(zEngineeringCivil, ZEngineeringCivilBo.class);
+        ZEngineeringNodeBo zEngineeringNodeBo = BeanUtil.copyProperties(zEngineeringNode, ZEngineeringNodeBo.class);
         zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
-        izEngineeringReviewService.Civilinsert(zEngineeringCivil,zEngineeringReviewBo);
-        areaMessageVo areaMessageVo= baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
-        BeanUtils.copyProperties(areaMessageVo,zEngineeringCivilBo);
-        Map<String,List<SysDictData>> sysDictMap= RedisUtils.getCacheMap("sys_dict");
-        sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item->{
-            if (item.getDictValue().equals(zEngineeringCivilBo.getCompletionStatus()))
-            {
+        izEngineeringReviewService.Civilinsert(zEngineeringCivil, zEngineeringReviewBo);
+        areaMessageVo areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+        BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
+        Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
+        sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
+            if (item.getDictValue().equals(zEngineeringCivilBo.getCompletionStatus())) {
                 zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
             }
         });
-        sysDictMap.get(zEngineeringCivilBo.getEnginType()+"_"+zEngineeringCivilBo.getEnginClassification()).stream().forEach(item->{
-            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType()))
-            {
+        sysDictMap.get(zEngineeringCivilBo.getEnginType() + "_" + zEngineeringCivilBo.getEnginClassification()).stream().forEach(item -> {
+            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType())) {
                 zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
             }
         });
-        sysDictMap.get("engin_cycle").stream().forEach(item->{
-            if (item.getDictValue().equals(zEngineeringCivilBo.getEnginCycle()))
-            {
+        sysDictMap.get("engin_cycle").stream().forEach(item -> {
+            if (item.getDictValue().equals(zEngineeringCivilBo.getEnginCycle())) {
                 zEngineeringCivilBo.setEnginCycle(item.getDictLabel());
             }
         });
-//        zEngineeringCivilBo.getzEngineeringNodeBo().setType(type);
-//        zEngineeringCivilBo.setEnginClassification(completionStatus);
-        if(zEngineeringCivilBo.getEnginType().equals("old_renovation"))
-        {
+        //        zEngineeringCivilBo.getzEngineeringNodeBo().setType(type);
+        //        zEngineeringCivilBo.setEnginClassification(completionStatus);
+        if (zEngineeringCivilBo.getEnginType().equals("old_renovation")) {
             zEngineeringCivilBo.setEnginType("旧改");
-        }else if (zEngineeringCivilBo.getEnginType().equals("new_built"))
-        {
+        } else if (zEngineeringCivilBo.getEnginType().equals("new_built")) {
             zEngineeringCivilBo.setEnginType("新建");
         }
 
@@ -462,7 +461,6 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     }
 
 
-
 }