冲突

Signed-off-by: hjc <1464339613@qq.com>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/mapper/BusinessQcQualityInspectionMapper.java

@@ -29,6 +29,9 @@ import java.util.List;
  * @date  2024/06/06 11:25
  **/
 public interface BusinessQcQualityInspectionMapper extends BaseMapper<BusinessQcQualityInspection> {
+    ReserveQualityOrgPageVO selectNo( String orgName);
+
+    ReserveQualityOrgPageVO selectPass( String orgName);
 
     /*  *
      * 粮食储备-储备质量(仓房)-分页
@@ -54,4 +57,8 @@ public interface BusinessQcQualityInspectionMapper extends BaseMapper<BusinessQc
     List<ReserveQualityOrgPageVO> selectNoAndPass(@Param("cityName")String orgName);
 
     BusinessQcQualityInspection selectByPrimaryKey(@Param("id")Integer id);
+
+    ReserveQualityCityPageVO selectCityPassByCityName(@Param("cityName") String cityName);
+
+    ReserveQualityCityPageVO selectCityNoPassByCityName(@Param("cityName") String cityName);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/mapper/mapping/BusinessQcQualityInspectionMapper.xml

@@ -48,6 +48,27 @@
     zbjgpd, qysj, qydbh, qyrxm, qyqy, jdrxm, ypbh, ypsl, dbsl, ypdj, sample_status, sample_package_model,
     bz
     </sql>
+    <select id="selectNo" resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityOrgPageVO">
+        select count(t1.org_id) noPassNum,t1.org_id,t2.org_name from depot_qh.business_qc_quality_inspection t1 left join depot_qh.org_info t2 on
+        t1.org_id=t2.org_id
+        <where>
+            t1.check_result='0'
+            <if test="orgName!=null and orgName!=''">
+                and t2.org_name like concat("%",#{orgName},"%")
+            </if>
+        </where>
+    </select>
+    <select id="selectPass" resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityOrgPageVO">
+        select count(t1.org_id) passNum,t1.org_id ,t2.org_name from depot_qh.business_qc_quality_inspection t1 left join depot_qh.org_info t2 on
+        t1.org_id=t2.org_id
+        <where>
+            t1.check_result='1'
+            <if test="orgName!=null and orgName!=''">
+                and t2.org_name like concat("%",#{orgName},"%")
+            </if>
+        </where>
+    </select>
+
 
     <select id="selectMyPage"
             resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityStoreHousePageVO">
@@ -123,6 +144,43 @@
 
     </select>
 
+    <select id="selectCityPassByCityName"
+            resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityCityPageVO">
+
+        SELECT
+        count(t3.zcdz_city) passNum,t4.id cityId,t4.DICT_LABEL cityName
+        FROM
+        depot_qh.business_qc_quality_inspection t1
+        LEFT JOIN depot_qh.org_info t2 ON t1.org_id = t2.org_id
+        LEFT JOIN province_all.biz_unit_info t3 ON t2.unit_info_id = t3.id
+        left join province_all.dev_dict t4 on t3.zcdz_city=t4.id
+        <where>
+            t1.check_result='1'
+            <if test="cityName!=null and cityName!=''">
+                and t4.DICT_LABEL like concat("%",#{cityName},"%")
+            </if>
+        </where>
+
+    </select>
+
+    <select id="selectCityNoPassByCityName"
+            resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityCityPageVO">
+
+        SELECT
+        count(t3.zcdz_city) noPassNum,t4.id cityId,t4.DICT_LABEL cityName
+        FROM
+        depot_qh.business_qc_quality_inspection t1
+        LEFT JOIN depot_qh.org_info t2 ON t1.org_id = t2.org_id
+        LEFT JOIN province_all.biz_unit_info t3 ON t2.unit_info_id = t3.id
+        left join province_all.dev_dict t4 on t3.zcdz_city=t4.id
+        <where>
+            t1.check_result='0'
+            <if test="cityName!=null and cityName!=''">
+                and t4.DICT_LABEL like concat("%",#{cityName},"%")
+            </if>
+        </where>
+
+    </select>
     <select id="selectCitys"
             resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityCityPageVO">
 
@@ -149,21 +207,21 @@
     <select id="selectNoAndPass"
             resultType="com.unis.mobileInfo.modular.qcqualityinspection.vo.ReserveQualityOrgPageVO">
         SELECT
-            COUNT(CASE WHEN t1.check_result = '1' THEN 1 END) AS passNum,
-            COUNT(CASE WHEN t1.check_result = '0' THEN 1 END) AS noPassNum,
-            t1.org_id,
-            t2.org_name
+        COUNT(CASE WHEN t1.check_result = '1' THEN 1 END) AS passNum,
+        COUNT(CASE WHEN t1.check_result = '0' THEN 1 END) AS noPassNum,
+        t1.org_id,
+        t2.org_name
         FROM
-            depot_qh.business_qc_quality_inspection t1
-                LEFT JOIN depot_qh.org_info t2 ON t1.org_id = t2.org_id
+        depot_qh.business_qc_quality_inspection t1
+        LEFT JOIN depot_qh.org_info t2 ON t1.org_id = t2.org_id
         <where>
             <if test="orgName!=null and orgName!=''">
                 and t2.org_name like concat("%",#{orgName},"%")
             </if>
         </where>
         GROUP BY
-            t1.org_id,
-            t2.org_name;
+        t1.org_id,
+        t2.org_name;
     </select>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -172,5 +230,4 @@
         from business_qc_quality_inspection
         where id = #{id,jdbcType=INTEGER}
     </select>
-
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/service/impl/BusinessQcQualityInspectionServiceImpl.java

@@ -198,7 +198,6 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
 
             if (StringUtils.isNotEmpty(pageParam.getCityName())) {
                 //进行条件查询
-<<<<<<< HEAD
                 //收集合格总数
                 ReserveQualityCityPageVO passVo = businessQcQualityInspectionMapper.selectCityPassByCityName(pageParam.getCityName());
                 //不收集
@@ -211,10 +210,6 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
                     passVo.setNoPassNum(noPassVo.getNoPassNum());
                     list.add(passVo);
                 }
-=======
-                List<ReserveQualityCityPageVO> voList = businessQcQualityInspectionMapper.selectCitys(pageParam.getCityName());
-                list.addAll(voList);
->>>>>>> dev
 
             } else {
                 //非条件查询
@@ -267,10 +262,13 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
         if (CollectionUtil.isNotEmpty(businessQcQualityInspections)) {
             //条件查询
             if (StringUtils.isNotEmpty(pageParam.getOrgName())) {
+                //不合格
+                ReserveQualityOrgPageVO noPassVo = businessQcQualityInspectionMapper.selectNo(pageParam.getOrgName());
+                //合格
+                ReserveQualityOrgPageVO passVo = businessQcQualityInspectionMapper.selectPass(pageParam.getOrgName());
+                passVo.setNoPassNum(noPassVo.getNoPassNum());
 
-                List<ReserveQualityOrgPageVO> voList = businessQcQualityInspectionMapper.selectNoAndPass(pageParam.getOrgName());
-                list.addAll(voList);
-
+                list.add(passVo);
             } else {
 
                 //不带条件查询