fix

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

@@ -57,16 +57,28 @@
         </where>
     </select>
     <select id="countByServiceUnitDetail" resultType="java.util.Map">
+<!--        SELECT-->
+<!--        s.`name` NAME,sum( l.devices ) devices ,sum(case when d.bound='OUT' then 1 else 0 end ) OUTS-->
+<!--        FROM-->
+<!--        t_b_service s-->
+<!--        LEFT JOIN t_b_crm c ON c.service_id = s.id-->
+<!--        LEFT JOIN sys_custom cu ON cu.id = c.custom_id-->
+<!--        LEFT JOIN sys_level l ON l.id = cu.level_id-->
+
+<!--        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-->
         SELECT
-        s.`name` NAME,sum( l.devices ) devices ,sum(case when d.bound='OUT' then 1 else 0 end ) OUTS
+        s.`name` NAME,
+        sum( l.devices ) devices,
+        sum( CASE WHEN d.bound = 'OUT' THEN 1 ELSE 0 END ) OUTS
         FROM
         t_b_service s
-        LEFT JOIN t_b_crm c ON c.service_id = s.id
+        left join t_b_service_scope ss on ss.service_id=s.id
+        LEFT JOIN t_b_crm c ON c.crm_no = ss.crm_no
         LEFT JOIN sys_custom cu ON cu.id = c.custom_id
         LEFT JOIN sys_level l ON l.id = cu.level_id
-
-        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
+        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">

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

@@ -31,13 +31,14 @@
         t_b_quality_problem_apply a
         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 sys_user u ON u.id = sd.region_user_id
+        left join t_b_crm c on c.crm_no=si.crm_no
+        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 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
         <where>
-            and a.type != 'NO_PROBLEM' AND fa.STATUS = 'FINISH'
+            and a.type != 'NO_PROBLEM' 
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and a.service_id = #{serviceUnitId}
             </if>
@@ -59,14 +60,15 @@
         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 sys_user u ON u.id = sd.region_user_id
+        left join t_b_crm c on c.crm_no=si.crm_no
+        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 s ON s.id = us.supplier_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
         <where>
-            and a.type != 'NO_PROBLEM' AND fa.STATUS = 'FINISH'
+            and a.type != 'NO_PROBLEM'
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and a.service_id = #{serviceUnitId}
             </if>
@@ -102,7 +104,8 @@
         t_b_quality_problem_apply a
         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 sys_user u ON u.id = sd.region_user_id
+        left join t_b_crm c on c.crm_no=si.crm_no
+        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 t_f_custom_flow_entity fe ON 	fe.`code`= a.problem_no
@@ -132,7 +135,7 @@
     <select id="influenceDetail" resultType="com.qmth.sop.business.bean.result.TBQualityProblemApplyResult">
         <include refid="query" />
         <where>
-            AND fa.STATUS = 'FINISH'
+
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and a.service_id = #{serviceUnitId}
             </if>
@@ -184,12 +187,13 @@
         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 sys_user u ON u.id = sd.region_user_id
+        left join t_b_crm c on c.crm_no=si.crm_no
+        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
         <where>
-            AND fa.STATUS = 'FINISH'
+
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and a.service_id = #{serviceUnitId}
             </if>

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

@@ -19,10 +19,11 @@
         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 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_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 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
@@ -38,7 +39,7 @@
     </select>
 
     <select id="detail" resultType="java.util.Map">
-        select distinct cast(tbsi.id as char) as id,
+        select DISTINCT cast(tbsi.id as char) as id,
         cast(tbs.id as char) as serviceId,
         tbs.name as serviceName,
         tbsi.sop_no as sopNo,
@@ -85,7 +86,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 sd ON sd.sop_info_id = tbsi.id
-        LEFT JOIN sys_user u ON u.id = sd.region_user_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
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
         <where>