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

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

@@ -104,7 +104,7 @@
         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 sys_user u ON u.id = r.lead_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
@@ -220,6 +220,7 @@
         su.name supplier
         from t_b_service tbs
         LEFT JOIN  t_b_crm a ON a.service_id = tbs.id
+        left join t_b_service_region r on r.service_id=tbs.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

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

@@ -47,6 +47,7 @@
         left join t_b_device_in_out io on io.service_id=s.id
         left join sys_device d on d.device_code=io.device_no
         <where>
+            and s.status !='FINISH'
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <if test="dpr.hasBusiness">
                     AND s.service_lead_id = #{dpr.requestUserId}
@@ -67,6 +68,7 @@
         left join t_b_device_in_out io on io.service_id=s.id
         left join sys_device d on d.device_code=io.device_no
         <where>
+            and s.status !='FINISH'
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <if test="dpr.hasBusiness">
                     AND s.service_lead_id = #{dpr.requestUserId}

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

@@ -30,9 +30,8 @@
         FROM
         t_b_quality_problem_apply a
         LEFT JOIN t_b_sop_info si ON si.sop_no = a.sop_no
-        LEFT JOIN t_b_service s ON a.service_id = s.id
-        left join t_b_service_region r on r.service_id=s.id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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 t_f_custom_flow_entity fe ON fe.`code` = a.problem_no
@@ -57,9 +56,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_service_region r ON r.service_id = a.service_id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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 s ON s.id = us.supplier_id
@@ -101,9 +101,8 @@
         FROM
         t_b_quality_problem_apply a
         LEFT JOIN t_b_sop_info si on si.sop_no = a.sop_no
-        LEFT JOIN t_b_service s ON a.service_id = s.id
-        left join t_b_service_region r on r.service_id=s.id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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 t_f_custom_flow_entity fe ON 	fe.`code`= a.problem_no
@@ -180,13 +179,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_b_service s ON a.service_id = s.id
-        left join t_b_service_region r on r.service_id=s.id
         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 sys_user u ON find_in_set( u.id, a.user_ids )-->
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = si.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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

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

@@ -95,7 +95,7 @@
         t_b_user_archives_allocation aa
         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 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
@@ -129,11 +129,10 @@
         LEFT JOIN sys_user cu ON cu.id = a.create_id
         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 t_b_service_region r on r.service_id=tbs.id
         LEFT JOIN sys_custom sc ON sc.id = a.custom_id
 
 
-        LEFT JOIN sys_user u ON u.id = r.lead_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
@@ -174,7 +173,7 @@
         FROM
         t_b_crm c
         LEFT JOIN t_b_service_region r ON c.service_id = r.service_id
-        LEFT JOIN sys_user u ON u.id = r.lead_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
@@ -231,7 +230,7 @@
 
         LEFT JOIN t_b_service tbs ON tbc.service_id = tbs.id
         LEFT JOIN t_b_service_region r ON tbc.service_id = r.service_id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN sys_user u ON u.id = tbc.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_custom su ON tbc.custom_id = su.id
@@ -308,9 +307,9 @@
         FROM
         t_b_user_archives_allocation aa
         LEFT JOIN t_b_service_region r ON aa.service_id = r.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_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 = aa.archives_id
         LEFT JOIN sys_supplier su ON su.id = us.supplier_id
         <where>
             <if test="serviceUnitId != null and serviceUnitId != ''">

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

@@ -45,8 +45,8 @@
         left join t_b_service_region r on r.service_id=s.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 id on id.sop_info_id=s.id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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
@@ -92,10 +92,9 @@
         count( DISTINCT d.id )+ count( DISTINCT v.id ) count
         FROM
         t_b_sop_info s
-        LEFT JOIN t_b_sop_info_detail id ON id.sop_info_id = s.id
         left join t_b_crm c on c.crm_no=s.crm_no
-        left join t_b_service_region r on s.service_id=s.id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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
@@ -130,8 +129,8 @@
         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 s.service_id=s.id
-        left join t_b_sop_info_detail id on id.sop_info_id=s.id
-        LEFT JOIN sys_user u ON u.id = id.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = s.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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

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

@@ -19,10 +19,10 @@
         END AS statusStr
         FROM
         t_b_sop_info tbsi
+        left join t_b_service_region r on tbsi.service_id=tbsi.service_id
         LEFT JOIN sys_custom sc ON sc.id = tbsi.custom_id
-        LEFT JOIN t_b_sop_info_detail id ON id.sop_info_id = tbsi.id
-        left join t_b_service_region r on tbsi.service_id=r.service_id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = tbsi.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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
@@ -84,8 +84,8 @@
         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 id ON id.sop_info_id = tbsi.id
-        LEFT JOIN sys_user u ON u.id = r.lead_id
+        LEFT JOIN t_b_sop_info_detail sd ON sd.sop_info_id = tbsi.id
+        LEFT JOIN sys_user u ON u.id = sd.region_user_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>