fix:[资源管理][供试品]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlMapper.java

@@ -39,10 +39,11 @@ public interface GspFfjlMapper extends BaseMapper
 
     /**
      * 出库量、入库量、使用量 出现频率最高的单位
-     * @param queryWrapper
      * @return
      */
-    Map<String, String> getStatisticsUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper1, @Param("ew2") Wrapper<GspFfjl> queryWrapper2, @Param("ew3") Wrapper<GspFfjl> queryWrapper3);
+    String getCklUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper);
+    String getSylUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper);
+    String getRklUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper);
     Map<String, Double> getStatistics(@Param("ew") Wrapper<GspFfjl> queryWrapper, @Param("rkldw") String rkldw, @Param("ckldw") String ckldw, @Param("syldw") String syldw);
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/BacteriaServiceImpl.java

@@ -59,7 +59,8 @@ public class BacteriaServiceImpl extends ServiceImpl i
         QueryWrapper<Bacteria> queryWrapper = Wrappers.query();
         queryWrapper.eq("b.del_flag", 0);
         if(form.getStudyId() != null) {
-            queryWrapper.eq("b.study_id", form.getStudyId());
+            queryWrapper.eq("b.study_id", form.getStudyId())
+                    .eq("sb.study_id", form.getStudyId());
         }
         if(StringUtils.isNotEmpty(form.getMc())) {
             queryWrapper.like("b.mc", form.getMc());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/CellServiceImpl.java

@@ -59,7 +59,8 @@ public class CellServiceImpl extends ServiceImpl implements IC
         QueryWrapper<Cell> queryWrapper = Wrappers.query();
         queryWrapper.eq("c.del_flag", 0);
         if (form.getStudyId() != null) {
-            queryWrapper.eq("c.study_id", form.getStudyId());
+            queryWrapper.eq("c.study_id", form.getStudyId())
+                    .eq("sc.study_id", form.getStudyId());
         }
         if (StringUtils.isNotEmpty(form.getMc())) {
             queryWrapper.like("c.mc", form.getMc());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java

@@ -871,19 +871,30 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
 
     @Override
     public Map<String, String> getStatisticsUnit(GspSearchListForm form) {
+        Map<String, String> result = new HashMap<>();
+        result.put("ckldw", "");
+        result.put("syldw", "");
+        result.put("rkldw", "");
+
         QueryWrapper<GspFfjl> queryWrapper1 = getListCondition(form);
         queryWrapper1.isNotNull("ckldw")
                 .ne("ckldw", "");
+        String cklUnit = baseMapper.getCklUnit(queryWrapper1);
+        result.put("ckldw", cklUnit);
 
         QueryWrapper<GspFfjl> queryWrapper2 = getListCondition(form);
         queryWrapper2.isNotNull("syldw")
                 .ne("syldw", "");
+        String syldw = baseMapper.getSylUnit(queryWrapper2);
+        result.put("syldw", syldw);
 
         QueryWrapper<GspFfjl> queryWrapper3 = getListCondition(form);
         queryWrapper3.isNotNull("rkldw")
                 .ne("rkldw", "");
+        String rkldw = baseMapper.getRklUnit(queryWrapper3);
+        result.put("rkldw", rkldw);
 
-        return baseMapper.getStatisticsUnit(queryWrapper1, queryWrapper2, queryWrapper3);
+        return result;
     }
 
     @Override

hxhq-modules/hxhq-system/src/main/resources/mapper/business/BacteriaMapper.xml

@@ -10,7 +10,7 @@
         </foreach>
     </update>
     <select id="queryStudyList" resultType="com.hxhq.business.domain.Bacteria">
-        SELECT b.*, s.name AS studyName
+        SELECT distinct b.id, b.*, s.name AS studyName
         FROM `t_bacteria`  b
         LEFT JOIN `t_study_bacteria` sb  ON b.id=sb.resource_id
         LEFT JOIN `t_study` s ON s.id = b.study_id

hxhq-modules/hxhq-system/src/main/resources/mapper/business/CellMapper.xml

@@ -10,7 +10,7 @@
         </foreach>
     </update>
     <select id="queryStudyList" resultType="com.hxhq.business.domain.Cell">
-        SELECT c.*, s.name as studyName
+        SELECT distinct c.id, c.*, s.name as studyName
         FROM `t_cell` c
         LEFT JOIN  `t_study_cell` sc on c.id=sc.resource_id
         LEFT JOIN `t_study` s on s.id = c.study_id

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlMapper.xml

@@ -19,33 +19,6 @@
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gsp_ffjl` t WHERE id = #{id}
     </select>
-    <select id="getStatisticsUnit" resultType="java.util.Map">
-        SELECT * FROM
-            (SELECT ckldw, COUNT(*) AS ckldw_cnt FROM t_gsp_ffjl as t
-            <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
-                <where>
-                    ${ew.sqlSegment}
-                </where>
-            </if>
-             GROUP BY ckldw ORDER BY ckldw_cnt DESC LIMIT 1) AS ckldw
-        CROSS JOIN
-            (SELECT syldw, COUNT(*) AS syldw_cnt FROM t_gsp_ffjl as t
-                <if test="ew2.sqlSegment != '' and ew2.sqlSegment != null">
-                    <where>
-                        ${ew2.sqlSegment}
-                    </where>
-                </if>
-            GROUP BY syldw ORDER BY syldw_cnt DESC LIMIT 1)  AS syldw
-        CROSS JOIN
-            (SELECT rkldw, COUNT(*) AS rkldw_cnt FROM t_gsp_ffjl as t
-                <if test="ew3.sqlSegment != '' and ew3.sqlSegment != null">
-                    <where>
-                        ${ew3.sqlSegment}
-                    </where>
-                </if>
-            GROUP BY rkldw ORDER BY rkldw_cnt DESC LIMIT 1)  AS rkldw;
-    </select>
-
     <select id="sumRkl" resultType="java.math.BigDecimal">
         SELECT SUM(basic_rkl + 0) AS total
         FROM t_gsp_ffjl as t
@@ -85,5 +58,32 @@
             </where>
         </if>
     </select>
+    <select id="getCklUnit" resultType="java.lang.String">
+        SELECT ckldw FROM ( SELECT ckldw, COUNT(*) AS ckldw_cnt FROM t_gsp_ffjl as t
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+        GROUP BY ckldw ORDER BY ckldw_cnt DESC LIMIT 1 ) as t
+    </select>
+    <select id="getSylUnit" resultType="java.lang.String">
+        SELECT syldw FROM (SELECT syldw, COUNT(*) AS syldw_cnt FROM t_gsp_ffjl as t
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+        GROUP BY syldw ORDER BY syldw_cnt DESC LIMIT 1) as t
+    </select>
+    <select id="getRklUnit" resultType="java.lang.String">
+        SELECT rkldw FROM (SELECT rkldw, COUNT(*) AS rkldw_cnt FROM t_gsp_ffjl as t
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+        GROUP BY rkldw ORDER BY rkldw_cnt DESC LIMIT 1) as t
+    </select>
 
 </mapper>