no message

mall-miniapp-service/src/main/resources/mapper/DailyReportMapper.xml

@@ -44,7 +44,7 @@
         select
           c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,a.status 'issueStatus'
         from settle_daily_issue_summary_record a
-        join user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        join user aa on a.service_number = aa.worker_number
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
 
@@ -72,7 +72,7 @@
         select
         c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,a.status 'issueStatus'
         from settle_daily_issue_summary_record a
-        join user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        join user aa on a.service_number = aa.worker_number
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
 
@@ -99,7 +99,7 @@
         select
             c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,if(a.status = 2,2,1) 'issueStatus'
         from settle_daily_issue_summary_record a
-        join user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        join user aa on a.service_number = aa.worker_number
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
        <where>
@@ -139,7 +139,7 @@
             1 'issueStatus'
         from
             settle_daily_import_summary_item c
-        join user aa on c.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        join user aa on c.worker_number = aa.worker_number
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         where
             c.summary_status != 1

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -105,7 +105,6 @@
            </foreach>
        </if>
        -->
-        and a.apply_type='WORKER'
         <if test="isOK != null and isOK == true">
             AND a.worker_number IS NOT NULL
         </if>
@@ -120,7 +119,6 @@
         ${ex.selected}
         from user a
         ${ex.query}
-        and a.apply_type='SERVICE'
         ORDER BY FIELD(a.examine_status,'WAIT','OK','FAIL'),a.create_time DESC
     </select>
 
@@ -970,7 +968,7 @@
             ${ex.selected}
         FROM
             settle_daily_remaine_buckle a
-            JOIN user aa on a.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
+            JOIN user aa on a.worker_number = aa.worker_number
             JOIN settle_daily_bank_account b ON aa.id_card = b.idcard
         ${ex.query}
         GROUP BY a.company_wechat_id, a.idcard
@@ -1006,7 +1004,7 @@
         FROM
             settle_daily_import_summary_item  a
             LEFT JOIN settle_daily_reduce_cost sdrc  on a.dispatch_order_no = sdrc.dispatch_order_no
-            LEFT JOIN user aa on a.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
+            LEFT JOIN user aa on a.worker_number = aa.worker_number
             LEFT JOIN settle_daily_bank_account b ON aa.id_card = b.idcard
             LEFT JOIN settle_daily_issue_summary_record c ON c.id  = a.issue_salary_id
         ${ex.query}

mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -15,7 +15,6 @@
                 WHERE
                     u.company_wechat_id = wb.company_wechat_id
                     AND u.user_id = wb.user_id
-                    AND u.apply_type = 'WORKER'
                     AND wb.examine_status = 'OK'
                 ) a
             JOIN
@@ -41,7 +40,6 @@
                 WHERE
                     u.company_wechat_id = wb.company_wechat_id
                   AND u.user_id = wb.user_id
-                  AND u.apply_type = 'WORKER'
                   AND wb.examine_status = 'OK'
             ) a
             JOIN settle_daily_import_summary_item c
@@ -128,7 +126,7 @@
     <select id="queryIssueSalaryMonthBankCardInfo"
             resultType="com.gree.mall.manager.bean.settle.repair.DailyWokerBankCardMonthBean">
         SELECT * FROM settle_daily_issue_summary_month_record a
-        JOIN user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        JOIN user aa on a.service_number = aa.worker_number
         JOIN settle_daily_bank_account b ON aa.id_card = b.idcard
         WHERE
         a.company_wechat_id = #{companyWechatId}
@@ -146,7 +144,7 @@
 
     <select id="queryIssueSalaryAndBankCardInfo" resultType="com.gree.mall.manager.bean.settle.repair.DailyWorkerBankCardBean">
         select  a.*,b.* from  settle_daily_issue_summary_record a
-        JOIN user aa on a.service_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        JOIN user aa on a.service_number = aa.worker_number
         join settle_daily_bank_account b  on  aa.id_card = b.idcard
         where
             a.company_wechat_id = #{companyWechatId}
@@ -265,7 +263,7 @@
         select
         a.*,b.bank_account ,b.bank_account_name,deposit_bank,c.issue_time ,c.issue_by,c.status as issueStatus
         from settle_daily_import_summary_item a
-        left JOIN user aa on a.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        left JOIN user aa on a.worker_number = aa.worker_number
         left join settle_daily_bank_account b on aa.id_card = b.idcard AND a.websit_number = b.websit_id
         left join settle_daily_issue_summary_record c  on c.id  = a.issue_salary_id
 
@@ -453,7 +451,7 @@
         settle_daily_import_summary_item a
         left join
         settle_daily_issue_summary_record b on a.issue_salary_id =b.id
-        left join user aa on a.worker_number = aa.worker_number AND aa.apply_type = 'WORKER'
+        left join user aa on a.worker_number = aa.worker_number
         left join settle_daily_bank_account c  on  aa.id_card = c.idcard
         <where>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">