土工试验修改

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

@@ -291,6 +291,20 @@ 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")
+    public RestResult<Page<SoilExperimentVO>> getPagePrepareTest(SoilExperimentVO vo) {
+        return success(soilExperimentService.pageExpRight(getPage(),vo));
+    }
+
+
     @ApiOperation(value = "试验项目按照试验项目检测(右侧数据)历史检测分页列表", notes = "分页查询数据列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
@@ -395,6 +409,22 @@ 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_prepare_by_exp")
+    public RestResult<Page<SoilExperimentVO>> getPagePrepareByExp(SoilExperimentVO vo) {
+        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

@@ -468,9 +468,9 @@ public class SoilSampleController extends ServiceController  {
      */
     @ApiOperation(value = "原始记录数据绑定", notes = "原始记录数据绑定")
     @ResponseBody
-    @GetMapping("/original_record_data_bind")
-    public RestResult<Map<String, Object>> originalRecordDataBind(@RequestParam("sampleId") Long sampleId, @RequestParam("modelId") Long modelId) {
-        return success(soilSampleService.originalRecordDataBind(sampleId,modelId,getAccount()));
+    @PostMapping("/original_record_data_bind")
+    public RestResult<Map<String, Object>> originalRecordDataBind(@RequestParam("entrustId") Long entrustId,@RequestParam("expIds") Long[] expIds, @RequestParam("modelId") Long modelId) {
+        return success(soilSampleService.originalRecordDataBind(entrustId,expIds,modelId,getAccount()));
     }
 
 

src/main/java/com/patzn/cloud/service/lims/soil/mapper/SoilExperimentMapper.java

@@ -35,5 +35,7 @@ public interface SoilExperimentMapper extends BaseMapper<SoilExperiment> {
 
     List<SoilExperimentVO> selectListVOByIds(@Param("ids")List<Long> expIds);
 
+    List<SoilExperimentVO> selectListVOByIds(@Param("ids")Long [] expIds);
+
     List<SoilEntrustItemNumVO> listEntrustItemNum(@Param("sampleIds") List<Long> sampleIds, @Param("vo") SoilExperimentVO vo);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExperimentService.java

@@ -59,6 +59,8 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
 
     List<SoilExperimentVO> listVOByIds(List<Long> expIds);
 
+    List<SoilExperimentVO> listVOByIds(Long [] expIds);
+
     boolean parseTxt(SmbFile smbFile, CollectDataType request);
 
     boolean importExperiments(Long[] ids, Long[] aptitudeIds, Account account);

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilSampleService.java

@@ -69,7 +69,7 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
 
     List<SoilSample> listByContractIdForPrepare(Long entrustId);
 
-    Map<String, Object> originalRecordDataBind(Long sampleId, Long modelId, Account account);
+    Map<String, Object> originalRecordDataBind(Long entrustId,Long[] expIds, Long modelId, Account account);
 
     boolean removeSampleFromLocation(Long[] ids, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -412,6 +412,13 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         return baseMapper.selectListVOByIds(expIds);
     }
 
+
+    @Override
+    public List<SoilExperimentVO> listVOByIds(Long [] expIds) {
+        return baseMapper.selectListVOByIds(expIds);
+    }
+
+
     @Override
     public boolean parseTxt(SmbFile smbFile, CollectDataType request) {
         try {

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilSampleServiceImpl.java

@@ -24,6 +24,7 @@ import com.patzn.cloud.service.soil.enums.SoilEntrustStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilExpStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilPrepareStatusEnum;
 import com.patzn.cloud.service.soil.enums.SoilSampleStatusEnum;
+import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
 import com.patzn.cloud.service.soil.vo.SoilPrepareVO;
 import com.patzn.cloud.service.soil.vo.SoilSampleVO;
 import org.apache.commons.lang3.ArrayUtils;
@@ -101,9 +102,22 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
     }
 
     @Override
-    public Map<String, Object> originalRecordDataBind(Long sampleId, Long modelId, Account account) {
+    public Map<String, Object> originalRecordDataBind(Long entrustId,Long[] expIds, Long modelId, Account account) {
+        RestAssert.fail(null == entrustId,"委托ID不能为空");
+        RestAssert.fail(ArrayUtils.isEmpty(expIds),"试验ID不能为空");
+        RestAssert.fail(null == modelId ,"模板ID不能为空");
+        SoilEntrust entrust = soilEntrustService.getById(entrustId);
         Map<String,Object> map = new HashMap<>();
-        map.put("#{client}","续点费");
+        map.put("client",entrust.getClient());
+        map.put("boreholeName",entrust.getBoreholeName());
+        map.put("entrustCode",entrust.getEntrustCode());
+        List<SoilExperimentVO> experimentVOList = soilExperimentService.listVOByIds(expIds);
+        int length = experimentVOList.size();
+        for (int i = 0; i < length; i++) {
+            SoilExperimentVO vo = experimentVOList.get(i);
+            map.put("sampleCode"+(i+1),vo.getSampleCode());
+            map.put("sampleDepth"+(i+1),vo.getSampleDepth());
+        }
         return map;
     }
 

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

@@ -171,6 +171,8 @@
                 AND t.tester_id = #{vo.testerId}
             </if>
 
+            ORDER BY s.sample_code
+
     </select>
 
     <select id="selectOriginalExpList" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
@@ -239,7 +241,7 @@
                 #{id}
             </foreach>
         </if>
-
+        ORDER BY s.sample_code
     </select>
 
 </mapper>