修改往前端顯示的參數類型值

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -136,7 +136,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		return baseMapper.selectPage(failureDetailsPage, wrapper);
 	}
 
-
 	/**
 	 * 列表查询 示例
 	 */
@@ -182,7 +181,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
 	}
 
-
 	/**
 	 * 查询任务状态数量
 	 */
@@ -203,7 +201,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		int inMaintenance = 0;
 
 		List<FailureStatusCountDto> list = new ArrayList<>();
-	//	String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
+		// String[] statusName = new String[]{"待审核", "待提交", "待维修", "待验收", "已拒绝", "已完结"};
 		List<String> statusName = new ArrayList<>();
 		Collections.addAll(statusName, FailureStatuEnum.WAITING_AUDIT.getName(),
 				FailureStatuEnum.WAITING_SUBMIT.getName(), FailureStatuEnum.WAITING_MAINTAIN.getName(),
@@ -291,8 +289,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				Long departmentId = userInfo.getDepartment().getSequenceNbr();
 				Date processTime = model.getSubmissionTime();
 				String processAuditorCid = userInfo.getUserModel().getUserName();
-				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult,processAuditorCid);
-			}catch (Exception e){
+				repairlog(faultId, processAuditor, processAuditorId, departmentId, processTime, processDepartment,
+						processResult, processAuditorCid);
+			} catch (Exception e) {
 				e.printStackTrace();
 				logger.info("添加流程日志到数据库失败");
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -310,7 +309,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				excuteTask(instance.getString("id"), userInfo, null);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
 			return false;
 		}
 
@@ -321,8 +319,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 * 添加报修日志
 	 */
 	@Transactional
-	public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
-						  String processDepartment, String processResult,String processAuditorCid) {
+	public Boolean repairlog(Long faultId, String processAuditor, Integer processAuditorId, Long departmentId,
+			Date processTime, String processDepartment, String processResult, String processAuditorCid) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
 		failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -333,7 +331,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessResult(processResult);
 		failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
 		FailureRepairlogDto repairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
-		if (ObjectUtils.isNotEmpty(repairlogModel)){
+		if (ObjectUtils.isNotEmpty(repairlogModel)) {
 			return true;
 		}
 		return false;
@@ -351,11 +349,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			} else {
 				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);
 			}
-			// 判断下一个节点是不是维修中,如果是则添加当前任务的执行人
-			String nextTaskId = checkIsInMaintenance(sequenceNbr);
-			if (nextTaskId != null) {
-				workflowFeignService.pickuptask(nextTaskId);
-			}
 		}
 		return true;
 	}
@@ -427,8 +420,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
 				String name = detail.getString("name");
 				if (name.startsWith(PROCESS_NAME[4])) {
-					String id= detail.getString("id");
-					 return id;
+					String id = detail.getString("id");
+					return id;
 				}
 			}
 		}
@@ -616,7 +609,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	}
 
 	public Object getCurrentTask(Long sequenceNbr) {
-		List<Map<String, String>> list= new ArrayList<Map<String, String>>();
+		List<Map<String, String>> list = new ArrayList<Map<String, String>>();
 		JSONArray taskDetailArray = null;
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
 		String procressId = details.getProcessId();
@@ -625,17 +618,31 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			taskDetailArray = teskObject.getJSONArray("data");
 			for (Object obj : taskDetailArray) {
 				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+
 				String name = detail.getString("name");
 				Map<String, String> map = new HashMap<String, String>();
 				map.put("name", name);
 				if (name.startsWith(PROCESS_NAME[4])) {
-					String id= detail.getString("id");
-				JSONObject assignObject =workflowFeignService.getTaskAssign(id);
-				JSONObject resultObject =	   assignObject.getJSONObject("data");
-				if(resultObject!=null) {
-					map.put("name", "维修部门维修人员 维修");
-					map.put("assignee", resultObject.getString("assignee"));
-				}
+					String id = detail.getString("id");
+					JSONObject assignObject = workflowFeignService.getTaskAssign(id);
+					JSONObject resultObject = assignObject.getJSONObject("data");
+					if (resultObject != null) {
+						map.put("name", "维修部门维修人员 维修");
+						if (detail.containsKey("informerList")) {
+							JSONArray informerList = detail.getJSONArray("informerList");
+							if (informerList != null && informerList.size() > 0) {
+								for (Object informerDetail : informerList) {
+									JSONObject informerDetailJson = JSONObject
+											.parseObject(JSONObject.toJSONString(informerDetail));
+									if (informerDetailJson.getString("userName")
+											.equals(resultObject.getString("assignee"))) {
+										map.put("assignee", informerDetailJson.getString("realName"));
+										break;
+									}
+								}
+							}
+						}
+					}
 				}
 				list.add(map);
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -27,7 +27,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.ReginParams;
-
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
@@ -75,6 +75,8 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
 
 	FailureRepairlogServiceImpl failureRepairlogService;
 
+	@Autowired
+	WorkflowFeignService workflowFeignService;
 	private static String RECORE_TYPE = "维修记录";
 
 	private final Logger logger = LoggerFactory.getLogger(FailureMaintainServiceImpl.class);
@@ -174,13 +176,18 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
 							failureMaintainDto.getAttachment());
 
 				}
-				if (failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr()) == null) {
+				
+				String nextTaskId = 	failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr());
+				if (nextTaskId == null) {
 					try {
 						failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
 					}catch (Exception e) {
 						return false;
 					}
 					
+				}else {
+					// 判断下一个节点是不是维修中,如果是则添加当前任务的执行人
+					workflowFeignService.pickuptask(nextTaskId);
 				}
 
 			} catch (Exception e) {