hmhj

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustReportController.java

@@ -95,6 +95,76 @@ public class EntrustReportController extends ServiceController {
     }
 
 
+
+
+
+
+    @ApiOperation("报告批准分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_allow_check")
+    public RestResult<Page<EntrustReport>> getPageAllow(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.ALLOW);
+        return success(entrustReportService.page(getPage(), entrustReport));
+    }
+
+
+    @ApiOperation("报告批准历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_report_allow_his")
+    public RestResult<Page<EntrustReport>> getPageAllowHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.ISSUE);
+        reportStatusList.add(EntrustReportStatusEnum.SEND);
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
+
+
+
+
+    @ApiOperation("报告发放分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_send_check")
+    public RestResult<Page<EntrustReport>> getPageSend(EntrustReport entrustReport) {
+        entrustReport.setStatus(EntrustReportStatusEnum.SEND);
+        return success(entrustReportService.page(getPage(), entrustReport));
+    }
+
+
+    @ApiOperation("报告发放历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_report_send_his")
+    public RestResult<Page<EntrustReport>> getPageSendHis(EntrustReport entrustReport) {
+        List<EntrustReportStatusEnum> reportStatusList = new ArrayList<>();
+        reportStatusList.add(EntrustReportStatusEnum.REPORT_PRINT);
+        reportStatusList.add(EntrustReportStatusEnum.END);
+        return success(entrustReportService.pageStatus(getPage(),reportStatusList, entrustReport));
+    }
+
+
+
+
+
+
+
+
+
+
     @ApiOperation("报告台账待签发分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -179,7 +249,7 @@ public class EntrustReportController extends ServiceController {
     }
 
 
-    @ApiOperation("报告审核提交")
+    @ApiOperation("报告审核提交至报告批准")
     @PostMapping("/submit_report_check")
     public RestResult<Boolean> submitReportCheck(@RequestParam("ids") Long[] ids) {
         return success(entrustReportService.submitReportCheck(ids,getAccount()));
@@ -187,6 +257,29 @@ public class EntrustReportController extends ServiceController {
 
 
 
+    @ApiOperation("报告批准提交至报告发放")
+    @PostMapping("/submit_from_allow_to_send")
+    public RestResult<Boolean> submitFromAllowToSend(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitFromAllowToSend(ids,getAccount()));
+    }
+
+
+    @ApiOperation("报告批准提交至报告签发")
+    @PostMapping("/submit_from_allow_to_issue")
+    public RestResult<Boolean> submitFromAllowToIssue(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitFromAllowToIssue(ids,getAccount()));
+    }
+
+
+
+    @ApiOperation("报告发放提交至质量判定")
+    @PostMapping("/submit_from_send_to_judge")
+    public RestResult<Boolean> submitFromSendToJudge(@RequestParam("ids") Long[] ids) {
+        return success(entrustReportService.submitFromSendToJudge(ids,getAccount()));
+    }
+
+
+
     @ApiOperation("报告签发提交")
     @PostMapping("/submit_report_issue")
     public RestResult<Boolean> submitReportIssue(@RequestParam("ids") Long[] ids) {
@@ -208,4 +301,27 @@ public class EntrustReportController extends ServiceController {
     public RestResult<Boolean> backReportIssue(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
         return success(entrustReportService.backReportIssue(ids,reason,getAccount()));
     }
+
+
+
+
+    @ApiOperation("报告发放退回至报告批准")
+    @PostMapping("/back_from_report_send_to_allow")
+    public RestResult<Boolean> backFromReportSendToAllow(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
+        return success(entrustReportService.backFromReportSendToAllow(ids,reason,getAccount()));
+    }
+
+    @ApiOperation("报告批准退回至报告审核")
+    @PostMapping("/back_from_report_allow_to_check")
+    public RestResult<Boolean> backFromReportAllowToCheck(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
+        return success(entrustReportService.backFromReportAllowToCheck(ids,reason,getAccount()));
+    }
+
+
+    @ApiOperation("报告签发退回至报告批准")
+    @PostMapping("/back_from_report_issue_to_allow")
+    public RestResult<Boolean> backFromReportIssueToAllow(@RequestParam("ids") Long[] ids,@RequestParam("reason") String reason) {
+        return success(entrustReportService.backFromReportIssueToAllow(ids,reason,getAccount()));
+    }
+
 }