Browse Source

调整考勤导入,无匹配缺卡不再限制导入。

anderx 1 year ago
parent
commit
fd568b4d48

+ 1 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -355,8 +355,7 @@ public class SysUserController extends BaseController
     public AjaxResult userRecordMerge() {
         AjaxResult result=userService.userRecordMergeCheck();
         if (result.isError())return result;
-        userService.userRecordMerge();
-        return result;
+        return userService.userRecordMerge();
     }
 
 

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -233,7 +233,7 @@ public interface ISysUserService
 
     void updateUserRecord(UserRecord in);
 
-    void userRecordMerge();
+    AjaxResult userRecordMerge();
 
     AjaxResult  userRecordMergeCheck();
 

+ 1 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectStaffRecordMapper.xml

@@ -300,7 +300,7 @@
 
     <select id="selectByDDUidAndTime" resultType="com.ruoyi.project.domain.ProjectStaffRecordOut">
         select
-            b.id,b.duration,b.aid,b.pid,c.name projectName,
+            b.id,b.duration,b.aid,b.pid,c.name projectName,b.check_duration checkDuration,
             date_format(b.record_time,'%Y-%m-%d')recordTime
         from sys_user a left join  project_staff_record b on a.user_id=b.aid
         left join project_task c on b.pid=c.id