Commit a1c84ba0 authored by H2T's avatar H2T

fix(jg):维保设备关系更新

parent 303433a5
......@@ -66,14 +66,17 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
*/
private DataDictionary getDict(String dictType, String dictCode) {
HashMap<String, String> dictMap = new HashMap<>();
LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getType, dictType).eq(DataDictionary::getCode, dictCode);
LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getType, dictType)
.eq(DataDictionary::getCode, dictCode);
return iDataDictionaryService.getOne(queryWrapper);
}
/**
* 分页查询
*/
public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase, JgMaintenanceContractDto dto, ReginParams reginParams) {
public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
int phase, JgMaintenanceContractDto dto, ReginParams reginParams) {
Page<JgMaintenanceContractDto> contractList = new Page<>();
Page<JgMaintenanceContractVo> result = new Page<>();
CompanyBo company = reginParams.getCompany();
......@@ -161,7 +164,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
String applyFlow = dto.getApplyFlow() + "-" +
MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
dto.setInstanceId(instanceId);
......@@ -175,7 +179,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
public Boolean revocation(JgMaintenanceContractDto dto) {
String[] split = dto.getApplyFlow().split("-");
String lastFlowName = split[split.length - 1];
String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
String applyFlow = dto.getApplyFlow() + "-" +
MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
dto.setApplyFlow(applyFlow);
dto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
workFlowFeginService.rollBack(dto.getInstanceId());
......@@ -282,7 +287,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
List<Integer> collect = EquipmentLists.stream().filter(Objects::nonNull).collect(Collectors.toList());
if (!collect.isEmpty()) {
//先删除原先设备对应关系
LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>().eq(JgMaintenanceContractEq::getBusinessId, dto.getApplyNo()).eq(JgMaintenanceContractEq::getIsDelete, false);
LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>()
.eq(JgMaintenanceContractEq::getIsDelete, false);
List<Long> list = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
jgMaintenanceContractEqService.deleteBatchSeq(list);
//重新生成关系表
......
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