优化任务驳回时操作日志记录

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -378,6 +378,7 @@ public class TaskController extends BladeController {
 
             //审批
             this.taskService.batchCompleteApprovalTask(taskApprovalVOS);
+            Map<String, TaskApprovalVO> taskApprovalVOMap = taskApprovalVOS.stream().collect(Collectors.toMap(TaskApprovalVO::getTaskId, taskApprovalVO -> taskApprovalVO, (o1, o2) -> o1));
             for (Task task : taskList) {
                 if (batchTaskVO.getFlag().equals("NO")) {
                     JSONObject json = new JSONObject();
@@ -385,8 +386,9 @@ public class TaskController extends BladeController {
                     json.put("operationObjName", "批量废除");
                     json.put("projectId", task.getProjectId());
                     json.put("contractId", task.getContractId());
+                    json.put("saveData", JSONObject.toJSONString(taskApprovalVOMap.get(task.getId() + "")));
                     //保存操作记录
-                    this.operationLogClient.saveUserOperationLog(61, "资料撤回废除", "工序资料", json);
+                    this.operationLogClient.saveUserOperationLog(61, "资料驳回废除", "工序资料", json);
                 }
             }
 
@@ -1235,6 +1237,7 @@ public class TaskController extends BladeController {
             json.put("operationObjName", "批量废除");
             json.put("projectId", task.getProjectId());
             json.put("contractId", task.getContractId());
+            json.put("saveData", JSONObject.toJSONString(taskApprovalVO));
             //保存操作记录
             this.operationLogClient.saveUserOperationLog(61, "资料驳回废除", "工序资料", json);
         }
@@ -1532,6 +1535,17 @@ public class TaskController extends BladeController {
                         OperationLog operationLog = min.get();
                         if (operationLog.getOperationType() != null && operationLog.getOperationType() == 61) {
                             businessTaskPageVO.setEVisaStatus("驳回成功:"+operationLog.getCreateUserName()+"-"+operationLog.getCreateTime());
+                            String saveData = operationLog.getSaveData();
+                            if (saveData != null && !saveData.isEmpty()) {
+                                try  {
+                                    JSONObject data = JSONObject.parseObject(saveData);
+                                    if (data != null && data.containsKey("comment")) {
+                                        businessTaskPageVO.setEVisaStatus("驳回成功:"+operationLog.getCreateUserName()+"-"+operationLog.getCreateTime() + ";驳回原因:"+data.getString("comment"));
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
                         } else if (operationLog.getOperationType() != null && operationLog.getOperationType() == 62) {
                             businessTaskPageVO.setEVisaStatus("撤回成功:"+operationLog.getCreateUserName()+"-"+operationLog.getCreateTime());
                         } else {

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -684,7 +684,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     // 废除信息
                     Integer appType = taskApp.getApprovalType();
                     //质检系统
-                    String up_task_par = "update u_task_parallel set status=3 , e_visa_content = '驳回成功', initiative=10,update_time=SYSDATE(),update_user="+userId+"  where parallel_process_instance_id='"+taskApp.getParallelProcessInstanceId()+"'";
+                    String up_task_par = "update u_task_parallel set status=3 , e_visa_content = '驳回成功，驳回原因:" + taskApp.getComment() + "', initiative=10,update_time=SYSDATE(),update_user="+userId+"  where parallel_process_instance_id='"+taskApp.getParallelProcessInstanceId()+"'";
                     String up_task = "update u_task set status=3, update_time=SYSDATE(),update_user="+userId+" where id='"+taskApp.getTaskId()+"'";
                     this.jdbcTemplate.execute("delete from u_task_batch where JSON_UNQUOTE(JSON_EXTRACT(json_data, '$.taskId'))="+taskApp.getTaskId()+"");
                     jdbcTemplate.execute(up_task_par);
@@ -738,7 +738,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                                     //驳回通知
                                     3,
                                     //内容
-                                    projectName + contractName + "的用户【" + AuthUtil.getNickName() + "】驳回了【" + task.getTaskName() + "】",
+                                    projectName + contractName + "的用户【" + AuthUtil.getNickName() + "】驳回了【" + task.getTaskName() + "】" + "驳回原因：" + taskApp.getComment(),
                                     //推送的目标人
                                     Long.parseLong(task.getReportUser()),
                                     //默认未读

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1090,6 +1090,7 @@ public class TaskController extends BladeController {
                     json.put("operationObjName", "任务废除");
                     json.put("projectId", task.getProjectId());
                     json.put("contractId", task.getContractId());
+                    json.put("saveData", JSONObject.toJSONString(taskRepealDTO));
                     //保存操作记录
                     this.operationLogClient.saveUserOperationLog(61, "资料驳回废除", "计量资料", json);
                     return R.data(200, aopParamsSet, "操作成功");