项目进度监控供应商报表修改

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

@@ -1,41 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.sop.business.mapper.SopScheduleMapper">
+
     <select id="progress" resultType="java.util.Map">
-        SELECT DISTINCT
-        cast(r.id as char) as region_id,
+        SELECT
+        DISTINCT cast(r.id as char) as region_id,
         r.region_name,
-        cast(su.id as char) as  supplier_id,
+        cast(su.id as char) as supplier_id,
         su.`name`,
         tbsi.sop_no,
         tffa.status,
         tffa.setup
-<!--        CASE-->
-
-<!--        WHEN tffa.STATUS = 'FINISH' THEN-->
-<!--        '已完结'-->
-<!--        WHEN tffa.STATUS = 'END' THEN-->
-<!--        '已作废' ELSE '进行中'-->
-<!--        END AS statusStr-->
-        FROM
-        t_b_sop_info tbsi
-
-        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
+        FROM t_b_sop_info tbsi
         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
-        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 sys_custom sc ON sc.id = tbsi.custom_id
+        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
-        <where>
-            and tffa.status != 'END'
+        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}
             </if>
-
         </where>
     </select>
 
@@ -74,23 +64,23 @@
         cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
         IFNULL(art.NAME_,'--') as taskName,
         art.TASK_DEF_KEY_ as taskDefKey
-        from t_b_sop_info tbsi
-        left join t_b_crm tbc on tbc.crm_no = tbsi.crm_no
-        left join t_b_service tbs on tbs.id = tbsi.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
-        left join t_f_custom_flow_entity tfcfe on tfcfe.code = tbsi.sop_no
-        left join sys_user su2 on su2.id = tfcfe.create_id
-        left join t_f_flow_approve tffa on tffa.flow_id = tfcfe.flow_id
-        left join ACT_RU_TASK art on art.PROC_INST_ID_ = tffa.flow_id
-        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 sd ON sd.sop_info_id = tbsi.id-->
-        LEFT JOIN sys_user u ON u.id = tbc.region_coordinator_id
-        LEFT JOIN t_b_user_archives ua ON ua.mobile_number = u.mobile_number
+        FROM t_b_sop_info tbsi
+        LEFT JOIN t_b_service tbs ON tbs.id = tbsi.service_id
+        LEFT JOIN sys_custom sc ON sc.id = tbsi.custom_id
+        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_custom_flow tfcf ON tfcf.id = tfcfe.t_f_custom_flow_id
+        LEFT JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_id
+        LEFT JOIN ACT_RU_TASK art ON art.PROC_INST_ID_ = tffa.flow_id
+        LEFT JOIN act_ru_identitylink ari ON ari.TASK_ID_ = art.ID_
+        LEFT JOIN t_b_crm tbc ON tbc.crm_no = tbsi.crm_no
+        LEFT JOIN t_b_service_region r ON r.id = tbc.region_id
+        LEFT JOIN t_b_user_archives ua ON ua.id = tbuaa.archives_id
         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_product tbp ON tbp.id = tbc.product_id
+        LEFT JOIN sys_user su1 ON su1.id = tbc.crm_user_id
+        LEFT JOIN sys_user su2 ON su2.id = tfcfe.create_id
         <where>
             and tffa.status != 'END'
             <if test="serviceId != null and serviceId != ''">