fix

sop-business/src/main/resources/mapper/CrmAnalyseMapper.xml

@@ -5,16 +5,15 @@
 
         SELECT
         <!--        r.id,-->
-        cu.province name,
+        rd.province name,
         count(DISTINCT c.id ) count
         FROM
         t_b_crm c
         LEFT JOIN sys_custom cu ON cu.id = c.custom_id
         LEFT JOIN t_b_service s ON c.service_id = s.id
-        left join t_b_service_region r on r.service_id=s.id
-        left join t_b_service_region_detail rd on rd.service_region_id=r.id
+        left join t_b_service_region_detail rd on rd.id=c.region_detail_id
         <where>
-            and s.`status` IN ( 'PUBLISH', 'FINISH' ) and c.status!='FINISH'
+            and s.`status` IN ( 'PUBLISH', 'FINISH' ) and c.status!='FINISH' AND c.region_detail_id IS NOT NULL
             <if test="type != null and type != ''">
                 and cu.type = #{type}
             </if>
@@ -35,7 +34,7 @@
         </where>
         GROUP BY
         <!--        r.id,-->
-        cu.province
+        rd.province
         order by count(DISTINCT c.id ) desc
     </select>
     <select id="project" resultType="java.util.Map">
@@ -83,7 +82,7 @@
         FROM
         t_b_crm c
         LEFT JOIN t_b_service s ON c.service_id = s.id
-        left join t_b_service_region r on r.service_id=s.id
+        left join t_b_service_region r on r.id=c.region_id
         LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
@@ -200,8 +199,8 @@
         su.name supplier
         from t_b_crm a
         LEFT JOIN t_b_service tbs ON a.service_id = tbs.id
-        left join t_b_service_region r on r.service_id=tbs.id
-        left join t_b_service_region_detail rd on rd.service_region_id=r.id
+        left join t_b_service_region r on r.id=a.region_id
+        left join t_b_service_region_detail rd on rd.id=a.region_detail_id
         LEFT JOIN t_b_product p ON p.id = a.product_id
         LEFT JOIN sys_custom sc ON sc.id = a.custom_id
         LEFT JOIN sys_user u ON u.id = a.region_coordinator_id
@@ -223,7 +222,7 @@
             <if test="province != null and province != ''">
 <!--                and r.id is not null-->
                 and a.status!='FINISH'
-                and sc.province = #{province}
+                and rd.province = #{province}
             </if>
             <if test="type != null and type != ''">
                 and sc.type = #{type}

sop-business/src/main/resources/mapper/QualityAnalyseMapper.xml

@@ -57,10 +57,10 @@
         count( a.id ) count
         FROM
         t_b_quality_problem_apply a
-        left join t_b_service_region r on r.service_id=a.service_id
         LEFT JOIN t_b_sop_info si ON si.sop_no = a.sop_no
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
         left join t_b_crm c on c.crm_no=si.crm_no
+        left join t_b_service_region r on r.id=c.region_id
         LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
@@ -182,12 +182,12 @@
         a.reason
         FROM
         t_b_quality_problem_apply a
-        left join t_b_service_region r on r.service_id=a.service_id
         LEFT JOIN t_b_sop_info si ON si.sop_no = a.sop_no
         LEFT JOIN t_f_custom_flow_entity fe ON fe.`code` = a.problem_no
         LEFT JOIN t_f_flow_approve fa ON fa.flow_id = fe.flow_id
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
         left join t_b_crm c on c.crm_no=si.crm_no
+        left join t_b_service_region r on r.id=c.region_id
         LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id

sop-business/src/main/resources/mapper/ServiceAnalyseMapper.xml

@@ -187,7 +187,7 @@
         r.region_name
         FROM
         t_b_crm c
-        LEFT JOIN t_b_service_region r ON c.service_id = r.service_id
+        left join t_b_service_region r on r.id=c.region_id
 <!--        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id-->
 <!--        LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number-->
 <!--        LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id-->

sop-business/src/main/resources/mapper/SopAnalyseMapper.xml

@@ -42,7 +42,7 @@
         FROM
         t_b_sop_info s
         left join t_b_crm c on c.crm_no=s.crm_no
-        left join t_b_service_region r on r.service_id=c.service_id
+        left join t_b_service_region r on r.id=c.region_id
         LEFT join t_f_custom_flow_entity tfcfe on tfcfe.code = s.sop_no
         LEFT join t_f_flow_approve tffa on tffa.flow_id = tfcfe.flow_id
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
@@ -128,7 +128,7 @@
         FROM
         t_b_sop_info s
         left join t_b_crm c on c.crm_no=s.crm_no
-        left join t_b_service_region r on r.service_id=c.service_id
+        left join t_b_service_region r on r.id=c.region_id
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
         LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number

sop-business/src/main/resources/mapper/SopScheduleMapper.xml

@@ -19,9 +19,10 @@
 <!--        END AS statusStr-->
         FROM
         t_b_sop_info tbsi
-        left join t_b_service_region r on r.service_id=tbsi.service_id
+
         LEFT JOIN sys_custom sc ON sc.id = tbsi.custom_id
         left join t_b_crm c on c.crm_no=tbsi.crm_no
+        left join t_b_service_region r on r.id=c.region_id
         LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = tbsi.id
         LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
@@ -76,7 +77,7 @@
         from t_b_crm tbc
         left join t_b_sop_info tbsi on tbc.crm_no = tbsi.crm_no
         left join t_b_service tbs on tbs.id = tbc.service_id
-        left join t_b_service_region r on tbc.service_id=r.service_id
+        left join t_b_service_region r on r.id=tbc.region_id
         left join sys_custom sc on sc.id = tbc.custom_id
         left join sys_user su1 on su1.id = tbc.crm_user_id
         left join t_b_product tbp on tbp.id = tbc.product_id