修改测试问题；

.gitignore

+.gradle
+.idea
+build
+gradle*
+Dockerfile
+Jenkinsfile-test
+libs
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.patzn.cloud.service.hmhj.dto.EntrustDTO;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustVO;
+import com.patzn.cloud.service.lims.hmhj.service.impl.UserInfoServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +36,9 @@ public class EntrustController extends ServiceController {
     @Autowired
     private IEntrustService entrustService;
 
+    @Autowired
+    private UserInfoServiceImpl userInfoService;
+
     @ApiOperation("委托登记分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -333,6 +337,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_sample_receive")
     public RestResult<Page<EntrustVO>> getPageEntrustSampleReceive(EntrustVO entrust) {
         entrust.setPrepareStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
+        // 设置用户编组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustSampleReceive(getPage(), entrust));
     }
 
@@ -348,6 +354,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_sample_receive_his")
     public RestResult<Page<EntrustVO>> getPageEntrustSampleReceiveHis(EntrustVO entrust) {
         entrust.setPrepareNotStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
+        // 设置用户编组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustSampleReceiveHis(getPage(), entrust));
     }
 
@@ -363,6 +371,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_allot")
     public RestResult<Page<EntrustVO>> getPageTaskAllot(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
@@ -383,6 +393,8 @@ public class EntrustController extends ServiceController {
                 EntrustSampleItemStatusEnum.AUDIT,
                 EntrustSampleItemStatusEnum.END
         ));
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItemHis(getPage(), entrust));
     }
 
@@ -397,6 +409,8 @@ public class EntrustController extends ServiceController {
     @PostMapping("/page_entrust_test")
     public RestResult<Page<EntrustVO>> getPageTaskTest(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
@@ -416,6 +430,8 @@ public class EntrustController extends ServiceController {
                 EntrustSampleItemStatusEnum.AUDIT,
                 EntrustSampleItemStatusEnum.END
         ));
+        // 获取当前用户分组
+        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItemHis(getPage(), entrust));
     }
 

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,9 +45,19 @@ public class OriginalRecordController extends ServiceController {
             @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
     })
     @PostMapping("/page")
-	public RestResult<Page<OriginalRecord>> getPage(OriginalRecord originalRecord) {
+    public RestResult<Page<OriginalRecord>> getPage(OriginalRecord originalRecord) {
         return success(originalRecordService.page(getPage(), originalRecord));
-	}
+    }
+
+    @ApiOperation(value = "分页列表查询", notes = "分页列表查询")
+    @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),
+    })
+    @PostMapping("/pageVO")
+    public RestResult<Page<OriginalRecordVO>> getPageVO(OriginalRecordVO originalRecordVO) {
+        return success(originalRecordService.pageVO(getPage(), originalRecordVO));
+    }
 
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
@@ -62,23 +73,23 @@ public class OriginalRecordController extends ServiceController {
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),
     })
     @PutMapping("/{id}")
-	public RestResult<Boolean> edit(@PathVariable("id") Long id, OriginalRecord originalRecord) {
+    public RestResult<Boolean> edit(@PathVariable("id") Long id, OriginalRecord originalRecord) {
         originalRecord.setId(id);
         return success(originalRecordService.updateById(originalRecord));
-	}
+    }
 
     @ApiOperation("添加")
     @PostMapping("/")
-	public RestResult<Boolean> add(OriginalRecord originalRecord) {
+    public RestResult<Boolean> add(OriginalRecord originalRecord) {
         return success(originalRecordService.save(originalRecord));
-	}
+    }
 
     @ApiOperation("根据 ids 删除")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "主键列表", required = true, paramType = "query", allowMultiple = true, dataTypeClass = Long.class),
     })
-	@DeleteMapping("/")
-	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
+    @DeleteMapping("/")
+    public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(originalRecordService.removeByIds(ids));
-	}
+    }
 }

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

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
-import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
 import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@ import com.patzn.cloud.commons.mapper.BatchMapper;
  */
 public interface OriginalRecordMapper extends BatchMapper<OriginalRecord> {
 
+    List<OriginalRecordVO> selectPageVO(RowBounds rowBounds, @Param("vo") OriginalRecordVO vo);
 }

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

@@ -6,6 +6,7 @@ import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.entity.Entrust;
 import com.patzn.cloud.service.hmhj.entity.OriginalRecord;
 import com.patzn.cloud.service.hmhj.entity.OriginalTemplate;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 
 import java.io.File;
 import java.util.List;
