土工平台修改

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

@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
  * @author wwd
  * @since 2020-09-18
  */
-@Api(tags = "土工试验试样表")
+@Api(tags = "土工试验试样备样表")
 @RestController
 @RequestMapping("/v1/sample_backup")
 public class SoilSampleBackupController extends ServiceController {

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

@@ -5,12 +5,10 @@ import java.util.List;
 import java.util.Map;
 
 import com.google.common.collect.Lists;
-import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.service.soil.dto.SoilPrepareDTO;
 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.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +26,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -571,4 +568,18 @@ 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_warehouse_location_sample")
+    public RestResult<Page<SoilSampleVO>> getPageWarehouseLocationSample(SoilSampleVO soilSample) {
+        return success(soilSampleService.pageWarehouseLocationSample(getPage(), soilSample));
+    }
+
+
 }

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

@@ -27,4 +27,6 @@ public interface SoilSampleMapper extends BaseMapper<SoilSample> {
     List<SoilSampleVO> selectVOListByExp(RowBounds rowBounds, @Param("vo")SoilSampleVO soilSample);
 
     List<SoilSampleVO> selectLocationSample(Page<SoilSampleVO> page, @Param("vo")SoilSampleVO soilSample);
+
+    List<SoilSampleVO> selectWarehouseLocationSample(Page<SoilSampleVO> page, @Param("vo")SoilSampleVO soilSample);
 }

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

@@ -87,4 +87,6 @@ public interface ISoilSampleService extends IBaseService<SoilSample> {
     Page<SoilSampleVO> listSampleProgress(Page<SoilSampleVO> page, SoilSampleVO vo);
 
     boolean callOutAloneKeepSample(Long[] ids, Account account);
+
+    Page<SoilSampleVO> pageWarehouseLocationSample(Page<SoilSampleVO> page, SoilSampleVO soilSample);
 }

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

@@ -825,6 +825,13 @@ public class SoilSampleServiceImpl extends BaseServiceImpl<SoilSampleMapper, Soi
     }
 
 
+    @Override
+    public Page<SoilSampleVO> pageWarehouseLocationSample(Page<SoilSampleVO> page, SoilSampleVO soilSample) {
+
+        return page.setRecords(baseMapper.selectWarehouseLocationSample(page,soilSample));
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean sampleRetain(Long[] ids,Long locationId,String location,String warehouse,  Date keepLimitTime, Account account) {

src/main/resources/application-dev.yml

@@ -58,3 +58,4 @@ food.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
 print.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
 res.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
 convert.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
+soil.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule

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

@@ -134,6 +134,37 @@
         ORDER BY s.sample_code
     </select>
 
+
+
+    <select id="selectWarehouseLocationSample" resultType="com.patzn.cloud.service.soil.vo.SoilSampleVO">
+        WITH o AS ( SELECT sample_id,receive_location,warehouse,receiver,receive_time,sender,send_time,make_time,maker,company_id FROM soil_sample_operation
+
+
+        WHERE 1=1
+         <if test="null!=vo.receiveLocation">
+          AND receive_location = #{vo.receiveLocation}
+         </if>
+         <if test="null!=vo.warehouse">
+            AND warehouse = #{vo.warehouse}
+         </if>
+
+         AND receive_location IS NOT NULL
+
+         AND warehouse IS NOT NULL
+
+        )
+        SELECT
+        <include refid="sColumn"/>,<include refid="eColumn"/>,
+        o.receive_location,o.warehouse,o.receiver,o.receive_time,o.sender,o.send_time,o.make_time,o.maker
+        FROM
+        o o
+        JOIN soil_sample s ON o.sample_id = s.id
+        JOIN soil_entrust e ON s.entrust_id = e.id
+        WHERE s.deleted = 0 AND e.deleted = 0
+        <include refid="sWhere"/>
+        ORDER BY s.sample_code
+    </select>
+
     <select id="selectVOListByExp" resultType="com.patzn.cloud.service.soil.vo.SoilSampleVO">
         WITH exp AS (
         SELECT sample_id,company_id FROM soil_experiment WHERE deleted = 0