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

guoshilong

2023-09-11 b6a42ed2c7bb93651a9a026afb3ee83449ed8256

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

@@ -3,6 +3,7 @@
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.entity.TbAttResWaterDelivery;
import cn.gistack.sm.sjztmd.mapper.TbAttResWaterDeliveryMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResWaterDeliveryService;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -31,6 +32,9 @@
   @Autowired
   private IUserClient userClient;

   @Autowired
   private ITbAttResBaseService tbAttResBaseService;

   /**
    * 查询水库填报详情信息
    * @param guid
@@ -48,14 +52,25 @@
    */
   @Override
   public boolean updateByGuid(List<TbAttResWaterDelivery> newList) {
      boolean edit = false;
      // 编辑标记
      if (newList.get(0).getCheckState()==4){
         edit = true;
      }
      // 查询是否存在
      List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
      // 更新日志
      setUpdateLog(oldList,newList);
      // 创建或更新数据
      boolean flag = addOrUpdate(oldList,newList);
      if (flag){
         if (!edit) {
            tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), 0);
         }
         return true;
      }
      // 返回
      return flag;
      return false;
   }

   /**
@@ -105,6 +120,11 @@
    */
   @Override
   public boolean auditByGuid(List<TbAttResWaterDelivery> newList) {
      boolean edit = false;
      // 编辑标记
      if (newList.get(0).getCheckState()==4){
         edit = true;
      }
      // 查询是否存在
      List<TbAttResWaterDelivery> oldList = baseMapper.getDetailByResGuid(newList.get(0).getResGuid());
      // 更新操作日志
@@ -113,8 +133,14 @@
      setUpdateCheckLog(oldList,newList);
      // 更新数据
      boolean batch = updateBatchById(newList);
      if (batch){
         if (!edit) {
            tbAttResBaseService.updateFinalState(newList.get(0).getResGuid(), newList.get(0).getCheckState());
         }
         return true;
      }
      // 返回
      return batch;
      return false;
   }

   /**
@@ -194,10 +220,8 @@
         if (newTbAttResWaterDelivery.getCheckState()==4){
            fillName = "编辑";
            // 找到相关的 guid 数据
            for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
               if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                  newTbAttResWaterDelivery.setCheckState(tbAttResWaterDelivery.getCheckState());
               }
            if (oldList.size()>0) {
               newTbAttResWaterDelivery.setCheckState(oldList.get(0).getCheckState());
            }
         }