FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-04 22:41:24 +08:00
Code Packages Releases Activity

Changed the version to 1.0.0.230611_alpha

Browse Source
This commit is contained in:
Fat Snake
2023-06-11 18:26:37 +08:00
parent c80e13dc00
commit 7f4fa75c9e
15 changed files with 52 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pinnacle/pom.xml
View File

@@ -10,7 +10,7 @@
</parent>
<groupId>com.cfive</groupId>
<artifactId>Pinnacle</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0.230611_alpha</version>
<name>Pinnacle</name>
<description>Pinnacle</description>
<properties>

1
Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
View File

@@ -112,7 +112,6 @@ public class AffairController {
@DeleteMapping("/{id}")
@PreAuthorize("hasAuthority('affair:manage:delete')")
public ResponseResult<Boolean> deleteAffairApproved(@PathVariable Long id) {
System.out.println("affair");
return ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", affairService.removeById(id));
//删除已审批事务

1
Pinnacle/src/main/java/com/cfive/pinnacle/controller/AttendanceController.java
View File

@@ -61,7 +61,6 @@ public class AttendanceController {
public ResponseResult<List<Attendance>> findOneAttendanceAndUserByTime(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);
}

3
Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
View File

@@ -34,13 +34,10 @@ public class WorkController {
@GetMapping
@PreAuthorize("hasAuthority('work:manage:get')")
public ResponseResult<List<Work>> getAll(String content) {
System.out.println(content);
if (content != null && content.length() != 0) {
System.out.println("test1");
List<Work> workList = workService.getWorkByContent(content);
return ResponseResult.databaseSelectSuccess(workList);
} else {
System.out.println("test2");
return ResponseResult.databaseSelectSuccess(workService.getAll());
}
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
View File

@@ -51,8 +51,6 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
public List<Attendance> selectByTime(String startTime, String endTime) {
LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
System.out.println(start);
System.out.println(end);
LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end);
List<Attendance> attendancesByTime = attendanceMapper.selectList(lqw);
@@ -68,8 +66,6 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
public List<Attendance> selectOneByTime(String startTime, String endTime, Long userId) {
LocalDateTime start = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime end = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
System.out.println(start);
System.out.println(end);
LambdaQueryWrapper<Attendance> lqw = new LambdaQueryWrapper<>();
lqw.ge(Attendance::getAttTime, start).le(Attendance::getAttTime, end).eq(Attendance::getDeleted, 0).eq(Attendance::getUserId, userId);
List<Attendance> oneAttendancesByTime = attendanceMapper.selectList(lqw);

50
ui/src/components/affairs/ApplicantsAddAffairs.vue
View File

@@ -102,7 +102,6 @@
<script lang="ts">
import 'element-plus/theme-chalk/index.css'
import request from '@/services/index.js'
import _ from 'lodash'
export default {
data() {
@@ -170,24 +169,19 @@ export default {
methods: {
onSubmit: function (form) {
this.form.applicantId = this.currentUser.id
console.log(form)
this.$refs.formRules.validate((value) => {
if (value) {
request
.post('/affair/add', form)
.then((response) => {
console.log(response.data)
this.getPersonalAffair()
this.resetForm()
})
.catch((reportError) => {
this.resetForm()
console.log(reportError)
})
this.getPersonalAffair()
this.$router.go(-1)
} else {
console.log('fault!')
}
})
}, // 表单提交及验证
@@ -202,24 +196,14 @@ export default {
}, 500)
}, // 动态时钟
getGrantUser() {
request
.get('/user/affair')
.then((response) => {
this.grantUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 获取有权限用户
request.get('/user/affair').then((response) => {
this.grantUsers = response.data.data
})
},
getCurrentUser() {
request
.get('/user/info')
.then((response) => {
this.currentUser = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 获取当前用户
request.get('/user/info').then((response) => {
this.currentUser = response.data.data
})
},
selectGrant() {
for (let i = 0; i < this.grantUsers.length; i++) {
@@ -229,24 +213,14 @@ export default {
}
},
getSameDepartmentUser() {
request
.get('/user/department')
.then((response) => {
this.sameDepartmentUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/user/department').then((response) => {
this.sameDepartmentUsers = response.data.data
})
},
getPersonalAffair() {
request
.get('/affair/personal_affairs')
.then((response) => {
this.grantUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/affair/personal_affairs').then((response) => {
this.grantUsers = response.data.data
})
}
},
created() {

62
ui/src/components/affairs/ApproverApproved.vue
View File

@@ -118,61 +118,29 @@ export default {
},
methods: {
handleYes(row) {
console.log(row)
request
.put('/affair/yes', row)
.then((response) => {
console.log(response.data)
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
})
request.put('/affair/yes', row).then((response) => {
this.getApproved()
})
},
handleNo(row) {
console.log(row)
request
.put('/affair/no', row)
.then((response) => {
console.log(response.data)
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
})
request.put('/affair/no', row).then((response) => {
this.getApproved()
})
},
handleDelete(row) {
console.log(row.id)
request
.delete('/affair/' + row.id)
.then((response) => {
console.log(response.data)
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
})
request.delete('/affair/' + row.id).then((response) => {
this.getApproved()
})
},
getUser() {
request
.get('/user/affair')
.then((response) => {
this.users = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 数据库中获取用户
request.get('/user/affair').then((response) => {
this.users = response.data.data
})
},
getApproved() {
request
.get('/affair/approved')
.then((response) => {
this.tableData = response.data.data
console.log(this.tableData)
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/affair/approved').then((response) => {
this.tableData = response.data.data
})
},
format(time) {
return new Date(time).toLocaleString()

38
ui/src/components/affairs/ApproverNotApproved.vue
View File

@@ -112,40 +112,20 @@ export default {
},
methods: {
handleYes(row) {
console.log(row)
row.inspectTime = new Date()
request
.put('/affair/yes', row)
.then((response) => {
console.log(response.data)
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
}) // 执行审批同意
request.put('/affair/yes', row).then((response) => {
this.getApproved()
})
},
handleNo(row) {
console.log(row)
request
.put('/affair/no', row)
.then((response) => {
console.log(response.data)
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
}) // 审批驳回
request.put('/affair/no', row).then((response) => {
this.getApproved()
})
},
getApproved() {
request
.get('/affair/not_approved')
.then((response) => {
this.tableData = response.data.data
console.log(this.tableData)
})
.catch((reportError) => {
console.log(reportError)
}) // 获取事务信息或者重新刷新页面
request.get('/affair/not_approved').then((response) => {
this.tableData = response.data.data
})
},
format(time) {
return new Date(time).toLocaleString()

35
ui/src/components/affairs/personalAffairs.vue
View File

@@ -130,25 +130,14 @@ export default {
},
methods: {
handleDelete(row) {
console.log(row.id)
request
.delete('/affair/' + row.id)
.then((response) => {
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
})
request.delete('/affair/' + row.id).then((response) => {
this.getApproved()
})
},
getGrantUser() {
request
.get('/user/affair')
.then((response) => {
this.grantUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 获取有权限用户
request.get('/user/affair').then((response) => {
this.grantUsers = response.data.data
})
},
// getInspectorName() {
// for (let i = 0; i < this.grantUsers.length; i++) {
@@ -160,15 +149,9 @@ export default {
// },
getApproved() {
request
.get('/affair/personal_affairs')
.then((response) => {
this.tableData = response.data.data
console.log(this.tableData)
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/affair/personal_affairs').then((response) => {
this.tableData = response.data.data
})
},
format(time) {
return new Date(time).toLocaleString()

2
ui/src/components/personalProfile/editPasswd.vue
View File

@@ -73,8 +73,6 @@ export default {
if (value) {
this.$emit('updatePasswd', passwdForm)
this.$refs.passwdForm.resetFields()
} else {
console.log('fault!')
}
})
},

2
ui/src/components/work/EditWork.vue
View File

@@ -103,8 +103,6 @@ export default {
this.$emit('addWork', form)
this.reset()
}
} else {
console.log('fault!')
}
})
},

24
ui/src/pages/affair/AffairManage.vue
View File

@@ -100,26 +100,14 @@ export default {
this.formView = true
},
onSubmit1() {
request
.get('/affair/not_approved_FuzzyQueries', this.formData)
.then((response) => {
this.DataToRouterView = response.data.data
console.log(response.data)
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/affair/not_approved_FuzzyQueries', this.formData).then((response) => {
this.DataToRouterView = response.data.data
})
},
onSubmit2() {
request
.get('/affair/approved_FuzzyQueries', this.formData)
.then((response) => {
this.DataToRouterView = response.data.data
console.log(response.data)
})
.catch((reportError) => {
console.log(reportError)
})
request.get('/affair/approved_FuzzyQueries', this.formData).then((response) => {
this.DataToRouterView = response.data.data
})
},
turnToNotApproved() {
this.flagApproved = false

4
ui/src/pages/affair/PersonalAffairsView.vue
View File

@@ -87,10 +87,6 @@ export default {
.get('/affair/personal_affairs_fuzzy_queries', this.formData)
.then((response) => {
this.DataToRouterView = response.data.data
console.log(response.data)
})
.catch((reportError) => {
console.log(reportError)
})
},
resetForm() {

3
ui/src/pages/profile/PersonalProfile.vue
View File

@@ -200,9 +200,6 @@ export default {
this.$refs.form.validate((value) => {
if (value) {
this.putForm(form)
console.log('submit!')
} else {
console.log('fault!')
}
})
},

2
ui/src/pages/work/Manage.vue
View File

@@ -230,7 +230,6 @@ export default {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.tableData = _.cloneDeep(response.data)
console.log(this.tableData)
if (this.tableData) {
this.loading = false
}
@@ -247,7 +246,6 @@ export default {
const response = res.data
if (response.code === DATABASE_SELECT_OK) {
this.workers = response.data
console.log(this.workers)
}
})
}