Merge branch 'dev' into 'master'

dev - master 43

See merge request !412

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

@@ -7,13 +7,8 @@ import com.ruoyi.domain.vo.EnterpriseFilePdfVO;
 import com.ruoyi.domain.vo.InspectionPersonnelVO;
 import com.ruoyi.domain.vo.InspectionReportPdfVO;
 import com.ruoyi.domain.vo.TestConclusionVO;
-import com.ruoyi.web.request.TaskFindFinishRequest;
-import com.ruoyi.web.request.TaskFindPendingRequest;
-import com.ruoyi.web.request.TaskFindRequest;
-import com.ruoyi.web.request.TaskListRequest;
-import com.ruoyi.web.response.TaskFindResponse;
-import com.ruoyi.web.response.TaskScenarioResponse;
-import com.ruoyi.web.response.UserNameResponse;
+import com.ruoyi.web.request.*;
+import com.ruoyi.web.response.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -82,4 +77,16 @@ public interface TaskMapper extends BaseMapper<Task> {
      * @return
      */
     InspectionPersonnelVO selectInspectionPersonnelById(Long taskId);
+
+    /**
+     * 根据状态查看任务数据统计
+     * @return
+     */
+    List<TaskStateDistributionResponse> taskStateDistribution();
+
+    /**
+     * 委托单位任务分布
+     * @return
+     */
+    List<EntrustedUnitResponse> entrustedUnitDistribution();
 }

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

@@ -3,9 +3,7 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.Task;
 import com.ruoyi.web.request.*;
-import com.ruoyi.web.response.DataStatisticsResponse;
-import com.ruoyi.web.response.TaskFindResponse;
-import com.ruoyi.web.response.TaskGetInfoResponse;
+import com.ruoyi.web.response.*;
 
 import java.io.IOException;
 import java.util.List;
@@ -70,4 +68,16 @@ public interface TaskService extends IService<Task> {
     String createProject(String request) throws IOException;
 
     String getPicture(TaskPictureRequest request) throws IOException;
+
+    /**
+     * 根据状态查看任务数据统计
+     * @return
+     */
+    List<TaskStateDistributionResponse> taskStateDistribution();
+
+    /**
+     * 委托单位任务分布
+     * @return
+     */
+    List<EntrustedUnitResponse> entrustedUnitDistribution();
 }

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

@@ -866,6 +866,24 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         }
     }
 
+    /**
+     * 根据状态查看任务数据统计
+     * @return
+     */
+    @Override
+    public List<TaskStateDistributionResponse> taskStateDistribution() {
+        return taskMapper.taskStateDistribution();
+    }
+
+    /**
+     * 委托单位任务分布
+     * @return
+     */
+    @Override
+    public List<EntrustedUnitResponse> entrustedUnitDistribution() {
+        return taskMapper.entrustedUnitDistribution();
+    }
+
     /**
      * pdf转图片
      * @param urlStr

quality-review/src/main/java/com/ruoyi/web/TaskController.java

 package com.ruoyi.web;
 
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
@@ -13,9 +14,7 @@ import com.ruoyi.service.TaskSampleRelationService;
 import com.ruoyi.service.TaskService;
 import com.ruoyi.service.TaskUserRelationService;
 import com.ruoyi.web.request.*;
-import com.ruoyi.web.response.DataStatisticsResponse;
-import com.ruoyi.web.response.TaskFindResponse;
-import com.ruoyi.web.response.TaskGetInfoResponse;
+import com.ruoyi.web.response.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.skywalking.apm.toolkit.trace.Tag;
@@ -210,4 +209,24 @@ public class TaskController extends BaseController {
         return R.ok(taskService.getPicture(request));
     }
 
+    @Anonymous
+    @ApiOperation("根据状态查看任务数据统计")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/taskStateDistribution")
+    public TableDataInfo<TaskStateDistributionResponse> taskStateDistribution() {
+
+        return getDataTable(taskService.taskStateDistribution());
+    }
+
+    @Anonymous
+    @ApiOperation("委托单位任务分布")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/entrustedUnitDistribution")
+    public TableDataInfo<EntrustedUnitResponse> entrustedUnitDistribution() {
+
+        return getDataTable(taskService.entrustedUnitDistribution());
+    }
+
 }

quality-review/src/main/java/com/ruoyi/web/request/TaskStateDistributionRequest.java

+package com.ruoyi.web.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "TaskStateDistributionRequest", description = "任务状态分布")
+@Data
+public class TaskStateDistributionRequest {
+
+    @ApiModelProperty("标准id")
+    private Long standardId;
+}

quality-review/src/main/java/com/ruoyi/web/response/EntrustedUnitResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "EntrustedUnitResponse", description = "委托单位任务分布")
+@Data
+public class EntrustedUnitResponse {
+
+    @ApiModelProperty("委托单位")
+    private String entrustedUnit;
+
+    @ApiModelProperty("数量")
+    private String number;
+}

quality-review/src/main/java/com/ruoyi/web/response/TaskStateDistributionResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "TaskStateDistributionResponse", description = "任务状态分布")
+@Data
+public class TaskStateDistributionResponse {
+
+    @ApiModelProperty("任务状态NEW（新建的）、PENDING（运行中的）、FINISH（已结束的）")
+    private String taskStatus;
+
+    @ApiModelProperty("数量")
+    private String number;
+}

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

@@ -423,6 +423,21 @@
             t.id = #{taskId}
         group by t.id
     </select>
+    <select id="taskStateDistribution" resultType="com.ruoyi.web.response.TaskStateDistributionResponse">
+        select task_status, count(*) number from t_task
+        where task_status not in ("TEMPORARILY")
+        group by task_status
+    </select>
+    <select id="entrustedUnitDistribution" resultType="com.ruoyi.web.response.EntrustedUnitResponse">
+        select
+            entrusted_unit,
+            count(*) number
+        from
+            t_task
+        where
+            task_status not in ("TEMPORARILY")
+        group by entrusted_unit
+    </select>
 
 
 </mapper>