Commit 4a3f8d1a authored by suhuiguang's avatar suhuiguang

refeat(监管业务):增加施工单位信息到使用信息表

1.使用信息表增加usc单位名称级code字段,移交、安装告知写入(已加),登记后需要清除(待加)
parent 5e9be100
...@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapBuilder; ...@@ -5,6 +5,7 @@ import cn.hutool.core.map.MapBuilder;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -41,6 +42,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; ...@@ -41,6 +42,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum; 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.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model; import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO; import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO; import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
...@@ -111,6 +113,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -111,6 +113,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
@Autowired @Autowired
private final EsEquipmentDao esEquipmentDao; private final EsEquipmentDao esEquipmentDao;
@Autowired
private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
/** /**
* 保存和保存并提交 * 保存和保存并提交
...@@ -607,6 +611,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, ...@@ -607,6 +611,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
.build(); .build();
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap); tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
updateEsEquipment(equipTransferEq, jgEquipTransfer); updateEsEquipment(equipTransferEq, jgEquipTransfer);
LambdaUpdateWrapper<IdxBizJgUseInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(IdxBizJgUseInfo::getRecord, equipTransferEq.getEquId());
lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_CREDIT_CODE, jgEquipTransfer.getInstallUnitCreditCode());
lambdaUpdateWrapper.set(IdxBizJgUseInfo::getUSC_UNIT_NAME, jgEquipTransfer.getInstallUnitName());
idxBizJgUseInfoServiceImpl.update(lambdaUpdateWrapper);
}); });
} }
// 上个代办改为已办 // 上个代办改为已办
......
...@@ -1440,6 +1440,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1440,6 +1440,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
} }
// 更新关联设备表 // 更新关联设备表
jgInstallationNoticeEqService.updateBatchById(jgRelationEquips); jgInstallationNoticeEqService.updateBatchById(jgRelationEquips);
// 发送数据刷新消息 // 发送数据刷新消息
...@@ -1671,6 +1672,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1671,6 +1672,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
idxBizJgUseInfo.setStreetName(jgInstallationNotice.getStreetName()); idxBizJgUseInfo.setStreetName(jgInstallationNotice.getStreetName());
idxBizJgUseInfo.setAddress(jgInstallationNotice.getAddress()); idxBizJgUseInfo.setAddress(jgInstallationNotice.getAddress());
idxBizJgUseInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian()); idxBizJgUseInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian());
idxBizJgUseInfo.setUSC_UNIT_NAME(jgInstallationNotice.getInstallUnitName());
idxBizJgUseInfo.setUSC_UNIT_CREDIT_CODE(jgInstallationNotice.getInstallUnitCreditCode());
if ("8100".equals(jgInstallationNotice.getEquCategoryCode()) || "8200".equals(jgInstallationNotice.getEquCategoryCode())) { if ("8100".equals(jgInstallationNotice.getEquCategoryCode()) || "8200".equals(jgInstallationNotice.getEquCategoryCode())) {
idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode())); idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment