Skip to content

A
amos-boot-biz
Commit 9b6e2cc0 authored by Lambertliu's avatar Lambertliu
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 1a62b5ff fe6bd60e
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 21 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/CommonServiceImpl.java
View file @ 9b6e2cc0
......@@ -1348,8 +1348,7 @@ public class CommonServiceImpl implements ICommonService {
flowTaskVo.setAssignee(assignee);
ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
// 修改待办
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(instanceId).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(instanceId).getResult();
if (collect.isEmpty()) {
return null;
}
......@@ -1648,8 +1647,7 @@ public class CommonServiceImpl implements ICommonService {
*/
public void rollbackTask(String id, JSONObject obj) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
List<TaskV2Model> list = taskV2FeignService.selectListByRelationId(id).getResult();
TaskV2Model model = list.get(0);
taskV2FeignService.delete(String.valueOf(model.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/JgUseRegistrationServiceImpl.java
View file @ 9b6e2cc0
......@@ -15,11 +15,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.dao.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -956,16 +954,19 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
params.put("flowStatusLabel", jgUseRegistration.getStatus());
params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
params.put("taskStatusLabel", jgUseRegistration.getStatus());
TaskMessageDto taskMessageDto = new TaskMessageDto();
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
params.put("model", taskMessageDto);
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
// 创建新的代办
if (!ObjectUtils.isEmpty(taskV2Model)) {
TaskModelDto taskModelDto = new TaskModelDto();
BeanUtils.copyProperties(taskV2Model, taskModelDto);
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
taskMessageDto.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
TaskMessageDto taskMessageDto1 = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto1);
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto1);
// taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
taskModelDto.setModel(taskMessageDto);
taskModelDto.setModel(taskMessageDto1);
taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
......@@ -1297,6 +1298,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
params.put("flowStatusLabel", jgUseRegistration.getStatus());
params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
params.put("taskStatusLabel", jgUseRegistration.getStatus());
TaskMessageDto taskMessageDto1 = new TaskMessageDto();
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto1);
params.put("model", taskMessageDto1);
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
// 创建新的代办
if (!ObjectUtils.isEmpty(taskV2Model)) {
......@@ -1305,7 +1309,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
taskMessageDto.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
......@@ -1454,6 +1458,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
params.put("model", taskMessageDto);
return commonServiceImpl.updateTaskModel(params);
}
......@@ -1813,6 +1818,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
jsonObject.remove("otherAccessories");
jsonObject.remove("instanceStatus");
setEquListCode2Json(jgUseRegistration, jsonObject);
// 非单位办理
if (!"unit".equals(manageType)) {
LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
......@@ -1838,6 +1846,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
private void setEquListCode2Json(JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
TaskMessageDto taskMessageDto = new TaskMessageDto();
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
jsonObject.put("EQU_LIST_CODE", taskMessageDto.getEQU_LIST_CODE());
}
@Transactional(rollbackFor = Exception.class)
public void deleteBatch(List<Long> ids) {
......@@ -2943,6 +2957,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
TaskMessageDto taskMessageDto = new TaskMessageDto();
jgUseRegistration.setOtherAccessories(null);
BeanUtils.copyProperties(jgUseRegistration, taskMessageDto);
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
taskMap.put("model", taskMessageDto);
commonServiceImpl.updateTaskModel(taskMap);
}
......@@ -2963,6 +2978,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
});
}
private void setEquListForWorkSpace(JgUseRegistration jgUseRegistration, TaskMessageDto taskMessageDto) {
LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
if (!jgUseRegistrationEqList.isEmpty()) {
String equId = jgUseRegistrationEqList.get(0).getEquId();
taskMessageDto.setEQU_LIST_CODE(this.getEquipListCode(equId));
}
}
/**
* 处理历史错误单子
*
......@@ -3017,6 +3042,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
params.put("flowStatusLabel", jgUseRegistration.getStatus());
params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
params.put("taskStatusLabel", jgUseRegistration.getStatus());
TaskMessageDto taskMessageDto1 = new TaskMessageDto();
this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto1);
params.put("model", taskMessageDto1);
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
// 创建新的代办
if (!ObjectUtils.isEmpty(taskV2Model)) {
......@@ -3051,16 +3079,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
}
private void setEquListForWorkSpace(JgUseRegistration jgUseRegistration, TaskMessageDto taskMessageDto) {
LambdaQueryWrapper<JgUseRegistrationEq> jgUseRegEqWrapper = new QueryWrapper<JgUseRegistrationEq>().lambda();
jgUseRegEqWrapper.eq(JgUseRegistrationEq::getEquipTransferId, String.valueOf(jgUseRegistration.getSequenceNbr()));
List<JgUseRegistrationEq> jgUseRegistrationEqList = jgRelationEquipMapper.selectList(jgUseRegEqWrapper);
if (!jgUseRegistrationEqList.isEmpty()) {
String equId = jgUseRegistrationEqList.get(0).getEquId();
taskMessageDto.setEQU_LIST_CODE(this.getEquipListCode(equId));
}
}
/**
* 按单位办理或按台套办理
*
......
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