资料填报状态逻辑调整

zhongrj

2023-11-06 c5e199a4ff251c281ac638f7230b1bcd180ca0f8

资料填报状态逻辑调整

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

@@ -119,6 +119,7 @@
        if (null!=tbAttResBase.getGuid()){
            // 更新
            i = baseMapper.updateById(tbAttResBase);
            updateFinalState(tbAttResBase.getGuid(),tbAttResBase.getCheckState());
        }else {
            tbAttResBase.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResBase);
@@ -327,7 +328,7 @@
    public Boolean updateFinalState(String resGuid, int state) {
        TbAttResBase tbAttResBase = new TbAttResBase();
        tbAttResBase.setGuid(resGuid);
        if (state==2){
        if (state==1 || state==2){
            // 审核通过，判断是否已全部通过审核
            Boolean flag = baseMapper.getFinalCheckStateByGuid(resGuid);
            if (flag){

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

@@ -56,7 +56,7 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResBuildInfo);
        if (i>0){
            tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),0);
//            tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),0);
            return true;
        }
        return false;
@@ -109,6 +109,7 @@
            tbAttResBuildInfo.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResBuildInfo);
            tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(), tbAttResBuildInfo.getCheckState());
        }else {
            tbAttResBuildInfo.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResBuildInfo);

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

@@ -60,9 +60,9 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResEngBene);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), 0);
//            }
            return true;
        }
        return false;
@@ -115,6 +115,7 @@
            tbAttResEngBene.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResEngBene);
            tbAttResBaseService.updateFinalState(tbAttResEngBene.getResGuid(), tbAttResEngBene.getCheckState());
        }else {
            tbAttResEngBene.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResEngBene);

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

@@ -60,9 +60,9 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResMgrSysB);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResMgrSysB.getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(tbAttResMgrSysB.getResGuid(), 0);
//            }
            return true;
        }
        return false;
@@ -115,6 +115,7 @@
            tbAttResMgrSysB.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResMgrSysB);
            tbAttResBaseService.updateFinalState(tbAttResMgrSysB.getResGuid(), tbAttResMgrSysB.getCheckState());
        }else {
            tbAttResMgrSysB.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResMgrSysB);

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

@@ -66,9 +66,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -100,10 +100,12 @@
            //如果是中途管理员编辑新增了一个，将状态设置为和原有的状态一致
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -60,9 +60,9 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResProjectUtilize);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(), 0);
//            }
            return true;
        }
        return false;
@@ -115,6 +115,7 @@
            tbAttResProjectUtilize.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResProjectUtilize);
            tbAttResBaseService.updateFinalState(tbAttResProjectUtilize.getResGuid(),tbAttResProjectUtilize.getCheckState());
        }else {
            tbAttResProjectUtilize.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResProjectUtilize);

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

@@ -82,9 +82,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -115,10 +115,12 @@
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -64,9 +64,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -97,10 +97,12 @@
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -64,9 +64,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -97,10 +97,12 @@
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -60,9 +60,9 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResSafetyMonitor);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), 0);
//            }
            return true;
        }
        return false;
@@ -115,6 +115,7 @@
            tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResSafetyMonitor);
            tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(),tbAttResSafetyMonitor.getCheckState());
        }else {
            tbAttResSafetyMonitor.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResSafetyMonitor);

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

@@ -60,9 +60,9 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbAttResStagChar);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(), 0);
//            }
            return true;
        }
        return false;
@@ -91,10 +91,10 @@
        }
        // 驳回情况下将状态修改回0即已填写未提交状态
        if (tbAttResStagChar.getCheckState()==3){
            tbAttResStagChar.setCheckState(0);
            detail.setCheckState(0);
        }
        // 更新数据
        int i = baseMapper.updateById(tbAttResStagChar);
        int i = baseMapper.updateById(detail);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(), tbAttResStagChar.getCheckState());
@@ -115,6 +115,7 @@
            tbAttResStagChar.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbAttResStagChar);
            tbAttResBaseService.updateFinalState(tbAttResStagChar.getResGuid(),tbAttResStagChar.getCheckState());
        }else {
            tbAttResStagChar.setCreateTime(new Date());
            i = baseMapper.insert(tbAttResStagChar);
@@ -153,12 +154,12 @@
        // 判断是否存在
        if (null==oldAbAttResBase){
            // 填报
            newTbAttResStagChar.setCheckLog(builder.toString());
            oldAbAttResBase.setCheckLog(builder.toString());
        }else {
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getCheckLog()?"":oldAbAttResBase.getCheckLog());
            stringBuilder.append(builder);
            // 填报
            newTbAttResStagChar.setCheckLog(stringBuilder.toString());
            oldAbAttResBase.setCheckLog(stringBuilder.toString());
        }
    }

@@ -183,6 +184,7 @@
        }
        if (newTbAttResStagChar.getCheckState()==4){
            fillName = "编辑";
            oldAbAttResBase.setCheckState(oldAbAttResBase.getCheckState());
            newTbAttResStagChar.setCheckState(oldAbAttResBase.getCheckState());
        }

@@ -207,6 +209,7 @@
            StringBuilder stringBuilder = new StringBuilder(null==oldAbAttResBase.getLog()?"":oldAbAttResBase.getLog());
            stringBuilder.append(builder);
            // 填报
            oldAbAttResBase.setLog(stringBuilder.toString());
            newTbAttResStagChar.setLog(stringBuilder.toString());
        }
    }

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

@@ -64,9 +64,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -97,10 +97,12 @@
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -64,9 +64,9 @@
        // 创建或更新数据
        boolean flag = addOrUpdate(oldList,newList);
        if (flag){
            if (!edit) {
                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
            }
//            if (!edit) {
//                tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
//            }
            return true;
        }
        // 返回
@@ -97,10 +97,12 @@
        if (addList.size()>0){
            // 批量新增
            addFlag = saveBatch(addList);
            tbAttResBaseService.updateFinalState(addList.get(0).getResGuid(),addList.get(0).getCheckState());
        }
        if (updateList.size()>0){
            // 批量更新
            addFlag = updateBatchById(updateList);
            tbAttResBaseService.updateFinalState(updateList.get(0).getResGuid(),updateList.get(0).getCheckState());
        }
        if (removeList.size()>0){
            // 批量删除

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

@@ -59,9 +59,6 @@
        // 修改
        int i = addOrUpdateByGuid(detail,tbFileStorageLocation);
        if (i>0){
            if (!edit) {
                tbAttResBaseService.updateFinalState(tbFileStorageLocation.getResGuid(), 0);
            }
            return true;
        }
        return false;
@@ -114,6 +111,7 @@
            tbFileStorageLocation.setGuid(oldAbAttResBase.getGuid());
            // 更新
            i = baseMapper.updateById(tbFileStorageLocation);
            tbAttResBaseService.updateFinalState(tbFileStorageLocation.getResGuid(), tbFileStorageLocation.getCheckState());
        }else {
            tbFileStorageLocation.setCreateTime(new Date());
            i = baseMapper.insert(tbFileStorageLocation);