fix: 考勤提交服务单元状态限制

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

@@ -39,6 +39,7 @@
             LEFT JOIN sys_supplier s ON s.id = us.supplier_id
 
             <where>
+                AND bs.status = 'PUBLISH'
                 <if test="serviceId != null and serviceId != ''">
                     and d.service_id = #{serviceId}
                 </if>
@@ -106,7 +107,9 @@
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
         LEFT JOIN t_b_crm crm ON crm.crm_no = d.crm_no
         LEFT JOIN sys_custom c ON c.id = crm.custom_id
+        LEFT JOIN t_b_service bs ON bs.id = d.service_id
         <where>
+            AND bs.status = 'PUBLISH'
             <if test="serviceId != null and serviceId != ''">
                 and d.service_id = #{serviceId}
             </if>

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

@@ -40,6 +40,7 @@
                  tbc.lead_id AS regionManagerId,
                  tbc.region_coordinator_id AS coordinatorId,
                  tbs.update_time AS serviceUpdateTime,
+                 tbs.status AS serviceStatus,
                  tbc.update_time AS crmUpdateTime,
                  tbd.sign_in_exception_count + tbd.sign_out_exception_count AS dingExceptionCount
              FROM
@@ -91,6 +92,7 @@
                      LEFT JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_id
                      ) main
         <where>
+            AND main.serviceStatus = 'PUBLISH'
             <if test="serviceUnitId != null">
                 AND main.serviceUnitId = #{serviceUnitId}
             </if>
@@ -190,6 +192,7 @@
                  tbc.lead_id AS regionManagerId,
                  tbc.region_coordinator_id AS coordinatorId,
                  tbs.update_time AS serviceUpdateTime,
+                 tbs.status AS serviceStatus,
                  tbc.update_time AS crmUpdateTime,
                  tbd.sign_in_exception_count + tbd.sign_out_exception_count AS dingExceptionCount
              FROM
@@ -241,6 +244,7 @@
                      LEFT JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_id
                 ) main
         <where>
+            AND main.serviceStatus = 'PUBLISH'
             <if test="serviceUnitId != null">
                 AND main.serviceUnitId = #{serviceUnitId}
             </if>

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

@@ -77,7 +77,7 @@
                                 WHERE
                                     sr.type = 'ASSISTANT_ENGINEER'
                                 GROUP BY tbuaa.crm_no) assistantR ON assistantR.crm_no = tbc.crm_no
-            WHERE tbs.status != 'CANCEL') result
+            WHERE tbs.status = 'PUBLISH') result
         <where>
             <if test="serviceUnitId != null">
                 AND result.serviceUnitId = #{serviceUnitId}
@@ -190,7 +190,7 @@
                                 WHERE
                                     sr.type = 'ASSISTANT_ENGINEER'
                                 GROUP BY tbuaa.crm_no) assistantR ON assistantR.crm_no = tbc.crm_no
-             WHERE tbs.status != 'CANCEL') result
+             WHERE tbs.status = 'PUBLISH') result
         <where>
             <if test="serviceUnitId != null">
                 AND result.serviceUnitId = #{serviceUnitId}