土工平台修改

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

@@ -368,6 +368,19 @@ 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_prepare_bath")
+    public RestResult<Page<SoilExperimentVO>> getPagExpPrepareBath(@RequestBody SoilExperimentQueryDTO vo) {
+        return success(soilExperimentService.pageExpRightBath(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/service/impl/SoilExperimentServiceImpl.java

@@ -612,6 +612,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 if (!mapReplace.containsKey("#{含水率}")){
                     mapReplace.put("#{含水率}","");
                 }
+                if (!mapReplace.containsKey("#{液限}")){
+                    mapReplace.put("#{液限}","");
+                }
+
+                if (!mapReplace.containsKey("#{塑限}")){
+                    mapReplace.put("#{塑限}","");
+                }
+
                 mapReplace.put("#{sampleCode}",experimentVO.getSampleCode());
                 HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,i);
 

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

@@ -10,6 +10,7 @@
     e.id,
     e.client,
     e.project_no,
+    e.project_name,
     e.project_leader,
     e.borehole_name,
     e.borehole_location,
@@ -92,8 +93,11 @@
         JOIN soil_entrust_operation o ON e.id = o.entrust_id
         WHERE e.deleted = 0
         <include refid="sqlWhere"/>
+        <include refid="sqlOrderBy"/>
     </select>
-
+    <sql id="sqlOrderBy">
+        ORDER BY e.ctime DESC 
+    </sql>
 
     <select id="selectCoordinateVOList" resultType="com.patzn.cloud.service.soil.vo.SoilEntrustVO">
         SELECT <include refid="column"/> FROM soil_entrust e

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

@@ -286,7 +286,7 @@
 
     <select id="selectListVOByIds" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
 
-        SELECT t.id,t.name,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.id AS "entrustId",e.borehole_name,t.sample_id,t.test_method FROM soil_experiment t
+        SELECT t.id,t.name,t.short_name,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.id AS "entrustId",e.borehole_name,t.sample_id,t.test_method FROM soil_experiment t
 
         JOIN soil_sample s ON t.sample_id = s.id
         JOIN soil_entrust e ON s.entrust_id = e.id