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

guoshilong

2023-05-26 ff6f8f0b00136dfab053d78826e876e15bf9e9dd

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

@@ -3,9 +3,11 @@

import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.AttResFlseLimMapper;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -29,6 +31,9 @@
   @Autowired
   private IAttResStagCharService attResStagCharService;

   @Autowired
   private IAttResWaterBlockService attResWaterBlockService;

   @Override
   @Transactional
   public Boolean updateAttResFlseLimByGuid(EditResInfoVO editResInfoVO) {
@@ -41,12 +46,12 @@
         baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
      }
      if (null != editResInfoVO.getXqswObjZ()) {
         AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjQ();
         AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
         attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
         baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
      }
      if (null != editResInfoVO.getXqswObjH()) {
         AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjQ();
         AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
         attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
         baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
      }
@@ -71,6 +76,14 @@
      if (StringUtil.isNotBlank(editResInfoVO.getWatShedArea()))
         attResStagChar.setWatShedArea(editResInfoVO.getWatShedArea());

      // 修改坝顶高程
      if (StringUtil.isNotBlank(editResInfoVO.getTopDamTopElevation())) {
         AttResWaterBlock resWaterBlock = new AttResWaterBlock();
         resWaterBlock.setResGuid(editResInfoVO.getResGuid());
         resWaterBlock.setTopDamTopElevation(editResInfoVO.getTopDamTopElevation());
         attResWaterBlockService.updateAttResWaterBlockByResId(resWaterBlock);
      }

      return attResStagCharService.customizeUpdateByGuid(attResStagChar);
   }
}