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());
@@ -84,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());
@@ -109,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());