水库填报修改

zhongrj

2023-08-22 b7d5b529707e5bd98ec334c1be4b13c21e69f6e6

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

@@ -92,6 +92,7 @@
   private int addOrUpdateByGuid(TbAttResSafetyMonitor oldAbAttResBase,TbAttResSafetyMonitor tbAttResSafetyMonitor){
      int i = 0;
      if (null!=oldAbAttResBase){
         tbAttResSafetyMonitor.setGuid(oldAbAttResBase.getGuid());
         // 更新
         i = baseMapper.updateById(tbAttResSafetyMonitor);
      }else {
@@ -160,6 +161,10 @@
      if (newTbAttResSafetyMonitor.getCheckState()==3){
         fillName = "退回" + (null==newTbAttResSafetyMonitor.getCheckLog()?"":":" + newTbAttResSafetyMonitor.getCheckLog());
      }
      if (newTbAttResSafetyMonitor.getCheckState()==4){
         fillName = "编辑";
         newTbAttResSafetyMonitor.setCheckState(oldAbAttResBase.getCheckState());
      }

      // 拼接
      String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());