土工试验平台修改

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilEntrustController.java

@@ -275,6 +275,27 @@ public class SoilEntrustController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "试验任务分配历史委托分页列表", notes = "试验任务分配历史委托分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_exp_allot_his")
+    public RestResult<Page<SoilEntrustVO>> getPageTaskAllotHis(SoilEntrustVO soilEntrust) {
+        soilEntrust.setExpStatusList(Lists.newArrayList(
+                SoilExpStatusEnum.TEST,
+                SoilExpStatusEnum.CHECK,
+                SoilExpStatusEnum.AUDIT,
+                SoilExpStatusEnum.END
+        ));
+        return success(soilEntrustService.pageVOByExperiment(getPage(), soilEntrust));
+    }
+
+
+
+
     @ApiOperation(value = "试验项目检测委托分页列表", notes = "试验任务分配委托分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilExperimentController.java

@@ -163,6 +163,26 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "试验项目按照样品分配历史分页列表", notes = "试验项目按照样品分配历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_allot_his")
+    public RestResult<Page<SoilExperimentVO>> getPageHis(@RequestParam("sampleIds") Long [] sampleIds ,SoilExperimentVO vo) {
+        vo.setStatusList(Lists.newArrayList(
+                SoilExpStatusEnum.TEST,
+                SoilExpStatusEnum.CHECK,
+                SoilExpStatusEnum.AUDIT,
+                SoilExpStatusEnum.END
+        ));
+        return success(soilExperimentService.pageBySampleIds(getPage(), sampleIds,vo));
+    }
+
+
+
     @ApiOperation(value = "试验项目按照样品分配分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -224,6 +244,26 @@ public class SoilExperimentController extends ServiceController  {
 
 
 
+    @ApiOperation(value = "试验项目按照试验项目分配(右侧数据)分配历史分页列表", notes = "分页查询数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_exp_allot_his")
+    public RestResult<Page<SoilExperimentVO>> getPageExpAllotHis(SoilExperimentVO vo) {
+        vo.setStatusList(Lists.newArrayList(
+                SoilExpStatusEnum.TEST,
+                SoilExpStatusEnum.CHECK,
+                SoilExpStatusEnum.AUDIT,
+                SoilExpStatusEnum.END
+        ));
+        return success(soilExperimentService.pageExpRight(getPage(),vo));
+    }
+
+
+
     @ApiOperation(value = "试验项目按照试验项目检测(右侧数据)检测分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -305,6 +345,28 @@ public class SoilExperimentController extends ServiceController  {
 
 
 
+    @ApiOperation(value = "按照试验项目分配历史分页列表", notes = "按照试验项目分配历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_allot_by_exp_his")
+    public RestResult<Page<SoilExperimentVO>> getPageAllotByExpHis(SoilExperimentVO vo) {
+        vo.setStatusList(Lists.newArrayList(
+                SoilExpStatusEnum.TEST,
+                SoilExpStatusEnum.CHECK,
+                SoilExpStatusEnum.AUDIT,
+                SoilExpStatusEnum.END
+        ));
+        RestAssert.fail(null == vo.getEntrustId(),"试验委托单ID不能为空");
+        return success(soilExperimentService.pageTestByExp(getPage(),vo));
+    }
+
+
+
+
     @ApiOperation(value = "按照试验项目（样品检测按照试验项目左侧）分页列表", notes = "按照试验项目检测分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilSampleController.java

@@ -187,6 +187,27 @@ public class SoilSampleController extends ServiceController  {
     }
 
 
+
+    @ApiOperation(value = "试验项目分配历史样品分页列表", notes = "试验项目分配历史样品分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_exp_allot_sample_his")
+    public RestResult<Page<SoilSampleVO>> getPageExpAllotSampleHis(SoilSampleVO soilSample) {
+        soilSample.setExpStatusList(Lists.newArrayList(
+                SoilExpStatusEnum.TEST,
+                SoilExpStatusEnum.CHECK,
+                SoilExpStatusEnum.AUDIT,
+                SoilExpStatusEnum.END
+        ));
+        return success(soilSampleService.pageByExp(getPage(), soilSample));
+    }
+
+
+
     @ApiOperation(value = "试验项目检测样品分页列表", notes = "试验项目检测样品分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),

src/main/resources/mapper/soil/SoilExperimentMapper.xml

@@ -125,6 +125,13 @@
                 AND t.status = #{vo.status}
             </if>
 
+        <if test="null!=vo.statusList">
+            AND t.status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
             <if test="vo.testerId!=null">
                 AND t.tester_id = #{vo.testerId}
             </if>