Skip to content

A
amos-boot-biz
Commit 3dc5ab42 authored by lisong's avatar lisong
Browse files
Options

添加为空判断

parent ffc4c36e
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 38 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 @ 3dc5ab42
......@@ -196,14 +196,14 @@ public class CommonServiceImpl implements ICommonService {
wrapper.eq(EquipmentCategory::getCode, code);
EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectOne(wrapper);
if (ObjectUtils.isEmpty(type)) {
if(!ValidationUtil.isEmpty(equipmentCategory)){
if (!ValidationUtil.isEmpty(equipmentCategory)) {
result.add(equipmentCategory);
}
} else {
LambdaQueryWrapper<EquipmentCategory> wrapper2 = new LambdaQueryWrapper<>();
wrapper2.eq(EquipmentCategory::getParentId, equipmentCategory.getId());
List<EquipmentCategory> equipmentCategories = equipmentCategoryMapper.selectList(wrapper2);
if(!ValidationUtil.isEmpty(equipmentCategories)){
if (!ValidationUtil.isEmpty(equipmentCategories)) {
result = equipmentCategories;
}
}
......@@ -290,7 +290,7 @@ public class CommonServiceImpl implements ICommonService {
public List<LinkedHashMap> creatApproveTree() {
FeignClientResult tree = privilegeFeginService.queryAgencyTreeForCache(RequestContext.getToken(), RequestContext.getAppKey(), RequestContext.getProduct());
List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
List<LinkedHashMap> children = (List<LinkedHashMap>)result.get(0).get("children");
List<LinkedHashMap> children = (List<LinkedHashMap>) result.get(0).get("children");
List<LinkedHashMap> treeData = deleteTreeData(children);
List<LinkedHashMap> resultTree = updateNullChildren(treeData);
redisUtils.set(ADMINISTRATION_UNIT_TREE, resultTree);
......@@ -366,7 +366,7 @@ public class CommonServiceImpl implements ICommonService {
}
@Override
public List<Map<String,Object>> getEnterpriseEmployee(String unitCode) {
public List<Map<String, Object>> getEnterpriseEmployee(String unitCode) {
return commonMapper.getEnterpriseEmployee(unitCode);
}
......@@ -524,7 +524,7 @@ public class CommonServiceImpl implements ICommonService {
JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgInstallationNoticeDto.class);
jgInstallationNoticeDto.setReceiveOrgCreditCode(!ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
JSONObject jsonObject1 = (JSONObject)JSONObject.toJSON(jgInstallationNoticeDto);
JSONObject jsonObject1 = (JSONObject) JSONObject.toJSON(jgInstallationNoticeDto);
provideMap.put(AZGZ_FORM_ID, jsonObject1);
JSONObject jsonObject = new JSONObject(provideMap);
iJgInstallationNoticeService.saveNotice(submitType, jsonObject, reginParams);
......@@ -576,7 +576,7 @@ public class CommonServiceImpl implements ICommonService {
} else if (type.equals(ApplicationFormTypeEnum.SBYJ.getBusinessCode())) {
JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
JSONObject jsonObject = (JSONObject)JSONObject.toJSON(jgEquipTransferDto);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
} else if (type.equals(ApplicationFormTypeEnum.SBZX.getBusinessCode())) {
......@@ -599,15 +599,8 @@ public class CommonServiceImpl implements ICommonService {
}
public void deleteTaskModel(String id){
List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(id).getResult();
public void deleteTaskModel(String id) {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getCreateDate().compareTo(r1.getCreateDate())) // 按时间降序排序
.findFirst()
.orElse(null);
......@@ -619,31 +612,31 @@ public class CommonServiceImpl implements ICommonService {
/**
* 待办新增接口
**/
public void buildTaskModel(List<TaskModelDto> list){
list.forEach(obj->{
public void buildTaskModel(List<TaskModelDto> list) {
list.forEach(obj -> {
TaskV2Model model = new TaskV2Model();
String urlParams = "";
try {
urlParams = "&"+toQueryParams(obj.getModel());
urlParams = "&" + toQueryParams(obj.getModel());
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
List<Map> urlList = JsonUtils.getResourceList(urlInfo);
for (Map map : urlList) {
if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")){
model.setRoutePath(map.get("url").toString().replace("{roleIds}",obj.getNextExecuteUser()).replace("{userId}",RequestContext.getExeUserId())+urlParams);
if (map.get("type").equals(obj.getTaskType()) && map.get("pageType").equals("look")) {
model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()).replace("{userId}", RequestContext.getExeUserId()) + urlParams);
}
}
model.setRoutePath(obj.getRoutePath()+urlParams);
BeanUtil.copyProperties(model,obj);
model.setRoutePath(obj.getRoutePath() + urlParams);
BeanUtil.copyProperties(model, obj);
model.setFlowStatus(0);
model.setFlowInstanceId(model.getRelationId());
model.setTaskTitle(obj.getStartUser()+"发起了"+obj.getTaskName());
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
model.setTaskSource("workFlow");
model.setExtras(JSON.toJSONString(obj.getModel()));
// model.setTerminal(params.getOrDefault("terminal","WEB").toString());
model.setCreateDate(new Date());
model.setRecUserId( RequestContext.getExeUserId());
model.setRecUserId(RequestContext.getExeUserId());
Systemctl.taskV2Client.create(model);
});
......@@ -652,18 +645,18 @@ public class CommonServiceImpl implements ICommonService {
/**
* 待办编辑接口
*参数
*taskStatus 任务状态枚举code
*taskStatusLabel 任务状态枚举name
*流程实例id instanceId
* 参数
* taskStatus 任务状态枚举code
* taskStatusLabel 任务状态枚举name
* 流程实例id instanceId
**/
public TaskV2Model updateTaskModel(Map<String, Object> params){
public TaskV2Model updateTaskModel(Map<String, Object> params) {
String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(params.get("relationId").toString()).getResult();
TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r2.getSequenceNbr())) // 按时间降序排序
.findFirst()
.orElse(null);
if (model == null ){
if (model == null) {
return null;
}
model.setFlowStatus(1);
......@@ -671,8 +664,8 @@ public class CommonServiceImpl implements ICommonService {
model.setTaskStatusLabel(params.get("taskStatusLabel").toString());
model.setEndUserId(exeUserId);
model.setEndDate(new Date());
model.setRoutePath(model.getRoutePath().replace("roleIds","role").replace("edit","look"));
Systemctl.taskV2Client.update(model,model.getSequenceNbr());
model.setRoutePath(model.getRoutePath().replace("roleIds", "role").replace("edit", "look"));
Systemctl.taskV2Client.update(model, model.getSequenceNbr());
//修改model并返回 用于组装新待办
model.setEndUserId(null);
model.setTaskStatus(null);
......@@ -687,8 +680,8 @@ public class CommonServiceImpl implements ICommonService {
* 待办 撤回
* id 工作流实例id
**/
public void rollbackTask(String id){
List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(id).getResult();
public void rollbackTask(String id) {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
TaskV2Model model = list.get(0);
Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
......@@ -696,8 +689,8 @@ public class CommonServiceImpl implements ICommonService {
lastTaskModel.setEndUserId(null);
lastTaskModel.setEndDate(null);
lastTaskModel.setFlowStatus(0);
lastTaskModel.setRoutePath(model.getRoutePath().replace("role","roleIds").replace("look","edit"));
Systemctl.taskV2Client.update(lastTaskModel,lastTaskModel.getSequenceNbr());
lastTaskModel.setRoutePath(model.getRoutePath().replace("role", "roleIds").replace("look", "edit"));
Systemctl.taskV2Client.update(lastTaskModel, lastTaskModel.getSequenceNbr());
}
public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
......@@ -729,6 +722,7 @@ public class CommonServiceImpl implements ICommonService {
/**
* 根据流程状态name 获取流程状态code
*
* @param name 流程状态name
* @return 流程状态code
*/
......@@ -744,6 +738,7 @@ public class CommonServiceImpl implements ICommonService {
/**
* 根据工作流返回信息，组装业务需要的数据
*
* @param processTaskDTOS 工作流返回信息
* @return 组装后的信息
*/
......@@ -751,19 +746,27 @@ public class CommonServiceImpl implements ICommonService {
List<WorkflowResultDto> workflowResultDtoList = new ArrayList<>();
processTaskDTOS.forEach(item -> {
WorkflowResultDto workflowResultDto = new WorkflowResultDto();
if (!ObjectUtils.isEmpty(item.getProcessInstance())) {
workflowResultDto.setInstanceId(item.getProcessInstance().getId());
}
if (!ObjectUtils.isEmpty(item.getTask())) {
workflowResultDto.setTaskName(item.getTask().getName());
}
if (!ObjectUtils.isEmpty(item.getCandidateGroups())) {
workflowResultDto.setExecutorRoleIds(String.join(",", item.getCandidateGroups()));
}
if (!ObjectUtils.isEmpty(item.getStartUser())) {
workflowResultDto.setStartUserId(item.getStartUser().getUserId());
workflowResultDto.setStartUserName(item.getStartUser().getRealName());
}
if (!ObjectUtils.isEmpty(item.getExecutor())) {
workflowResultDto.setExecutorId(item.getExecutor().getUserId());
workflowResultDto.setExecutorName(item.getExecutor().getRealName());
}
if (!CollectionUtils.isEmpty(item.getNextTask())) {
ActTaskDTO actTaskDTO = item.getNextTask().get(0);
workflowResultDto.setNextTaskId(actTaskDTO.getId());
// workflowResultDto.setNextTaskCode(actTaskDTO.getKey()); // 工作流字段还未添加
workflowResultDto.setNextTaskCode(actTaskDTO.getKey());
workflowResultDto.setNextTaskName(actTaskDTO.getName());
List<String> nextGroups = item.getNextCandidateGroups().get(actTaskDTO.getId());
String join = String.join(",", nextGroups);
......
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