Browse Source

工时异常明细 增加考勤同步按钮

Min 11 months ago
parent
commit
68d04733f8

+ 5 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -408,14 +408,17 @@ public class UserWithBeisenController {
 
 
     @RequestMapping("/getAttendanceStatisticWithUser")
-    public HttpRespMsg getAttendanceStatisticWithUser(String createDate){
+    public HttpRespMsg getAttendanceStatisticWithUser(String userId,String createDate){
         HttpRespMsg msg=new HttpRespMsg();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter df1=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter df2=DateTimeFormatter.ofPattern("HH:mm");
         DateTimeFormatter df3=DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         DateTimeFormatter df4=DateTimeFormatter.ofPattern("HH:mm:ss");
-        User user = userMapper.selectById(request.getHeader("token"));
+        if(StringUtils.isEmpty(userId)){
+            userId=request.getHeader("token");
+        }
+        User user = userMapper.selectById(userId);
         Integer companyId = user.getCompanyId();
         TimeType timeType = timeTypeMapper.selectById(companyId);
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));

+ 23 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1787,6 +1787,7 @@
             <el-table-column width="160" type="index" fixed="left" :label="'考勤工时'">
               <template slot-scope="scope">
                 {{ scope.row.cardTime}}
+                <i class="el-icon-refresh" @click="restUserCardTime(scope.row)"></i>
               </template>
             </el-table-column>
 
@@ -5892,6 +5893,28 @@
                     });
                 });
             },
+            restUserCardTime(item){
+                let param={}
+                param.userId=item.userId
+                param.createDate=item.createDate
+                this.http.post('/user-with-beisen/getAttendanceStatisticWithUser', param,
+                res => {
+                    if (res.code == "ok") {
+                        this.showMonthWorkTimeReminder()
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             importReportLog(item){
                 //首先判断文件类型
                 let str = item.file.name.split(".");