@@ -23,4 +24,6 @@ public interface IOriginalRecordService extends IBaseService<OriginalRecord> {
     boolean removeByIds(List<Long> ids);
 
     OriginalRecord uploadExpGenerate(Long[] ids, OriginalTemplate template, Entrust entrust, Account account, String remark, File file);
+
+    Page<OriginalRecordVO> pageVO(Page<OriginalRecordVO> page, OriginalRecordVO originalRecord);
 }

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

@@ -60,7 +60,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     @Override
     public Page<ContractSample> page(Page<ContractSample> page, ContractSample contractSample) {
         Wrapper wrapper = new EntityWrapper<>(contractSample);
-
+        wrapper.orderBy("ctime",false);
         return this.page(page, wrapper);
     }
 

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

@@ -65,7 +65,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     @Override
     public Page<Entrust> page(Page<Entrust> page, Entrust entrust) {
         Wrapper wrapper = new EntityWrapper<>(entrust);
-
+        wrapper.orderBy("entrust_time",false);
         return this.page(page, wrapper);
     }
 

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.oss.starter.OssFileResult;
 import com.patzn.cloud.service.hmhj.entity.*;
+import com.patzn.cloud.service.hmhj.vo.OriginalRecordVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.OriginalRecordMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
 import com.patzn.cloud.service.lims.hmhj.service.IItemRelOriginalRecordService;
@@ -48,6 +49,11 @@ public class OriginalRecordServiceImpl extends BaseServiceImpl<OriginalRecordMap
     }
 
     @Override
