霍煤检测结果查询修改;

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

@@ -28,6 +28,7 @@ public interface EntrustSampleMapper extends BatchMapper<EntrustSample> {
 
     List<EntrustSampleVO> selectMinStatusByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
 
+    @SqlParser(filter = true)
     List<EntrustSampleVO> selectTestResultQuery(RowBounds rowBounds, @Param("vo") EntrustSampleVO entrustSample);
 
     @SqlParser(filter = true)

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

@@ -9,6 +9,7 @@ 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.exception.PatznException;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.commons.toolkit.DateUtils;
@@ -200,7 +201,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
 
     @Override
     public Page<EntrustSampleVO> pageTestResultQuery(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
-
+        entrustSample.setCompanyId(LoginHelper.getAccount().getCompanyId());
         List<EntrustSampleVO> voList = baseMapper.selectTestResultQuery(page, entrustSample);
         if (CollectionUtils.isEmpty(voList)) {
             return page;

src/main/resources/application-local.yml

@@ -12,7 +12,7 @@ service:
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://meazty.fun:5433/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: data.meazty.fun
+    host: 8.142.29.214
     port: 5672
     username: mqbase
     password: mqb123#@$5
@@ -49,8 +49,8 @@ spring:
   # Mongodb GridFS
   data:
     mongodb:
-#      uri: mongodb://hmuser:hj564Aq@meazty.fun:27017/lims
-      uri: mongodb://mongo:Mong$6358#@meazty.fun:27154/lims
+      #uri: mongodb://limsAdmin:devpt12!mg@192.168.0.142:27017/lims
+      uri: mongodb://mongo:Mong$6358#@localhost:27017/lims
       grid-fs-database: lims
 
 # Mongodb GridFS 存储

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

@@ -121,32 +121,23 @@
 
     <select id="selectTestResultQuery" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
         SELECT
-        s.ID,
-        s.NAME,
-        s.code,
-        e.code AS "entrustCode",
-        e.client,
-        e.entrust_time,
-        e.test_side,
-        s.supplier,
-        s.manufacturer,
-        s.slot_no,
-        (case when cr.calc_result is null then null else (case when cr.calc_result > 0 then 1 else 0 end) end) "isQualified"
-        FROM   entrust_sample s
-        JOIN entrust e ON s.entrust_id = e.ID
-        JOIN (
-             SELECT  i.entrust_sample_id  FROM entrust_sample_item i
-             JOIN entrust_sample_item_index x ON i.ID = x.entrust_sample_item_id
-             WHERE i.deleted = 0  AND x.deleted = 0   AND x.test_value IS NOT NULL
-             GROUP BY   i.entrust_sample_id
-        ) k ON s.ID = k.entrust_sample_id
-        left join (
-          -- 实际每个样品一条记录，此处去除测试冗余数据
-          select cr.sample_id,max(cr.calc_result) "calc_result" from v_sample_calc_result cr
-          group by cr.sample_id
-        ) cr on cr.sample_id = s.id
+            s.ID,
+            s.NAME,
+            s.code,
+            e.code AS "entrustCode",
+            e.client,
+            e.entrust_time,
+            e.test_time_s "test_time",
+            to_char(e.test_time_s,'yyyy-MM-dd HH:mm') || ' ~ ' || to_char(e.test_time_e,'yyyy-MM-dd HH:mm') "test_time_se",
+            e.test_side,
+            s.supplier,
+            s.manufacturer,
+            s.slot_no,
+            s.sample_grading
+        FROM entrust_sample s
+        JOIN entrust e ON (s.entrust_id = e.ID and e.deleted = 0 )
         WHERE
-            s.deleted = 0 AND s.type = 0 AND e.deleted = 0
+            s.deleted = 0 AND s.type = 0 and s.company_id = #{vo.companyId}
         <if test="vo.name != null">
             AND s.name = #{vo.name}
         </if>
@@ -159,11 +150,11 @@
         </if>
 
         <if test="null!=vo.code">
-            AND  s.code LIKE CONCAT('%',#{vo.code},'%')
+            AND s.code LIKE CONCAT('%',#{vo.code},'%')
         </if>
 
         <if test="null!=vo.slotNo">
-            AND  s.slot_no LIKE CONCAT('%',#{vo.slotNo},'%')
+            AND s.slot_no LIKE CONCAT('%',#{vo.slotNo},'%')
         </if>
         <if test="null != vo.slotNoS || null != vo.slotNoE">
             AND s.slot_no is not null
@@ -174,9 +165,7 @@
         <if test="null != vo.slotNoE">
             AND to_number(s.slot_no,'99999') &lt;= #{vo.slotNoE}
         </if>
-
-        ORDER BY  e.code,s.code
-
+        ORDER BY e.code,s.code
     </select>
 
     <!--原铝品味统计查询-->