fix(jg):导入管道历史设备状态修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
@@ -1693,6 +1694,7 @@ public class DataDockServiceImpl {
             useInfo.setRecDate(new Date());
             useInfo.setDataSource(paramsDto.getDataSource());
             useInfo.setIsIntoManagement(Boolean.TRUE);
+            useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
             useInfo.setUseUnitCreditCode(paramsDto.getCompanyCode());
             useInfo.setUseUnitName(paramsDto.getCompanyName());
             useInfo.setProjectContraption(paramsDto.getProjectContraption());
@@ -1793,6 +1795,7 @@ public class DataDockServiceImpl {
             esEquipmentDto.setEQU_DEFINE_CODE(paramsDto.getEquDefineCode());
             esEquipmentDto.setEQU_DEFINE(paramsDto.getEquDefineName());
             esEquipmentDto.setSTATUS("已认领");
+            esEquipmentDto.setEQU_STATE(EquimentEnum.ZAIYONG.getCode());
             esEquipmentDto.setUSC_UNIT_CREDIT_CODE(pipeline.getUscUnitCreditCode());
             esEquipmentDto.setUSC_UNIT_NAME(pipeline.getUscUnitName());
             esEquipmentDto.setPROJECT_CONTRAPTION(paramsDto.getProjectContraption());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2489,7 +2489,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @return
      */
     private boolean checkEquStatusInUse(String record) {
-        IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.lambdaQuery().select(IdxBizJgUseInfo::getEquState).eq(IdxBizJgUseInfo::getRecord, record).one();
+        IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.lambdaQuery().eq(IdxBizJgUseInfo::getRecord, record).one();
         return EquimentEnum.ZAIYONG.getCode().toString().equals(useInfo.getEquState());
     }