+    public Page<OriginalRecordVO> pageVO(Page<OriginalRecordVO> page, OriginalRecordVO vo){
+        return page.setRecords(baseMapper.selectPageVO(page,vo));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         itemRelOriginalRecordService.remove(Condition.create().in("record_id",ids));
         return baseMapper.deleteBatchIds(ids) > 0;

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

@@ -33,8 +33,11 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
 
     @Override
     public Page<OriginalTemplate> page(Page<OriginalTemplate> page, OriginalTemplate originalTemplate) {
+        String alias = originalTemplate.getAlias();
+        // 支持模糊搜索
+        originalTemplate.setAlias(null);
         Wrapper wrapper = new EntityWrapper<>(originalTemplate);
-
+        wrapper.like("alias", alias);
         return this.page(page, wrapper);
     }
 
@@ -45,8 +48,8 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
 
     @Override
     public boolean uploadTemplate(MultipartFile file, String classType, String name, String remark, int templateType) {
-        RestAssert.fail(StringUtils.isBlank(classType),"模板类别不能为空");
-        RestAssert.fail(StringUtils.isBlank(name),"请填写原始记录名称");
+        RestAssert.fail(StringUtils.isBlank(classType), "模板类别不能为空");
+        RestAssert.fail(StringUtils.isBlank(name), "请填写原始记录名称");
         String fileName = file.getOriginalFilename();
         RestAssert.fail(StringUtils.isBlank(fileName), "请上传文件");
         OriginalTemplate attachment = new OriginalTemplate();

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

+package com.patzn.cloud.service.lims.hmhj.service.impl;
+
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.feign.base.client.SysUserClient;
+import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
+import com.patzn.cloud.service.base.entity.SysUser;
+import com.patzn.cloud.service.lims.base.entity.LmsUserGroup;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class UserInfoServiceImpl {
+
+    @Autowired
+    private LmsUserGroupClient lmsUserGroupClient;
+
+    public List<LmsUserGroup> getGroupList(Long userId) {
+        if (null == userId) {
+            return new ArrayList<>();
+        }
+        // 获取用户组
+        List<LmsUserGroup> userGroups = lmsUserGroupClient.getByUserId(userId).getData();
+        return CollectionUtils.isEmpty(userGroups) ? new ArrayList<>() : userGroups;
+    }
+
+    public List<String> getGroupNameList(Long userId) {
+        return getGroupList(userId).stream().map(t -> t.getName()).filter(t -> StringUtils.isNotBlank(t)).collect(Collectors.toList());
+    }
+
+    public List<String> getCurGroupNameList() {
+        return getGroupNameList(LoginHelper.getAccount().getUserId());
+    }
+
+    public String getCurGroupNames() {
+        return StringUtils.join(getCurGroupNameList(), "-");
+    }
+}

src/main/resources/application-local.yml

@@ -12,7 +12,7 @@ service:
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://127.0.0.1:5432/dev_lims_hmhj
+    url: jdbc:postgresql://localhost:5432/dev_lims_hmhj
     username: postgres
     password: post123
     dynamic:
@@ -29,7 +29,7 @@ spring:
     protocol: smtp
     default-encoding: UTF-8
   rabbitmq:
-    host: 124.70.150.247
+    host: localhost
     port: 5672
     username: mqbase
     password: mqb123#@$5

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

@@ -38,6 +38,7 @@
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
         SELECT  s.* FROM contract_sample s WHERE s.deleted = 0
         <include refid="sqlWhere"/>
+        order by s.ctime desc
     </select>
     <select id="selectVOPublishList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSampleVO">
         SELECT  s.*,
@@ -54,6 +55,7 @@
 
          WHERE s.deleted = 0 AND t.judge_status NOT IN (0,1)
         <include refid="sqlWhere"/>
+        order by s.ctime desc
     </select>
 
 

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

@@ -14,6 +14,13 @@
               #{id}
           </foreach>
       </if>
+      <if test="null!=vo.groupNameList">
+          AND test_side IN
+          <foreach collection="vo.groupNameList" index="index" item="groupName" open="(" separator="," close=")">
+              #{groupName}
+          </foreach>
+      </if>
+      order by entrust_time desc
   </select>
 
 
@@ -41,7 +48,14 @@
                 #{status}
             </foreach>
         </if>
-    </select>
 
+        <if test="null!=vo.groupNameList">
+            AND test_side IN
+            <foreach collection="vo.groupNameList" index="index" item="groupName" open="(" separator="," close=")">
+                #{groupName}
+            </foreach>
+        </if>
+        order by entrust_time desc
+    </select>
 
 </mapper>

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

@@ -3,54 +3,48 @@
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleBackupMapper">
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleBackupVO">
-
-
-    SELECT
-	b.ID,
-	b.receive_time,
-	b.storage_location,
-	b.storage_method,
-	b.storage_period,
-	b.sample_id,
-	b.handler,
-	b.handle_time,
-
-	s.NAME AS "sampleName",
-	s.code AS "sampleCode" ,
-	e.client ,
-	e.code AS "entrustCode"
-FROM
-	entrust_sample_backup b
-	JOIN entrust_sample s ON b.sample_id = s.
-	ID JOIN entrust e ON s.entrust_id = e.ID
-
-	<where>
-        AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
-        <if test="null!=vo.sampleCode">
-            AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
-        </if>
-
-        <if test="null!=vo.status">
-            AND b.status =#{vo.status}
-        </if>
-
-
-        <if test="null!=vo.notStatus">
-            AND b.status !=#{vo.notStatus}
-        </if>
-
-        <if test="null!=vo.sampleName">
-            AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
-        </if>
-
-        <if test="null!=vo.client">
-            AND e.client LIKE CONCAT('%',#{vo.client},'%')
-        </if>
-        <if test="null!=vo.entrustCode">
-            AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
-        </if>
-
-    </where>
-
+        SELECT
+            b.ID,
+            b.receive_time,
+            b.storage_location,
+            b.storage_method,
+            b.storage_period,
+            b.sample_id,
+            b.handler,
+            b.handle_time,
+            s.NAME AS "sampleName",
+            s.code AS "sampleCode" ,
+            e.client ,
+            e.code AS "entrustCode"
+        FROM
+        entrust_sample_backup b
+        JOIN entrust_sample s ON b.sample_id = s.
+        ID JOIN entrust e ON s.entrust_id = e.ID
+        <where>
+            AND b.deleted = 0 AND s.deleted = 0 AND e.deleted = 0
+            <if test="null!=vo.sampleCode">
+                AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
+            </if>
+
+            <if test="null!=vo.status">
+                AND b.status =#{vo.status}
+            </if>
+
+            <if test="null!=vo.notStatus">
+                AND b.status !=#{vo.notStatus}
+            </if>
+
+            <if test="null!=vo.sampleName">
+                AND s.name LIKE CONCAT('%',#{vo.sampleName},'%')
+            </if>
+
+            <if test="null!=vo.client">
+                AND e.client LIKE CONCAT('%',#{vo.client},'%')
+            </if>
+            <if test="null!=vo.entrustCode">
+                AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
+            </if>
+        </where>
+        order by b.ctime desc
     </select>
 </mapper>

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

@@ -4,89 +4,93 @@
 
     <select id="selectByItemLeftList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
         SELECT name FROM entrust_sample_item WHERE deleted = 0
-
-
-
         <if test="null!=vo.status">
             AND status = #{vo.status}
         </if>
+        <if test="null != vo.name">
+            AND name like CONCAT('%',#{vo.name},'%')
+        </if>
+
+        <if test="null != vo.sampleCode">
+            AND sample_code like CONCAT('%',#{vo.sampleCode},'%')
+        </if>
 
         <if test="null!=vo.statusList">
-            AND  status IN
+            AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
                 #{status}
             </foreach>
         </if>
 
-
-          <if test="null!=vo.sampleIds">
-              AND  entrust_sample_id IN
-              <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
-                  #{sampleId}
-              </foreach>
-          </if>
-
-          GROUP BY name
+        <if test="null!=vo.sampleIds">
+            AND entrust_sample_id IN
+            <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
+                #{sampleId}
+            </foreach>
+        </if>
+        GROUP BY name
     </select>
 
 
     <select id="selectByItemLeftRight" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
         WITH i AS (
-           SELECT
-             id,
-             entrust_sample_id,
-             name,
-             status,
+        SELECT
+        id,
+        entrust_sample_id,
+        name,
+        status,
         company_id,
-             standard,
-             group_name,
-             test_value,
-             group_id
-         FROM
-            entrust_sample_item
-         WHERE
-            deleted = 0
-            <if test="null!=vo.status">
-                AND status = #{vo.status}
-            </if>
-            AND company_id = #{vo.companyId}
+        standard,
+        group_name,
+        test_value,
+        group_id
+        FROM
+        entrust_sample_item
+        WHERE
+        deleted = 0
+        <if test="null!=vo.status">
+            AND status = #{vo.status}
+        </if>
+        AND company_id = #{vo.companyId}
 
         <if test="null!=vo.statusList">
-            AND  status IN
+            AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
                 #{status}
             </foreach>
         </if>
 
-            <if test="null!=vo.name">
-                AND name = #{vo.name}
-            </if>
+        <if test="null!=vo.name">
+            AND name = #{vo.name}
+        </if>
 
         <if test="null!=vo.nameArray">
-            AND  name IN
+            AND name IN
             <foreach collection="vo.nameArray" index="index" item="name" open="(" separator="," close=")">
                 #{name}
             </foreach>
         </if>
 
         <if test="null!=vo.sampleIds">
-            AND  entrust_sample_id IN
+            AND entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
                 #{sampleId}
             </foreach>
         </if>
 
-      )
+        )
 
-            SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.id
-            LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 )  l ON i.id = l.item_id
-            LEFT JOIN ( SELECT id,object_key FROM original_record  WHERE deleted = 0 )  r ON l.record_id = r.id
-            <where>
-                <if test="null!=vo.sampleCode">
-                    AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
-                </if>
-                AND i.company_id = #{vo.companyId}
-            </where>
+        SELECT i.*,s.name AS "sampleName",e.test_side "testSide",s.code AS "sampleCode",l.record_id,r.object_key AS "recordObjectKey" FROM i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        LEFT JOIN ( SELECT id,item_id,record_id FROM item_rel_original_record WHERE deleted = 0 ) l ON i.id = l.item_id
+        LEFT JOIN ( SELECT id,object_key FROM original_record WHERE deleted = 0 ) r ON l.record_id = r.id
+        LEFT JOIN ( SELECT id,test_side FROM entrust e where e.deleted = 0 ) e on e.id = s.entrust_id
+        <where>
+            <if test="null!=vo.sampleCode">
+                AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
+            </if>
+            AND i.company_id = #{vo.companyId}
+        </where>
     </select>
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
@@ -105,38 +109,42 @@
         WHERE
         deleted = 0
 
-        <if test="null!=vo.status">
+        <if test="null != vo.name">
+            AND name LIKE CONCAT('%',#{vo.name},'%')
+        </if>
+
+        <if test="null != vo.status">
             AND status = #{vo.status}
         </if>
 
-        <if test="null!=vo.statusList">
+        <if test="null != vo.statusList">
             AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
                 #{status}
             </foreach>
         </if>
 
-
-
         <if test="null!=vo.sampleIds">
-            AND  entrust_sample_id IN
+            AND entrust_sample_id IN
             <foreach collection="vo.sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
                 #{sampleId}
             </foreach>
         </if>
 
         <if test="null!=vo.sampleIdsArray">
-            AND  entrust_sample_id IN
+            AND entrust_sample_id IN
             <foreach collection="vo.sampleIdsArray" index="index" item="sampleId" open="(" separator="," close=")">
                 #{sampleId}
             </foreach>
         </if>
-
         )
 
-        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        SELECT i.*,s.name AS "sampleName",s.code AS "sampleCode",e.test_side "testSide"
+        FROM i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        JOIN (select t.id,t.code,t.test_side from entrust t where t.deleted = 0 ) e on s.entrust_id = e.id
         <where>
-            <if test="null!=vo.sampleCode">
+            <if test="null != vo.sampleCode">
                 AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
             </if>
         </where>
@@ -144,13 +152,13 @@
 
 
     <select id="selectVOListBySampleIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-      SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
-      FROM
-	  entrust_sample_item i
-	  JOIN entrust_sample s ON i.entrust_sample_id = s.ID
+        SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode"
+        FROM
+        entrust_sample_item i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.ID
 
-	  WHERE i.deleted = 0 AND s.deleted = 0
-	 AND i.entrust_sample_id IN
+        WHERE i.deleted = 0 AND s.deleted = 0
+        AND i.entrust_sample_id IN
         <foreach collection="ids" index="index" item="sampleId" open="(" separator="," close=")">
             #{sampleId}
         </foreach>
@@ -165,16 +173,17 @@
 
         i.group_name,i.standard,s.name AS "sampleName",e.client,e.code AS "entrustCode",
 
-        d.method_code,d.reason,d.method_desc,d.applyer,d.apply_time , d.checker ,d.check_time,d.back_reason,r.object_key AS "recordObjectKey"
+        d.method_code,d.reason,d.method_desc,d.applyer,d.apply_time , d.checker ,d.check_time,d.back_reason,r.object_key
+        AS "recordObjectKey"
 
         FROM
         entrust_sample_item i
         JOIN entrust_sample s ON i.entrust_sample_id = s.ID
         JOIN entrust e ON s.entrust_id = e.id
         JOIN item_deviate d ON i.id = d.item_id
-        LEFT JOIN item_rel_original_record  l ON i.id = l.item_id
-        LEFT JOIN original_record  r ON l.record_id = r.id
-        WHERE i.deleted = 0 AND s.deleted = 0 AND d.deleted = 0  AND e.deleted = 0
+        LEFT JOIN item_rel_original_record l ON i.id = l.item_id
+        LEFT JOIN original_record r ON l.record_id = r.id
+        WHERE i.deleted = 0 AND s.deleted = 0 AND d.deleted = 0 AND e.deleted = 0
         <if test="null!=vo.status">
             AND i.status = #{vo.status}
         </if>
@@ -182,21 +191,19 @@
             AND d.status = #{vo.status}
         </if>
 
-    <if test="vo.ids!=null">
-        AND i.id IN
-        <foreach collection="vo.ids" index="index" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </if>
-
-
+        <if test="vo.ids!=null">
+            AND i.id IN
+            <foreach collection="vo.ids" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         ORDER BY s.code , i.name
     </select>
 
 
-
     <select id="selectVOListByIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
-        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS "sampleCode",s.name AS "sampleName",
+        SELECT i.id,i.name,i.entrust_sample_id,s.entrust_id,i.agreed_value,i.test_value,i.standard,s.code AS
+        "sampleCode",s.name AS "sampleName",
 
         s.sample_shape ,s.sample_quantity, s.standard, s.sample_from,s.product_code,s.name_code
         FROM
@@ -213,5 +220,4 @@
     </select>
 
 
-
 </mapper>

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

@@ -44,6 +44,10 @@
             AND  status = #{vo.status}
         </if>
 
+        <if test="null!=vo.code">
+            AND  code LIKE CONCAT('%',#{vo.code},'%')
+        </if>
+
         <if test="null!=vo.notStatus">
             AND  status != #{vo.notStatus}
         </if>

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

@@ -2,4 +2,18 @@
 <!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.OriginalRecordMapper">
 
+    <select id="selectPageVO" resultType="com.patzn.cloud.service.hmhj.vo.OriginalRecordVO">
+        select r.*,e.code "entrustCode"
+        from original_record r
+        join entrust e on e.id = r.entrust_id
+        where r.deleted = 0 and e.deleted = 0
+        <if test="null != vo.title">
+            AND r.title LIKE CONCAT('%',#{vo.title},'%')
+        </if>
+        <if test="null != vo.entrustCode">
+            AND e.code LIKE CONCAT('%',#{vo.entrustCode},'%')
+        </if>
+        order by r.id desc
+    </select>
+
 </mapper>