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

guoshilong

2024-02-22 9a1fc806b7cd4e4e11778f9d3bf51987f8b7908b

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

@@ -60,11 +60,11 @@

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjQ().getTbFlseLimStag();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
            editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
            editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
@@ -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();
@@ -81,11 +84,11 @@

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjZ().getTbFlseLimStag();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
            editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
            editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
@@ -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();
@@ -102,11 +109,11 @@

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjH().getTbFlseLimStag();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
            editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
            editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
@@ -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,"后汛期");
         }
      }

      // 修改水位特征参数