Browse Source

修改新增打卡和修改打卡接口,同步初始打卡信息

anderx 1 year ago
parent
commit
8350f5c9e9

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRecordMapper.java

@@ -36,4 +36,8 @@ public interface UserRecordMapper {
     int checkUserRecord(UserRecord u);
 
     int checkClockUserRecord(UserRecord u);
+
+    void userRecordMerge(Long userId);
+
+    void deleteByUserId(Long userId);
 }

+ 4 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -909,9 +909,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public void userRecordMerge() {
         Long userId = SecurityUtils.getUserId();
-        UserRecord u=new UserRecord();
-        u.setCreateId(userId);
-
+        //合并到打卡表
+        userRecordMapper.userRecordMerge(userId);
+        //清楚考勤合并数据
+        userRecordMapper.deleteByUserId(userId);
     }
 
     @Override

+ 10 - 0
ruoyi-system/src/main/resources/mapper/UserRecordMapper.xml

@@ -39,6 +39,7 @@
         delete from user_record
         where  id = #{id,jdbcType=BIGINT} 
     </delete>
+
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.ruoyi.system.domain.UserRecord" useGeneratedKeys="true">
         insert into user_record
         ( id,dd_user_id,psr_id
@@ -209,4 +210,13 @@
             and status = 0
         </if>
     </update>
+    <update id="userRecordMerge">
+        update user_record a left join project_staff_record b on a.psr_id =b.id
+        set b.check_duration =a.check_duration
+        where a.create_id = #{userId}
+    </update>
+    <delete id="deleteByUserId">
+        delete from user_record
+        where create_id = #{userId}
+    </delete>
 </mapper>