Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

quality-review/src/main/java/com/ruoyi/domain/ReviewDetailsResult.java

@@ -87,8 +87,8 @@ public class ReviewDetailsResult implements Serializable {
     private Long reviewEnterpriseArchiveId;
 
     @TableField(exist = false)
-    @ApiModelProperty("企业名称")
-    private String enterpriseName;
+    @ApiModelProperty("文件名称")
+    private String fileName;
 
 
 }

quality-review/src/main/java/com/ruoyi/mapper/TaskMapper.java

@@ -20,7 +20,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<Task> findList(TaskListRequest request);
 
-    List<TaskFindResponse> findPending(TaskFindPendingRequest request);
+    List<TaskFindResponse> findPending(@Param("request")TaskFindPendingRequest request,@Param("userId")Long userId);
 
     List<Task> findFinish(TaskFindFinishRequest request);
 

quality-review/src/main/java/com/ruoyi/service/TaskService.java

@@ -25,7 +25,7 @@ public interface TaskService extends IService<Task> {
      * @param request
      * @return
      */
-    List<TaskFindResponse> findPending(TaskFindPendingRequest request);
+    List<TaskFindResponse> findPending(TaskFindPendingRequest request,Long userId);
 
     /**
      * 查询完成的任务

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

@@ -89,16 +89,6 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
         // 任务样品关系
         List<TaskSampleRelation> relations = taskSampleRelationMapper.selectByTaskId(taskMapper.findByCarReviewTaskId(carReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
 
-        if (results.size() != 0 && results != null) {
-            for (ReviewDetailsResult reviewDetailsResult : results) {
-                if (reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() == null && relations.size() != 0 && relations != null) {
-                    TaskSampleRelation taskSampleRelation = relations.get(0);
-                    Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
-                    reviewDetailsResult.setEnterpriseName(sample.getManufacturingEnterprise());
-                }
-            }
-        }
-
         // 绑定问卷与答案
         setDetailsResult(standardTree, results,carReviewTask);
 
@@ -186,7 +176,7 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
                     }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
-                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                        reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
                     }
                     details.setResult(reviewDetailsResult);
                 }

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

@@ -132,16 +132,6 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
         // 任务样品关系
         List<TaskSampleRelation> relations = taskSampleRelationMapper.selectByTaskId(taskMapper.findBySystemReviewTaskId(systemReviewTask.getId()),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
 
-        if (results.size() != 0 && results != null) {
-            for (ReviewDetailsResult reviewDetailsResult : results) {
-                if (reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() == null && relations.size() != 0 && relations != null) {
-                    TaskSampleRelation taskSampleRelation = relations.get(0);
-                    Sample sample = sampleManagementMapper.selectSampleManagementById(taskSampleRelation.getSampleId());
-                    reviewDetailsResult.setEnterpriseName(sample.getManufacturingEnterprise());
-                }
-            }
-        }
-
         // 绑定问卷与答案
         setDetailsResult(standardTree, results, systemReviewTask);
 
@@ -185,7 +175,7 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
                     }
                     if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
                         ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
-                        reviewDetailsResult.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                        reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
                     }
                     details.setResult(reviewDetailsResult);
                 }

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());
@@ -176,8 +178,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
     }
 
     @Override
-    public List<TaskFindResponse> findPending(TaskFindPendingRequest request) {
-        List<TaskFindResponse> responses = taskMapper.findPending(request);
+    public List<TaskFindResponse> findPending(TaskFindPendingRequest request,Long userId) {
+        List<TaskFindResponse> responses = taskMapper.findPending(request,userId);
         for (TaskFindResponse response : responses) {
             if (response.getSystemReviewTaskId() != null) {
                 BigDecimal num = new BigDecimal(((double)reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE))* 100);
@@ -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;
 
@@ -52,24 +53,12 @@ public class TaskStatePending extends TaskStateAdapter implements TaskState, Ini
     @Override
     public void doSubmit(Task task) {
 
-        Double subTaskCount = 0.0;
-
-        SystemReviewTask systemReviewTask = systemReviewTaskMapper.selectById(task.getSystemReviewTaskId());
-
-        CarReviewTask carReviewTask = carReviewTaskMapper.selectById(task.getCarReviewTaskId());
-
-        if(task.getSystemReviewTaskId() != null && !Objects.equals(systemReviewTask.getTaskStatus(), SystemReviewTask.STATUS_NEW)) {
-            subTaskCount = reviewDetailsMapper.count(task.getSystemReviewTaskId(), SystemReviewTask.TYPE);
-        }
-        if(task.getCarReviewTaskId() != null && !Objects.equals(carReviewTask.getTaskStatus(), CarReviewTask.TASK_STATUS_NEW)) {
-            subTaskCount = reviewDetailsMapper.count(task.getCarReviewTaskId(), CarReviewTask.TYPE);
-        }
-
-        if(subTaskCount > 0) {
+        if (task.getPointer() < task.getMaxPointer()) {
             task.setTaskStatus(Task.TASK_STATUS_PENDING);
             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/java/com/ruoyi/web/TaskController.java

@@ -118,7 +118,7 @@ public class TaskController extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = "/findPending")
     public TableDataInfo<TaskFindResponse> findPending(@Validated @RequestBody TaskFindPendingRequest request) {
         startPage(request);
-        return getDataTable(taskService.findPending(request));
+        return getDataTable(taskService.findPending(request,getUserId()));
     }
 
     @ApiOperation("查询已归档任务")

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

@@ -99,24 +99,27 @@
         left join t_system_review_task srt on t.system_review_task_id = srt.id
         left join t_car_review_task crt on t.car_review_task_id = crt.id
         <where>
-            t.task_status IN ("NEW","PENDING")
-            <if test="standardId != null and standardId != ''">
-                and t.standard_id = #{standardId}
+            t.id IN (
+            SELECT task_id FROM t_task_user_relation WHERE user_id = #{userId}
+            )
+            and t.task_status IN ("NEW","PENDING")
+            <if test="request.standardId != null and request.standardId != ''">
+                and t.standard_id = #{request.standardId}
             </if>
-            <if test="taskNo != null and taskNo != ''">
-                and t.task_no like concat('%',#{taskNo},'%')
+            <if test="request.taskNo != null and request.taskNo != ''">
+                and t.task_no like concat('%',#{request.taskNo},'%')
             </if>
-            <if test="taskName != null and taskName != ''">
-                and t.task_name like concat('%',#{taskName},'%')
+            <if test="request.taskName != null and request.taskName != ''">
+                and t.task_name like concat('%',#{request.taskName},'%')
             </if>
-            <if test="productModel != null and productModel != ''">
-                and t.product_model like concat('%',#{productModel},'%')
+            <if test="request.productModel != null and request.productModel != ''">
+                and t.product_model like concat('%',#{request.productModel},'%')
             </if>
-            <if test="inspectionItem != null and inspectionItem != ''">
+            <if test="request.inspectionItem != null and request.inspectionItem != ''">
                 AND(
-                (#{inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
+                (#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
                 OR
-                (#{inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
+                (#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
                 )
             </if>
         </where>
@@ -127,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
@@ -213,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