Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into gaoying

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -116,7 +116,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         Task task = new Task();
         task.setTaskInitiatorId(loginUser.getUserId());
         task.setTaskInitiator(initiator.getNickName());
-        task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        if (initiator.getDept() != null) {
+            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        }
         task.setTaskStatus(Task.TASK_STATUS_NEW);
         task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
         task.setLeaderId(leader.getUserId());
@@ -336,10 +338,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         List<TaskFindResponse> responses = taskMapper.findByUserId(request,userId);
         for (TaskFindResponse response : responses) {
             if (response.getSystemReviewTaskId() != null) {
-                response.setSystemReview((double)reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE));
+                BigDecimal num = new BigDecimal(((double)reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE))* 100);
+                response.setSystemReview(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
             }
             if (response.getCarReviewTaskId() != null) {
-                response.setCarReview((double)reviewDetailsMapper.count(response.getCarReviewTaskId(),CarReviewTask.TYPE));
+                BigDecimal num = new BigDecimal(((double)reviewDetailsMapper.count(response.getCarReviewTaskId(),CarReviewTask.TYPE)) * 100);
+                response.setCarReview(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
             }
         }
         return responses;
@@ -686,7 +690,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         SystemReviewTask task = new SystemReviewTask()
                 .setTaskNo(request.getTaskNo())
                 .setTaskInitiator(initiator.getNickName())
-                .setTaskInitiatorDept(initiator.getDept().getDeptName())
                 .setTaskStatus(SystemReviewTask.STATUS_NEW)
                 .setLeaderId(leader.getUserId())
                 .setLeader(leader.getName())
@@ -696,6 +699,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                 .setStandardNo(standard.getStandardNo())
                 .setFile(standard.getFile());
 
+        if (initiator.getDept() != null) {
+            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        }
+
         systemReviewTaskService.save(task);
         return task.getId();
     }
@@ -708,7 +715,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         CarReviewTask task = new CarReviewTask()
                 .setTaskNo(request.getTaskNo())
                 .setTaskInitiator(initiator.getNickName())
-                .setTaskInitiatorDept(initiator.getDept().getDeptName())
                 .setTaskStatus(CarReviewTask.TASK_STATUS_NEW)
                 .setLeaderId(leader.getUserId())
                 .setLeader(leader.getName())
@@ -718,6 +724,10 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                 .setStandardNo(standard.getStandardNo())
                 .setFile(standard.getFile());
 
+        if (initiator.getDept() != null) {
+            task.setTaskInitiatorDept(initiator.getDept().getDeptName());
+        }
+
         carReviewTaskService.save(task);
         return task.getId();
     }

quality-review/src/main/java/com/ruoyi/service/impl/TaskStateAdapter.java

@@ -10,6 +10,7 @@ import com.ruoyi.service.TaskState;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.Objects;
 
 @Component
@@ -42,6 +43,10 @@ public abstract class TaskStateAdapter implements TaskState {
         if (task.getPointer() + 1 <= task.getMaxPointer() ) {
             task.setPointer(task.getPointer() + 1);
         }
+
+        if (task.getTaskBeginTime() == null) {
+            task.setTaskBeginTime(new Date());
+        }
         taskService.updateById(task);
 
     }

quality-review/src/main/java/com/ruoyi/service/impl/TaskStatePending.java

@@ -17,6 +17,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -57,6 +58,7 @@ public class TaskStatePending extends TaskStateAdapter implements TaskState, Ini
             task.setRunStatus(Task.RUN_STATUS_RUNNABLE);
         } else {
             task.setTaskStatus(Task.TASK_STATUS_FINISH);
+            task.setTaskEndTime(new Date());
             task.setRunStatus(Task.RUN_STATUS_STATUS_RUNNING);
         }
 

quality-review/src/main/resources/mapper/TaskMapper.xml

@@ -130,6 +130,7 @@
         t.task_no,t.task_name,t.task_status,t.name,
         t.product_model,
         t.standard_no,
+        t.task_list,
         t.leader_id,t.leader,
         t.task_begin_time,t.task_end_time
         FROM t_task t
@@ -216,6 +217,7 @@
         t.task_no,t.task_name,t.task_status,t.name,
         t.standard_no,
         t.product_model,
+        t.task_list,
         t.leader_id,t.leader,
         t.task_begin_time,t.task_end_time
         FROM t_task t