guoshilong
2023-06-20 335ed68a9de05da5a073cfa259c453eba304e91b
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
31 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java 16 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.java
@@ -14,4 +14,5 @@
public interface AttResFlseLimMapper extends BaseMapper<AttResFlseLim> {
    Integer updateAttResFlseLimByGuid(@Param("attResFlseLim") AttResFlseLim attResFlseLim,@Param("type")String type);
    Integer addAttResFlseLim(@Param("attResFlseLim") AttResFlseLim attResFlseLim,@Param("type")String type);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml
@@ -18,4 +18,18 @@
        WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = #{type}
    </update>
    <insert id="addAttResFlseLim">
        insert into "att_res_flse_lim"("guid", "tb_flse_lim_stag", "tb_flood_season_start", "tb_flood_season_end", "create_time",
                                         "update_time", "update_by", "res_guid", "flood_season_name")
        VALUES (rawtohex(sys_guid()),
                #{attResFlseLim.tbFlseLimStag},
                #{attResFlseLim.tbFloodSeasonStart},
                #{attResFlseLim.tbFloodSeasonEnd},
                #{attResFlseLim.updateTime},
                #{attResFlseLim.updateTime},
                #{attResFlseLim.updateBy},
                #{attResFlseLim.resGuid},
                #{type})
    </insert>
</mapper>
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,"后汛期");
            }
        }
        // 修改水位特征参数