土工平台修改

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +24,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -54,6 +56,29 @@ public class ContractSampleController extends ServiceController {
 
 
 
+    @ApiOperation("合同登记历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_reg_his")
+    public RestResult<Page<ContractSampleVO>> getPage(ContractSampleVO contractSample) {
+
+        List<ContractSampleStatusEnum> statusList = new ArrayList<>();
+        statusList.add(ContractSampleStatusEnum.STORE_TRANSPORT);
+        statusList.add(ContractSampleStatusEnum.PRO_TEC_CHECK);
+        statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_REG);
+        statusList.add(ContractSampleStatusEnum.CHECK_ACCEPT_ORg);
+
+
+        contractSample.setStatusList(statusList);
+        return success(contractSampleService.pageVO(getPage(), contractSample));
+    }
+
+
+
     @ApiOperation("储运登记分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ContractSampleMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
  */
 public interface ContractSampleMapper extends BatchMapper<ContractSample> {
 
+    List<ContractSampleVO> selectVOList(RowBounds rowBounds, ContractSampleVO contractSample);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
+import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 
 import java.util.List;
 
@@ -30,4 +31,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean submitToCheckAcceptReg(Long[] ids, Account account);
 
     boolean submitToCheckAcceptOrg(Long[] ids, Account account);
+
+    Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java

@@ -5,6 +5,7 @@ import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
@@ -121,6 +122,10 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     }
 
 
+    @Override
+    public Page<ContractSampleVO> pageVO(Page<ContractSampleVO> page, ContractSampleVO contractSample) {
+        return page.setRecords(baseMapper.selectVOList(page,contractSample));
+    }
 
 
 }

src/main/resources/mapper/hmhj/ContractSampleMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper">
 
+
+    <sql id="sqlWhere">
+               <if test="null!=vo.status">
+                   AND s.status = #{vo.status}
+               </if>
+                <if test="null!=vo.statusList">
+                    AND s.status IN
+                    <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                        #{status}
+                    </foreach>
+                </if>
+    </sql>
+
+    <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
+        SELECT  s.* FROM contract_sample s WHERE s.deleted = 0
+        <include refid="sqlWhere"/>
+    </select>
 </mapper>