Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-06-20 335ed68a9de05da5a073cfa259c453eba304e91b

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

@@ -72,7 +72,10 @@
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimQ.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
         Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
         if (ret == 0) {
            baseMapper.addAttResFlseLim(attResFlseLimQ,"前汛期");
         }
      }
      if (null != editResInfoVO.getXqswObjZ()  && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjZ().getTbFlseLimStag()))) {
         AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
@@ -93,7 +96,11 @@
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimZ.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
         Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");

         if (ret == 0) {
            baseMapper.addAttResFlseLim(attResFlseLimZ,"中汛期");
         }
      }
      if (null != editResInfoVO.getXqswObjH() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjH().getTbFlseLimStag()))) {
         AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
@@ -114,7 +121,10 @@
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimH.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
         Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
         if (ret == 0) {
            baseMapper.addAttResFlseLim(attResFlseLimH,"后汛期");
         }
      }

      // 修改水位特征参数