取消水位库容填报统计为总状态

guoshilong

2023-11-22 3791567a09f587c7d560e0e54d6c85c40b51045b

取消水位库容填报统计为总状态

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java

@@ -243,7 +243,6 @@
        CompletableFuture<List<Map<String,Object>>> tbAttResWaterBlock = getTbInfo("tb_att_res_water_block",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbAttResWaterDelivery = getTbInfo("tb_att_res_water_delivery",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbFileStorageLocation = getTbInfo("tb_file_storage_location",resGuid,executor);
        CompletableFuture<List<Map<String,Object>>> tbResStagCapDisc = getTbInfo("tb_res_stag_cap_disc",resGuid,executor);
        //等待所有任务执行完成
        try {
            CompletableFuture.allOf(
@@ -260,8 +259,7 @@
                tbAttResSafetyMonitor,
                tbAttResStagChar,
                tbAttResWaterBlock,
                tbAttResWaterDelivery,
                tbResStagCapDisc
                tbAttResWaterDelivery
            ).get();
            // 数据处理
            list.addAll(tbAttResBaseInfo.get());
@@ -278,7 +276,6 @@
            list.addAll(tbAttResWaterBlock.get());
            list.addAll(tbAttResWaterDelivery.get());
            list.addAll(tbFileStorageLocation.get());
            list.addAll(tbResStagCapDisc.get());
        } catch (InterruptedException e) {
            e.printStackTrace();
        } catch (ExecutionException e) {

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResStagCapDiscServiceImpl.java

@@ -99,15 +99,15 @@
            Date now = DateUtil.now();
            //更新数据
            tbResStagCapDisc.setUpdateTime(now);
            b = updateById(tbResStagCapDisc);
             updateById(tbResStagCapDisc);
        }

        if (b){
            if (!edit) {
                tbAttResBaseService.updateFinalState(list.get(0).getResGuid(), list.get(0).getCheckState());
            }
            return true;
        }
//        if (b){
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(list.get(0).getResGuid(), list.get(0).getCheckState());
//            }
//            return true;
//        }

        return true;
    }