From b6bc16582ff77b47ba789e73993540306e7a26d6 Mon Sep 17 00:00:00 2001
From: gzw <1571020389@qq.com>
Date: Sat, 6 May 2023 02:46:23 +0800
Subject: [PATCH] attendance

---
 .../controller/AttendanceController.java      | 15 ++++----
 .../service/impl/AttendanceServiceImpl.java   |  5 +--
 ui/src/assets/css/attendance.css              |  5 ---
 ui/src/pages/attendance/AttendanceHome.vue    | 31 ++++++++--------
 ui/src/pages/attendance/UserAttendance.vue    | 33 ++++++-----------
 ui/src/router/index.ts                        | 36 ++++++++++++++++++-
 6 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
index ad70962..50529f8 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
@@ -1,12 +1,10 @@
 package com.cfive.pinnacle.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cfive.pinnacle.entity.Attendance;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
 import com.cfive.pinnacle.service.IAttendanceService;
+import com.cfive.pinnacle.utils.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,14 +42,17 @@ public class AttendanceController {
     }
     //用户个人模糊时间查询
     @GetMapping("/findOneAttendanceByTime")
-    public ResponseResult findOneAttendanceAndUser(String startTime,String endTime,Long userId) {
+    public ResponseResult findOneAttendanceAndUser(String startTime,String endTime) {
+        Long userId = WebUtil.getLoginUser().getUser().getId();
         List<Attendance> attendances = attendanceService.selectOneByTime(startTime, endTime,userId);
+        System.out.println(attendances);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
     //添加或更新考勤信息
     @PostMapping("/saveAttendance")
     public ResponseResult saveAttendance(@RequestBody Attendance attendance) {
         attendance.setModifyId(1652714496280469506L);
+        attendance.setUserId(WebUtil.getLoginUser().getUser().getId());
         return attendanceService.saveOrUpdate(attendance) ? ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", attendance) :
                 ResponseResult.build(ResponseCode.DATABASE_SAVE_ERROR, "error", null);
 
@@ -61,6 +62,7 @@ public class AttendanceController {
     @PostMapping("/saveOneAttendance")
     public ResponseResult saveOneAttendance(@RequestBody Attendance attendance) {
         attendance.setModifyId(1652714496280469506L);
+        attendance.setUserId(WebUtil.getLoginUser().getUser().getId());
         if (attendance.getAttTime().getHour() > 1 && attendance.getAttTime().getHour() < 10) {
 //            迟到
             attendance.setStatus(3);
@@ -86,8 +88,9 @@ public class AttendanceController {
 
     }
 //查询个人考勤
-    @GetMapping("/selectAttendance/{userId}")
-    public ResponseResult findAttendanceAndUser(@PathVariable Long userId) {
+    @GetMapping("/selectAttendance")
+    public ResponseResult findAttendanceAndUser() {
+        Long userId = WebUtil.getLoginUser().getUser().getId();
         List<Attendance> attendances = attendanceService.getAttendanceAndUserByid(userId);
         return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", attendances);
     }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
index 15b0ec0..f9d8f4d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
@@ -41,7 +41,8 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
 
     @Override
     public List<Attendance> getAttendanceAndUserByid(Long userId) {
-        return attendanceMapper.getAttendanceAndUserByid(userId);
+        List<Attendance> attendances = attendanceMapper.getAttendanceAndUserByid(userId);
+        return attendances;
     }
 
     @Override
@@ -67,7 +68,7 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
         System.out.println(start);
         System.out.println(end);
         LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
-        lqw.ge(null != start, Attendance::getAttTime, start).le(null != end, Attendance::getAttTime, end);
+        lqw.ge(null != start, Attendance::getAttTime, start).le(null != end, Attendance::getAttTime, end).eq(Attendance::getDeleted,0).eq(Attendance::getUserId,userId);
         List<Attendance> oneAttendancesByTime = attendanceMapper.selectList(lqw);
         for (Attendance attendance:
                 oneAttendancesByTime) {
diff --git a/ui/src/assets/css/attendance.css b/ui/src/assets/css/attendance.css
index 7b3f06e..3d006de 100644
--- a/ui/src/assets/css/attendance.css
+++ b/ui/src/assets/css/attendance.css
@@ -5,9 +5,4 @@
 #attendanceMain1{
     margin-bottom:10px ;
 }
-/*
-#attendanceMain{
-    width: 100vw;
-    height: 100vh;
 
-}*/
diff --git a/ui/src/pages/attendance/AttendanceHome.vue b/ui/src/pages/attendance/AttendanceHome.vue
index 53af587..af6fc12 100644
--- a/ui/src/pages/attendance/AttendanceHome.vue
+++ b/ui/src/pages/attendance/AttendanceHome.vue
@@ -157,12 +157,13 @@
     </div>
 </template>
 <script lang="ts">
-import axios from 'axios'
 import { SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/el-message.css'
-import _ from 'lodash'
+import '@/assets/css/attendance.css'
 
+import _ from 'lodash'
+import request from '@/services'
 export default {
     name: 'AttendanceHome',
     data() {
@@ -220,8 +221,8 @@ export default {
         },
         // 获取所有考勤信息
         getAttendances() {
-            axios
-                .get('http://localhost:8621/attendance/findAllAttendance')
+            request
+                .get('/attendance/findAllAttendance')
                 .then((response) => {
                     console.log(response.data.data)
                     this.tableData = response.data.data
@@ -235,12 +236,10 @@ export default {
             const start = this.handleDateFormatUTC(this.attTime[0])
             const end = this.handleDateFormatUTC(this.attTime[1])
             console.log(start + '\t' + end)
-            axios
-                .get('http://localhost:8621/attendance/findAttendanceByTime', {
-                    params: {
-                        startTime: start,
-                        endTime: end
-                    }
+            request
+                .get('/attendance/findAttendanceByTime', {
+                    startTime: start,
+                    endTime: end
                 })
                 .then((response) => {
                     console.log(response.data.data)
@@ -294,8 +293,8 @@ export default {
         },
         // 处理保存
         doSave() {
-            axios
-                .post('http://localhost:8621/attendance/saveAttendance', this.form)
+            request
+                .post('/attendance/saveAttendance', this.form)
                 .then((response) => {
                     this.dialogFormVisible = false
                     this.getAttendances()
@@ -340,8 +339,8 @@ export default {
         // 操作删除
         handleDelete(id) {
             console.log(id)
-            axios
-                .delete('http://localhost:8621/attendance/delAttendance/' + id)
+            request
+                .delete('/attendance/delAttendance/' + id)
                 .then((response) => {
                     if (response) {
                         ElMessage({
@@ -368,8 +367,8 @@ export default {
         // 批量删除
         delBatch() {
             const map = this.multipleSelection.map((v) => v.id)
-            axios
-                .post('http://localhost:8621/attendance/delBatchAttendance', map)
+            request
+                .post('/attendance/delBatchAttendance', map)
                 .then((response) => {
                     if (response) {
                         ElMessage({
diff --git a/ui/src/pages/attendance/UserAttendance.vue b/ui/src/pages/attendance/UserAttendance.vue
index 5c1ff6b..e5527fd 100644
--- a/ui/src/pages/attendance/UserAttendance.vue
+++ b/ui/src/pages/attendance/UserAttendance.vue
@@ -88,15 +88,6 @@
         <div>
             <el-dialog v-model="dialogFormVisible" title="考勤信息" width="25%">
                 <el-form ref="ruleForm" :rules="rules" :model="form" :label-width="formLabelWidth">
-                    <el-form-item label="用户编号" prop="userId">
-                        <el-input
-                            v-model="form.userId"
-                            autocomplete="off"
-                            style="width: 200px"
-                            disabled
-                        />
-                    </el-form-item>
-
                     <el-form-item label="考勤时间" v-model="attTime" prop="attTime">
                         <div class="block">
                             <el-date-picker
@@ -121,11 +112,12 @@
 </template>
 
 <script lang="ts">
-import axios from 'axios'
 import { SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/el-message.css'
 import _ from 'lodash'
+import '@/assets/css/attendance.css'
+import request from '@/services'
 
 export default {
     name: 'UserAttendance',
@@ -133,7 +125,7 @@ export default {
         return {
             attendance: '',
             id: '',
-            userId: 1,
+            userId: '',
             username: '',
             attTime: '',
             attTimeB: [],
@@ -197,13 +189,10 @@ export default {
             const start = this.handleDateFormatUTC(this.attTimeB[0])
             const end = this.handleDateFormatUTC(this.attTimeB[1])
             console.log(start + '\t' + end)
-            axios
-                .get('http://localhost:8621/attendance/findOneAttendanceByTime', {
-                    params: {
-                        startTime: start,
-                        endTime: end,
-                        userId: this.userId
-                    }
+            request
+                .get('/attendance/findOneAttendanceByTime', {
+                    startTime: start,
+                    endTime: end
                 })
                 .then((response) => {
                     console.log(response.data.data)
@@ -223,8 +212,8 @@ export default {
                 })
         },
         getAttendancesByUserId() {
-            axios
-                .get('http://localhost:8621/attendance/selectAttendance/' + this.userId)
+            request
+                .get('/attendance/selectAttendance')
                 .then((response) => {
                     console.log(response.data.data)
                     this.tableData = response.data.data
@@ -246,8 +235,8 @@ export default {
             })
         },
         doSave() {
-            axios
-                .post('http://localhost:8621/attendance/saveOneAttendance', this.form)
+            request
+                .post('/attendance/saveOneAttendance', this.form)
                 .then((response) => {
                     this.dialogFormVisible = false
                     this.getAttendancesByUserId()
diff --git a/ui/src/router/index.ts b/ui/src/router/index.ts
index 21b40d4..798d828 100644
--- a/ui/src/router/index.ts
+++ b/ui/src/router/index.ts
@@ -31,7 +31,7 @@ const router = createRouter({
                         {
                             path: 'manage',
                             component: async () => await import('@/pages/work/Manage.vue'),
-                            name: 'manage',
+                            name: 'workManage',
                             meta: {
                                 title: '工作管理',
                                 requiresScrollbar: false,
@@ -69,6 +69,40 @@ const router = createRouter({
                         requiresScrollbar: false,
                         requiresPadding: true
                     }
+                },
+                {
+                    path: '/attendance',
+                    name: 'attendance',
+                    children: [
+                        {
+                            path: 'manage',
+                            component: async () =>
+                                await import('@/pages/attendance/AttendanceHome.vue'),
+                            name: 'attendanceManage',
+                            meta: {
+                                title: '考勤管理',
+                                requiresScrollbar: false,
+                                requiresPadding: true
+                            }
+                        },
+                        {
+                            path: 'user',
+                            component: async () =>
+                                await import('@/pages/attendance/UserAttendance.vue'),
+                            name: 'user',
+                            meta: {
+                                title: '员工考勤',
+                                requiresScrollbar: false,
+                                requiresPadding: true
+                            }
+                        }
+                    ],
+                    meta: {
+                        title: '考勤',
+                        icon: IconPinnacleAttendance,
+                        requiresScrollbar: false,
+                        requiresPadding: true
+                    }
                 }
             ]
         },