Skip to content

A
amos-boot-biz
Commit 852b7336 authored by suhuiguang's avatar suhuiguang
Browse files
Options

feat(jg): 设备业务履历

1.设备启用停用、单位变更登记、移装变更登记、注销报废增加设备履历
parent 253795a1
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 8 deletions
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/JgChangeRegistrationTransferServiceImpl.java
View file @ 852b7336
......@@ -87,8 +87,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
private static final String PROCESS_DEFINITION_KEY = "changeRegistrationTransfer";
private static final String TABLE_PAGE_ID = "changeRegistrationTransfer";
private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
RedisUtils redisUtils;
@Autowired
......@@ -121,8 +120,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
private JgChangeRegistrationUnitEqMapper jgChangeRegistrationUnitEqMapper;
@Autowired
private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
@Autowired
private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
@Autowired
private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
@Autowired
......@@ -150,6 +148,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
@Autowired
private JgVehicleInformationMapper jgVehicleInformationMapper;
@Autowired
JgResumeInfoServiceImpl jgResumeInfoService;
/**
* 新增移装变更登记
*
......@@ -848,12 +849,31 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
this.saveChangeRecord(jgChangeRegistrationTransfer, taskV2Model);
// 事务提交后发送数据刷新消息
this.sendDataRefreshMsg(jgChangeRegistrationTransfer);
// 创建设备履历
this.createResume( jgChangeRegistrationTransfer, taskV2Model.getRoutePath());
}
// redis流程实时数据更新
commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgChangeRegistrationTransfer));
this.getBaseMapper().updateById(jgChangeRegistrationTransfer);
}
private void createResume(JgChangeRegistrationTransfer jgChangeRegistrationTransfer, String routePath) {
LambdaQueryWrapper<JgChangeRegistrationTransferEq> lambda = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
lambda.eq(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationTransfer.getSequenceNbr());
List<JgChangeRegistrationTransferEq> changeRegistrationTransferEqs = jgChangeRegistrationTransferEqService.getBaseMapper().selectList(lambda);
jgResumeInfoService.saveBatchResume(changeRegistrationTransferEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgChangeRegistrationTransfer.getApplyNo())
.businessType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(jgChangeRegistrationTransfer.getSequenceNbr()))
.equId(eq.getEquId())
.approvalUnit(jgChangeRegistrationTransfer.getReceiveOrgName())
.approvalUnitCode(jgChangeRegistrationTransfer.getReceiveCompanyCode())
.status("正常")
.changeContent(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
}
private void sendDataRefreshMsg(JgChangeRegistrationTransfer jgChangeRegistrationTransfer) {
LambdaQueryWrapper<JgChangeRegistrationTransferEq> lambda = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
lambda.eq(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationTransfer.getSequenceNbr());
......
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/JgChangeRegistrationUnitServiceImpl.java
View file @ 852b7336
......@@ -189,6 +189,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired
private EventPublisher eventPublisher;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
/**
* 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
*
......@@ -1267,7 +1270,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
registration.setNextTaskId(nextTaskId);
updateTaskModel(registration, op);
TaskV2Model taskV2Model = updateTaskModel(registration, op);
//新增使用登记证和设备变更记录
this.saveRecord(registration);
JSONArray historyJson = JSON.parseArray(history.getChangeData());
......@@ -1303,6 +1306,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
}
useRegistrationManageService.updateBatchById(list);
// 创建设备履历
this.createResume(registration,jgChangeRegistrationUnitEqs, taskV2Model.getRoutePath());
}
// 发送数据变更消息
this.sendDataRefreshMsg(registration);
......@@ -1345,6 +1350,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
}
private void createResume(JgChangeRegistrationUnit registration, List<JgChangeRegistrationUnitEq> jgChangeRegistrationUnitEqs, String routePath) {
jgResumeInfoService.saveBatchResume(jgChangeRegistrationUnitEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(registration.getApplyNo())
.businessType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(registration.getSequenceNbr()))
.equId(eq.getEquId())
.approvalUnit(registration.getReceiveOrgName())
.approvalUnitCode(registration.getReceiveCompanyCode())
.status("正常")
.changeContent(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
}
private void sendDataRefreshMsg(JgChangeRegistrationUnit registration) {
LambdaQueryWrapper<JgChangeRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registration.getSequenceNbr());
......@@ -1366,10 +1385,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
throw new BadRequest("工程/装置列表为空");
}
registration.setNextTaskId(nextTaskId);
updateTaskModel(registration, op);
TaskV2Model taskV2Model = updateTaskModel(registration, op);
List<String> projectContraptionIds = new ArrayList<>();
for (Map<String, Object> map : projectContraptionList) {
String useRegistrationCode = (String) map.get("useRegistrationCode");
String sequenceNbr = (String) map.get("sequenceNbr");
projectContraptionIds.add(sequenceNbr);
String estateUnitSeq = String.valueOf(map.get("estateUnitName"));
TzBaseEnterpriseInfo enterpriseInfo = (estateUnitSeq != null && !estateUnitSeq.isEmpty())
? tzBaseEnterpriseInfoMapper.selectById(estateUnitSeq)
......@@ -1482,7 +1503,22 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(), registration, Boolean.TRUE, code);
}
}
// 创建设备履历
this.createResume(projectContraptionIds, registration, taskV2Model.getRoutePath());
}
private void createResume(List<String> projectContraptionIds, JgChangeRegistrationUnit registration, String routePath) {
jgResumeInfoService.saveBatchResume(projectContraptionIds.stream().map(projectContraptionId-> JgResumeInfoDto.builder().applyNo(registration.getApplyNo())
.businessType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName())
.businessId(String.valueOf(registration.getSequenceNbr()))
.equId(projectContraptionId)
.approvalUnit(registration.getReceiveOrgName())
.approvalUnitCode(registration.getReceiveCompanyCode())
.status("正常")
.changeContent(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName() + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
}
/**
......
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/JgEnableDisableServiceImpl.java
View file @ 852b7336
......@@ -126,6 +126,10 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
*/
public static final String APPLY_TYPE_TY = "SB_TY";
@Autowired
JgResumeInfoServiceImpl jgResumeInfoService;
@Transactional(rollbackFor = Exception.class)
public List<JgEnableDisable> saveOrUpdate(JSONObject map, ReginParams reginParams) {
try {
......@@ -577,9 +581,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
taskMap.put("model", jgEnableDisable);
// 更新业务数据
updateInfoOther(jgEnableDisable);
commonService.updateTaskModel(taskMap);
TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
// 完成后发送数据刷新消息
this.sendDataRefreshMsg(jgEnableDisable);
// 创建设备履历
this.createResume(jgEnableDisable, taskV2Model1.getRoutePath());
} else {
jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
......@@ -654,6 +660,23 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
}
}
private void createResume(JgEnableDisable jgEnableDisable, String routePath) {
LambdaQueryWrapper<JgEnableDisableEq> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr());
List<JgEnableDisableEq> enableDisableEqs = jgEnableDisableEqService.list(queryWrapper);
jgResumeInfoService.saveBatchResume(enableDisableEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgEnableDisable.getApplyNo())
.businessType(getRegistrationClass(jgEnableDisable))
.businessId(String.valueOf(jgEnableDisable.getSequenceNbr()))
.equId(eq.getEquId())
.approvalUnit(jgEnableDisable.getReceiveOrgName())
.approvalUnitCode(jgEnableDisable.getReceiveCompanyCode())
.status("正常")
.changeContent(getRegistrationClass(jgEnableDisable) + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
}
private void sendDataRefreshMsg(JgEnableDisable jgEnableDisable) {
LambdaQueryWrapper<JgEnableDisableEq> lambdaEq = new QueryWrapper<JgEnableDisableEq>().lambda();
lambdaEq.eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr());
......
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/JgScrapCancelServiceImpl.java
View file @ 852b7336
......@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -84,7 +85,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
SuperviseInfoMapper superviseInfoMapper;
JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
CommonServiceImpl commonService;
@Autowired
......@@ -969,9 +970,30 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
updateInfoOther(jgScrapCancel, taskV2Model.getRoutePath());
// 发送数据变更消息
this.sendDataRefreshMsg(jgScrapCancel);
// 创建设备履历
this.createResume(jgScrapCancel, taskV2Model.getRoutePath());
}
this.getBaseMapper().updateById(jgScrapCancel);
}
private void createResume(JgScrapCancel jgScrapCancel, String routePath) {
LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
lambdaEq.select(JgScrapCancelEq::getEquId, BaseEntity::getSequenceNbr);
List<JgScrapCancelEq> scrapCancelEqs = jgScrapCancelEqService.list(lambdaEq);
jgResumeInfoService.saveBatchResume(scrapCancelEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgScrapCancel.getApplyNo())
.businessType(getRegistrationClass(jgScrapCancel.getCancelType()))
.businessId(String.valueOf(jgScrapCancel.getSequenceNbr()))
.equId(eq.getEquId())
.approvalUnit(jgScrapCancel.getReceiveOrgName())
.approvalUnitCode(jgScrapCancel.getReceiveCompanyCode())
.status("正常")
.changeContent(getRegistrationClass(jgScrapCancel.getCancelType()) + "业务办理")
.routePath(routePath)
.build()).collect(Collectors.toList())
);
}
private void sendDataRefreshMsg(JgScrapCancel jgScrapCancel) {
LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
......
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