土工试验平台修改

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

@@ -381,6 +381,20 @@ 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_audit_his")
+    public RestResult<Page<SoilEntrustVO>> getPageTaskCheckAuditHis(SoilEntrustVO soilEntrust) {
+        soilEntrust.setExpStatus(SoilExpStatusEnum.END);
+        return success(soilEntrustService.pageVOByExperiment(getPage(), soilEntrust));
+    }
+
+
 
     @ApiOperation(value = "分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({

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

@@ -137,9 +137,10 @@
 
         )
 
-    SELECT * FROM soil_entrust e JOIN s ON e.id = s.entrust_id
+    SELECT <include refid="column"/> FROM soil_entrust e JOIN s ON e.id = s.entrust_id
 
     WHERE e.deleted = 0
+    <include refid="sqlWhere"/>
     </select>
 
 

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

@@ -17,6 +17,8 @@
          t.progress,
          t.group_name,
          t.group_id,
+         o.alloter,
+         o.allot_time,
          s.sample_code,
          s.sample_depth,
          s.describe_detail,
@@ -28,6 +30,8 @@
 
     JOIN soil_entrust e ON s.entrust_id = e.id
 
+    JOIN soil_experiment_operation o ON t.id = o.experiment_id
+
     WHERE t.deleted = 0 AND s.deleted = 0 AND e.deleted =0
     <if test="vo.status!=null">
         AND t.status = #{vo.status}