Prechádzať zdrojové kódy

计量-查看任务流程的审批时间为同意时间

qianxb 7 mesiacov pred
rodič
commit
f903580966

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

@@ -1217,7 +1217,7 @@ public class TaskController extends BladeController {
             List<Map<String, Object>> taskProcessInfo = new LinkedList<>();
 
             /*左侧任务流程信息*/
-            List<TaskParallel> taskParallels = jdbcTemplate.query("SELECT process_instance_id,task_user,task_user_name,e_visa_status,e_visa_content,status,sort,update_time FROM u_task_parallel WHERE process_instance_id = ? ORDER BY sort", new Object[]{task.getProcessInstanceId()}, new BeanPropertyRowMapper<>(TaskParallel.class));
+            List<TaskParallel> taskParallels = jdbcTemplate.query("SELECT * FROM u_task_parallel WHERE process_instance_id = ? ORDER BY sort", new Object[]{task.getProcessInstanceId()}, new BeanPropertyRowMapper<>(TaskParallel.class));
             //排名第一就是第一人
             if (taskParallels.size() == 0) {
                 throw new ServiceException("未获取到任务流程信息");
@@ -1278,7 +1278,7 @@ public class TaskController extends BladeController {
                             Map<String, String> taskUserOther = new LinkedHashMap<>();
                             taskUserOther.put("name", taskParallel.getTaskUserName());
                             if (taskParallel.getStatus().equals(2) || taskParallel.getStatus().equals(3)) {
-                                taskUserOther.put("date", sdf.format(taskParallel.getUpdateTime()));
+                                taskUserOther.put("date", sdf.format(taskParallel.getCreateTime()));
                             }
                             taskUserOther.put("status", taskParallel.getStatus().toString());
                             if (i == taskParallels.size() - 1) {