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/TbAttResBuildInfoServiceImpl.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.sjztmd.entity.TbAttResBuildInfo;
import cn.gistack.sm.sjztmd.mapper.TbAttResBuildInfoMapper;
import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbAttResBuildInfoService;
import cn.gistack.system.user.feign.IUserClient;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -28,6 +29,9 @@
   @Autowired
   private IUserClient userClient;

   @Autowired
   private ITbAttResBaseService tbAttResBaseService;

   /**
    * 查询水库填报详情信息
    * @param guid
@@ -52,6 +56,7 @@
      // 修改
      int i = addOrUpdateByGuid(detail,tbAttResBuildInfo);
      if (i>0){
         tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),0);
         return true;
      }
      return false;
@@ -64,6 +69,11 @@
    */
   @Override
   public boolean auditByGuid(TbAttResBuildInfo tbAttResBuildInfo) {
      boolean edit = false;
      // 编辑标记
      if (tbAttResBuildInfo.getCheckState()==4){
         edit = true;
      }
      // 查询是否存在
      TbAttResBuildInfo detail = baseMapper.getDetailByResGuid(tbAttResBuildInfo.getResGuid());
      // 更新操作日志
@@ -80,6 +90,9 @@
      // 更新数据
      int i = baseMapper.updateById(tbAttResBuildInfo);
      if (i>0){
         if (!edit) {
            tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),tbAttResBuildInfo.getCheckState());
         }
         return true;
      }
      return false;