Merge remote-tracking branch 'origin/master'

attendance-performance-manager/pom.xml

@@ -360,7 +360,7 @@
 				</executions>
 			</plugin>
 
-			<plugin>
+		<!--	<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.6.0</version>
@@ -400,7 +400,7 @@
 					</execution>
 
 				</executions>
-			</plugin>
+			</plugin>-->
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -421,7 +421,7 @@
 							<outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
 						</configuration>
 					</execution>
-					<execution>
+					<!--<execution>
 						<id>make-assembly-ui</id>
 						<phase>package</phase>
 						<goals>
@@ -436,7 +436,7 @@
 							</descriptors>
 							<outputDirectory>${project.parent.basedir}/dist/${project.artifactId}</outputDirectory>
 						</configuration>
-					</execution>
+					</execution>-->
 				</executions>
 			</plugin>
 		</plugins>

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventWeekTaskImpl.java

@@ -51,7 +51,7 @@ public class SyncDoorsEventWeekTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         //同步本周所以人的门禁事件
         log.info("同步本周所有的门禁事");
-        DateTime weekStart = DateUtil.offsetDay(new Date(), -7);
+        DateTime weekStart = DateUtil.offsetDay(new Date(), -10);
         AttendanceRecordHikQuery hikEntity = new AttendanceRecordHikQuery();
         hikEntity.setAttendanceDateStart(DateUtil.format(weekStart, "yyyy-MM-dd"));
         hikEntity.setAttendanceDateEnd(DateUtil.today());

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -69,8 +69,8 @@ POST {{baseUrl}}/attendance/record/hik/addAttendanceHikRecordCustom
 Content-Type: application/json
 
 {
-  "attendanceDateStart": "2024-02-01",
-  "attendanceDateEnd": "2024-03-13"
+  "attendanceDateStart": "2024-03-22",
+  "attendanceDateEnd": "2024-03-22"
 }