霍煤鸿骏

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

@@ -560,6 +560,20 @@ public class EntrustSampleItemController extends ServiceController {
 
 
 
+    @ApiOperation("偏离审批查询历史page")
+    @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_item_deviate_check_his")
+    public RestResult<Page<EntrustSampleItemVO>> getPageItemDeviateCheckHis(EntrustSampleItemVO entrustSampleItem) {
+        return success(entrustSampleItemService.pageItemDeviateCheckHis(getPage(), entrustSampleItem));
+    }
+
+
+
     @ApiOperation("偏离审批通过")
     @PostMapping("/deviate_pass")
     public RestResult<Boolean> deviatePass(@RequestParam("ids")Long []ids ) {

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

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
+import com.baomidou.mybatisplus.annotations.SqlParser;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
 import com.patzn.cloud.commons.mapper.BatchMapper;
@@ -21,6 +22,7 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
 
     List<EntrustSampleItemVO> selectByItemLeftList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
 
+    @SqlParser(filter = true)
     List<EntrustSampleItemVO> selectByItemLeftRight(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO itemVO);
 
     List<EntrustSampleItemVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);

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

@@ -55,4 +55,6 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
     boolean deviatePass(Long[] ids, Account account);
 
     boolean deviateBack(Long[] ids, String reason, Account account);
+
+    Page<EntrustSampleItemVO> pageItemDeviateCheckHis(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem);
 }

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

@@ -2,8 +2,10 @@ package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.google.common.collect.Lists;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
+import com.patzn.cloud.commons.controller.LoginHelper;
 import com.patzn.cloud.commons.toolkit.FileUtils;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.service.hmhj.entity.*;
@@ -161,6 +163,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
 
 
         itemVO.setSampleIds(sampleIds);
+        itemVO.setCompanyId(LoginHelper.getAccount().getCompanyId());
         return page.setRecords(baseMapper.selectByItemLeftRight(page,itemVO));
     }
 
@@ -471,6 +474,25 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         return false;
     }
 
+    @Override
+    public Page<EntrustSampleItemVO> pageItemDeviateCheckHis(Page<EntrustSampleItemVO> page, EntrustSampleItemVO entrustSampleItem) {
+        List<EntrustSampleItemStatusEnum> statusEnums = Lists.newArrayList(
+                EntrustSampleItemStatusEnum.UPDATE_APPLY_BACK,
+                EntrustSampleItemStatusEnum.UPDATE_APPLY_PASS
+        );
+        List<ItemDeviate> list = itemDeviateService.list(Condition.create().setSqlSelect("item_id").in("status",statusEnums).groupBy("item_id"));
+        if (CollectionUtils.isEmpty(list)){
+            return page;
+        }
+
+        List<Long>  ids = list.stream().map(s->{
+            return s.getItemId();
+        }).collect(Collectors.toList());
+
+        entrustSampleItem.setIds(ids);
+        return page.setRecords(baseMapper.selectByItemDeviate(page,entrustSampleItem));
+    }
+
     private List<EntrustSampleItemVO> listVOByIds(Long[] ids) {
         return baseMapper.selectVOListByIds(ids);
     }

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

@@ -37,6 +37,7 @@
              entrust_sample_id,
              name,
              status,
+        company_id,
              standard,
              group_name,
              test_value,
@@ -48,6 +49,7 @@
             <if test="null!=vo.status">
                 AND status = #{vo.status}
             </if>
+            AND company_id = #{vo.companyId}
 
         <if test="null!=vo.statusList">
             AND  status IN
@@ -76,11 +78,14 @@
 
       )
 
-            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",l.record_id,r.object_key AS "recordObjectKey" FROM i  JOIN entrust_sample s ON i.entrust_sample_id = s.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>
                 <if test="null!=vo.sampleCode">
                     AND s.code LIKE CONCAT('%',#{vo.sampleCode},'%')
                 </if>
+                AND i.company_id = #{vo.companyId}
             </where>
     </select>
 
@@ -160,13 +165,15 @@
 
         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
+        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
         <if test="null!=vo.status">
             AND i.status = #{vo.status}
@@ -175,6 +182,14 @@
             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>
+
+
         ORDER BY s.code , i.name
     </select>
 

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

@@ -5,7 +5,9 @@
     <select id="selectSampleReceiveList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
        SELECT
-	    p.id, p.entrust_sample_id,s.code,s.name,p.group_id,p.group_name,p.make_type,p.make_quantity,p.store_way,p.store_location,p.maker,p.make_time
+	    p.id, p.entrust_sample_id,s.code,s.name,s.product_code,s.product_basis_name,s.compose_judge,s.product_standard_id,s.name_code,
+
+	    p.group_id,p.group_name,p.make_type,p.make_quantity,p.store_way,p.store_location,p.maker,p.make_time
       FROM
 	  entrust_sample_prepare
 	  P JOIN entrust_sample s ON P.entrust_sample_id = s.ID