guoshilong
2023-05-29 821ca65b5facf2470306ca51cc5057d6417373e8
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
19 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java 11 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResFlseLim.java
@@ -52,6 +52,13 @@
    private String tbFloodSeasonEnd;
    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人 ")
    @TableField("\"update_by\"")
    private String updateBy;
    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间 ")
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResFlseLimMapper.xml
@@ -13,6 +13,7 @@
        <if test="attResFlseLim.tbFloodSeasonEnd !=null and attResFlseLim.tbFloodSeasonEnd != ''">
            "tb_flood_season_end" = #{attResFlseLim.tbFloodSeasonEnd},
        </if>
        "update_by" = #{attResFlseLim.updateBy},
        "update_time" = #{attResFlseLim.updateTime}
        WHERE "res_guid" = #{attResFlseLim.resGuid} and "flood_season_name" = #{type}
    </update>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
@@ -9,9 +9,11 @@
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,9 @@
    @Autowired
    private IAttResWaterBlockService attResWaterBlockService;
    @Autowired
    private IUserClient userClient;
    @Override
    @Transactional
    public Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO) {
@@ -43,16 +48,22 @@
        if (null != editResInfoVO.getXqswObjQ()) {
            AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
            attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimQ.setUpdateTime(DateUtil.now());
            attResFlseLimQ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
        }
        if (null != editResInfoVO.getXqswObjZ()) {
            AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
            attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimZ.setUpdateTime(DateUtil.now());
            attResFlseLimZ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
        }
        if (null != editResInfoVO.getXqswObjH()) {
            AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
            attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
            attResFlseLimH.setUpdateTime(DateUtil.now());
            attResFlseLimH.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
            baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
        }