服务单元分析报表修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/ServiceAnalyseServiceImpl.java

@@ -282,8 +282,8 @@ public class ServiceAnalyseServiceImpl extends ServiceImpl<ServiceAnalyseMapper,
         List<TBCrm> publishCrmList = tbCrmService.list(new QueryWrapper<TBCrm>()
                 .lambda()
                 .eq(TBCrm::getServiceId, serviceUnitId)
-                .eq(TBCrm::getEnable, true)
-                .eq(TBCrm::getStatus, CrmStatusEnum.PUBLISH));
+                .eq(TBCrm::getEnable, true));
+//                .eq(TBCrm::getStatus, CrmStatusEnum.PUBLISH));
 
         Set<Long> regionIdSet = publishCrmList.stream()
                 .filter(e -> e.getRegionId() != null && e.getRegionId() > 0)

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

@@ -63,13 +63,11 @@
         CONCAT( su.id, '' ) id,
         su.`name`,
         count( DISTINCT c.id ) count
-        FROM
-        t_b_service s
+        FROM t_b_service s
         LEFT JOIN t_b_crm c ON s.id = c.service_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
-        LEFT JOIN sys_supplier su ON su.id = us.supplier_id
+        LEFT JOIN t_b_user_archives_allocation tbuaa on tbuaa.crm_no = c.crm_no
+        LEFT JOIN t_b_user_archives_supplier tbuas on tbuas.user_archives_id = tbuaa.archives_id
+        LEFT JOIN sys_supplier su on su.id = tbuas.supplier_id
         <where>
                     and su.id IS NOT NULL
                     <if test="serviceUnitId != null and serviceUnitId != ''">
@@ -82,7 +80,7 @@
     </select>
     <select id="crmDetail" resultType="com.qmth.sop.business.bean.result.TBCrmResult">
         SELECT
-        a.*,
+        distinct a.*,
         tbs.name service,
         cru.real_name crm_user_name,
         sc.NAME custom,
@@ -101,22 +99,19 @@
         LEFT JOIN t_b_product p ON p.id = a.product_id
         LEFT JOIN t_b_service tbs ON a.service_id = tbs.id
         LEFT JOIN sys_custom sc ON sc.id = a.custom_id
-
-
         LEFT JOIN sys_user u ON u.id = a.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
-        LEFT JOIN sys_supplier su ON su.id = us.supplier_id
+        left join t_b_user_archives_allocation tbuaa on tbuaa.crm_no = a.crm_no
+        LEFT JOIN t_b_user_archives ua ON ua.id = tbuaa.archives_id
+        LEFT JOIN t_b_user_archives_supplier tbuas on tbuas.user_archives_id = ua.id
+        LEFT JOIN sys_supplier su on su.id = tbuas.supplier_id
         <where>
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and a.service_id = #{serviceUnitId}
             </if>
-
             <if test="supplierId != null and supplierId != ''">
                 and su.id = #{supplierId}
             </if>
         </where>
-
         ORDER BY
         a.create_time DESC
     </select>

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

@@ -17,11 +17,11 @@
         LEFT JOIN t_b_user_archives_allocation tbuaa on tbuaa.crm_no = tbsi.crm_no
         LEFT JOIN t_f_custom_flow_entity tfcfe ON tfcfe.CODE = tbsi.sop_no
         LEFT JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_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_user_archives ua ON ua.id =  tbuaa.archives_id
-        LEFT JOIN  t_b_user_archives_supplier tbuas on tbuas.user_archives_id = ua.id
-        LEFT JOIN  sys_supplier su on su.id = tbuas.supplier_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_user_archives ua ON ua.id = tbuaa.archives_id
+        LEFT JOIN t_b_user_archives_supplier tbuas on tbuas.user_archives_id = ua.id
+        LEFT JOIN sys_supplier su on su.id = tbuas.supplier_id
         <where> 1 = 1 and tffa.status != 'END'
             <if test="serviceId != null and serviceId != ''">
                 and tbsi.service_id= #{serviceId}