Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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

@@ -8,6 +8,7 @@
         count( 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
         <where>
@@ -70,7 +71,7 @@
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
         LEFT JOIN sys_supplier su ON su.id = us.supplier_id
         <where>
-            and c.region_coordinator_id IS NOT NULL
+            and r.lead_id IS NOT NULL
             <!--            <if test="year != null and year != ''">-->
             <!--                and YEAR ( FROM_UNIXTIME( s.start_time / 1000 ))=  #{year}-->
             <!--            </if>-->
@@ -153,7 +154,7 @@
 
 
     <select id="crmDetail" resultType="com.qmth.sop.business.bean.result.TBCrmResult">
-        SELECT
+        SELECT DISTINCT
         a.*,
         tbs.name service,
         cru.real_name crm_user_name,

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

@@ -104,6 +104,7 @@
         left join ACT_RU_TASK art on art.PROC_INST_ID_ = fa.flow_id
         left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
         left join t_b_crm tbc on tbc.crm_no = fe.crm_no
+        LEFT JOIN sys_custom sc ON sc.id = tbc.custom_id
         left join t_b_service tbs on tbs.id = tbc.service_id
 
     </sql>

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

@@ -75,7 +75,7 @@
         t_b_service s
         LEFT JOIN t_b_crm c ON c.service_id = s.id
         <where>
-            and c.region_coordinator_id is not null
+            and c.lead_id is not null
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and s.id = #{serviceUnitId}
             </if>
@@ -89,12 +89,12 @@
         count(DISTINCT c.id ) count
         FROM
         t_b_user_archives_allocation aa
-        LEFT JOIN t_b_service s ON aa.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 aa.service_id=r.service_id
+        LEFT JOIN t_b_crm c ON aa.service_id = c.service_id
         LEFT JOIN sys_user u ON u.id = r.lead_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
-        LEFT JOIN sys_supplier su ON su.id = uas.supplier_id
+        LEFT JOIN sys_supplier su ON su.id = us.supplier_id
                 <where>
 
                     <if test="serviceUnitId != null and serviceUnitId != ''">
@@ -175,7 +175,7 @@
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
         LEFT JOIN sys_supplier su ON su.id = us.supplier_id
         <where>
-            and rd.id IS NOT NULL
+            and r.id IS NOT NULL
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and c.service_id = #{serviceUnitId}
             </if>

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

@@ -84,7 +84,7 @@
         left join act_ru_identitylink ari on ari.TASK_ID_ = art.ID_
         left join t_f_custom_flow tfcf on tfcf.id = tfcfe.t_f_custom_flow_id
         LEFT JOIN t_b_sop_info_detail id ON id.sop_info_id = tbsi.id
-        LEFT JOIN sys_user u ON u.id = id.lead_id
+        LEFT JOIN sys_user u ON u.id = r.lead_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
         <where>