From 21a3204d62f7442e9d8d4df2bfc2cf284c9008b0 Mon Sep 17 00:00:00 2001 From: wanggeng888 <450292408@qq.com> Date: Tue, 12 Jan 2021 12:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskcheck/v2/TaskCheckController.java | 16 +++ .../v2/list-task-checkitem-report.html | 135 ++++++++++++++++++ .../taskcheck/v2/list-task-checkitem-tab.html | 66 +++++++++ .../taskcheck/v2/list-task-checkitem.html | 1 - .../taskcheck/v2/list-task-enterprise.html | 8 +- 5 files changed, 221 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/static/route/taskcheck/v2/list-task-checkitem-report.html create mode 100644 src/main/resources/static/route/taskcheck/v2/list-task-checkitem-tab.html diff --git a/src/main/java/com/cm/inspection/controller/apis/taskcheck/v2/TaskCheckController.java b/src/main/java/com/cm/inspection/controller/apis/taskcheck/v2/TaskCheckController.java index 8baa0c9..cc12bd0 100644 --- a/src/main/java/com/cm/inspection/controller/apis/taskcheck/v2/TaskCheckController.java +++ b/src/main/java/com/cm/inspection/controller/apis/taskcheck/v2/TaskCheckController.java @@ -15,6 +15,7 @@ import com.cm.inspection.enums.task.v2.TaskTypeSubEnum; import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO; import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO; import com.cm.inspection.pojo.dtos.taskcheck.v2.TaskCheckDTO; +import com.cm.inspection.pojo.dtos.taskcheck.v2.TaskCheckReportCheckItemDTO; import com.cm.inspection.pojo.vos.taskcheck.v2.TaskCheckVO; import com.cm.inspection.service.taskcheck.v2.ITaskCheckService; import io.swagger.annotations.*; @@ -197,4 +198,19 @@ public class TaskCheckController extends AbstractController { return taskCheckService.listCheckItem(checkItemListType, taskEnterpriseId); } + @ApiOperation(value = "检查结果列表", notes = "检查结果列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "checkItemListType", value = "检查项列表类型, 1：行业检查项，2：企业检查项", paramType = "path"), + @ApiImplicitParam(name = "taskEnterpriseId", value = "检查任务企业ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listtaskcheckreport/{checkItemListType}/{taskEnterpriseId}") + public List listTaskCheckReport(@PathVariable("checkItemListType") Integer checkItemListType, + @PathVariable("taskEnterpriseId") String taskEnterpriseId) { + if (ITaskCheckService.CHECK_ITEM_LIST_TYPE_RELATION != checkItemListType && ITaskCheckService.CHECK_ITEM_LIST_TYPE_CUSTOM != checkItemListType) { + throw new ParamsException("参数错误"); + } + return taskCheckService.listTaskCheckReport(checkItemListType, taskEnterpriseId); + } + } diff --git a/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-report.html b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-report.html new file mode 100644 index 0000000..27d123f --- /dev/null +++ b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-report.html @@ -0,0 +1,135 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-tab.html b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-tab.html new file mode 100644 index 0000000..ef008f3 --- /dev/null +++ b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem-tab.html @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + +
+
+
    +
  • 检查项列表
    • +
  • 检查结果
    • +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/static/route/taskcheck/v2/list-task-checkitem.html b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem.html index 24adac6..f42ecb6 100644 --- a/src/main/resources/static/route/taskcheck/v2/list-task-checkitem.html +++ b/src/main/resources/static/route/taskcheck/v2/list-task-checkitem.html @@ -23,7 +23,6 @@ -