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

sop-business/src/main/resources/db/log/shudonghui_update_log.sql

@@ -426,4 +426,7 @@ INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (45, 2
 INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (46, 2024, 10, 4, 'LEGAL_HOLIDAYS');
 INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (47, 2024, 10, 5, 'LEGAL_HOLIDAYS');
 INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (48, 2024, 10, 7, 'LEGAL_HOLIDAYS');
-INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (49, 2024, 4, 28, 'WEEKDAY');
+INSERT INTO `sys_ding_date` (`id`, `year`, `month`, `day`, `type`) VALUES (49, 2024, 4, 28, 'WEEKDAY');
+
+--2023.11.14
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (1099, '二期接口', '/api/admin/tb/crm/analyse/project/count', 'URL', 64, 32, 'SYS', NULL, 1, 1, 0);

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

@@ -268,6 +268,10 @@
         (
         SELECT d.*,d.axis_in_x AS axis_x, d.axis_in_y AS axis_y,d.sign_in_address address, d.sign_in_time sign_time,'IN' AS type FROM t_b_ding d UNION ALL
         SELECT d.*,d.axis_out_x AS axis_x, d.axis_out_y AS axis_y,d.sign_out_address address, d.sign_out_time sign_time,'OUT' AS type FROM t_b_ding d
+        where
+        date_format(from_unixtime(d.create_time/1000),'%Y-%m-%d') != date_format(now(),'%Y-%m-%d') or
+        (d.sign_out_time is not null and
+        date_format(from_unixtime(d.create_time/1000),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d'))
         ) d
         LEFT JOIN t_b_user_archives ua ON ua.id = d.user_archives_id
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
@@ -276,7 +280,6 @@
         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 sys_supplier s ON s.id = us.supplier_id
-        where date_format(from_unixtime(d.create_time/1000),'%Y-%m-%d') != date_format(now(),'%Y-%m-%d')
         ) a
         <where>
             <if test="serviceId != null and serviceId != ''">