From 79ebf022b3a82407fd7dd1c5f50ad52bf5b51582 Mon Sep 17 00:00:00 2001 From: assina045 Date: Tue, 23 May 2023 15:16:00 +0800 Subject: [PATCH] add personAffairs model and solve warning --- .../pinnacle/controller/AffairController.java | 54 ++-- .../cfive/pinnacle/mapper/AffairMapper.java | 13 +- .../pinnacle/service/IAffairService.java | 8 +- .../service/impl/AffairServiceImpl.java | 18 +- ui/src/components/ApplicantsAddAffairs.vue | 21 +- ui/src/components/ApproverApproved.vue | 61 +++-- ui/src/components/ApproverNotApproved.vue | 22 +- ui/src/components/personalAffairs.vue | 235 ++++++++++++++++++ ui/src/pages/affair/PersonalAffairsView.vue | 9 + ui/src/router/affair.ts | 32 ++- 10 files changed, 367 insertions(+), 106 deletions(-) create mode 100644 ui/src/components/personalAffairs.vue create mode 100644 ui/src/pages/affair/PersonalAffairsView.vue diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java index ee63990..da0ee71 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java @@ -27,64 +27,70 @@ import java.util.List; public class AffairController { @Autowired IAffairService affairService; -// IUserService userService; -// 不用userService的方法了，userController中已经写好了直接拿来用 + // IUserService userService; + // 不用userService的方法了，userController中已经写好了直接拿来用 @Autowired -UserController userController; + UserController userController; @PostMapping("/add") - public ResponseResult addAffair(@RequestBody Affair affair) { + public ResponseResult addAffair(@RequestBody Affair affair) { return ResponseResult.build(ResponseCode.DATABASE_SAVE_OK, "success", affairService.save(affair)); } - @GetMapping("/add/getUser") - public ResponseResult getUser() { + @GetMapping("/add/get_user") + public ResponseResult> getUser() { List userList = userController.getAllUser().getData(); - return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",userList); + return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", userList); }//获取数据库中所有用户 - @GetMapping("/add/getCurrentUser") - public ResponseResult getCurrentUser() { - return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",WebUtil.getLoginUser().getUser()); + @GetMapping("/add/get_current_user") + public ResponseResult getCurrentUser() { + return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", WebUtil.getLoginUser().getUser()); }//获取当前用户 - - - - @GetMapping("/NotApproved") - public ResponseResult select_NotApproved() { + @GetMapping("/personal_affairs") + public ResponseResult> getPersonalAffairs() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Affair::getStatus, 0).eq(Affair::getInspectorId,WebUtil.getLoginUser().getUser().getId()); + wrapper.eq(Affair::getApplicantId, WebUtil.getLoginUser().getUser().getId()); wrapper.orderByDesc(Affair::getCreateTime); return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.list(wrapper)); } - @GetMapping("/Approved") - public ResponseResult select_Approved() { + @GetMapping("/not_approved") + public ResponseResult> selectNotApproved() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Affair::getStatus, 0).eq(Affair::getInspectorId, WebUtil.getLoginUser().getUser().getId()); + wrapper.orderByDesc(Affair::getCreateTime); + return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.list(wrapper)); + } + + + @GetMapping("/approved") + public ResponseResult> selectApproved() { LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); - wrapper2.ne(Affair::getStatus, 0).eq(Affair::getInspectorId,WebUtil.getLoginUser().getUser().getId()); + wrapper2.ne(Affair::getStatus, 0).eq(Affair::getInspectorId, WebUtil.getLoginUser().getUser().getId()); wrapper2.orderByDesc(Affair::getInspectTime); return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK, "success", affairService.list(wrapper2)); } @PutMapping("/yes") - public ResponseResult updateAffair_yes(@RequestBody Affair affair) { + public ResponseResult updateAffairYes(@RequestBody Affair affair) { System.out.println(affair); - return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", affairService.updateAffair_Yes(affair)); + return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", affairService.updateAffairYes(affair)); //审批同意 } @PutMapping("/no") - public ResponseResult updateAffair_No(@RequestBody Affair affair) { - return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", affairService.updateAffair_No(affair)); + public ResponseResult updateAffairNo(@RequestBody Affair affair) { + return ResponseResult.build(ResponseCode.DATABASE_UPDATE_OK, "success", affairService.updateAffairNo(affair)); //审批驳回 } @DeleteMapping("/{id}") - public ResponseResult deleteAffair_Approved(@PathVariable Long id) { + public ResponseResult deleteAffairApproved(@PathVariable Long id) { System.out.println("affair"); return ResponseResult.build(ResponseCode.DATABASE_DELETE_OK, "success", affairService.removeById(id)); //删除已审批事务 diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java index 06b01b4..9cd24d7 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java @@ -28,22 +28,21 @@ public interface AffairMapper extends BaseMapper { // (是否撤回,当用户撤回新建的事务时，根据新建的事务的id，删除该条事务在数据库中的信息) @Update("update t_affair set status=1,inspect_time=#{inspectTime} where id=#{id}") - int updateAffairs_Yes(Affair affair); + int updateAffairsYes(Affair affair); //管理员权限--->修改事务的状态(AffairsStatus)--->达到审批的效果 //同意 @Update("update t_affair set Status=2 where id=#{id}" ) - int updateAffairs_NO(Affair affair); + int updateAffairsNO(Affair affair); //不同意 - - - @Select("SELECT t_affair.applicant_id,t_affair.inspector_id,t_user.id,t_user.username from t_affair,t_user ") - @ResultType(Affair.class) - List selectAffairs_NotApproved(); +// +// @Select("SELECT t_affair.applicant_id,t_affair.inspector_id,t_user.id,t_user.username from t_affair,t_user ") +// @ResultType(Affair.class) +// List selectAffairs_NotApproved(); } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairService.java index c33e042..a1fc870 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairService.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/IAffairService.java @@ -13,10 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IAffairService extends IService { - int insertAffair(Affair affair); - int updateAffair_Yes(Affair affair); - int updateAffair_No(Affair affair); +// int insertAffair(Affair affair); + int updateAffairYes(Affair affair); + int updateAffairNo(Affair affair); - int deleteAffair_ApprovedByID(Affair affair); +// int deleteAffair_ApprovedByID(Affair affair); } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairServiceImpl.java index 8d54153..20e27fe 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AffairServiceImpl.java @@ -21,23 +21,15 @@ public class AffairServiceImpl extends ServiceImpl impleme @Autowired private AffairMapper affairMapper; - @Override - public int insertAffair(Affair affair) { - return affairMapper.insertAffair(affair); + + public int updateAffairYes(Affair affair) { + return affairMapper.updateAffairsYes(affair); } - public int updateAffair_Yes(Affair affair) { - return affairMapper.updateAffairs_Yes(affair); + public int updateAffairNo(Affair affair) { + return affairMapper.updateAffairsNO(affair); } - public int updateAffair_No(Affair affair) { - return affairMapper.updateAffairs_NO(affair); - } - - @Override - public int deleteAffair_ApprovedByID(Affair affair) { - return affairMapper.deleteAffairs(affair); - } } diff --git a/ui/src/components/ApplicantsAddAffairs.vue b/ui/src/components/ApplicantsAddAffairs.vue index 2f95e2c..a3ebc6e 100644 --- a/ui/src/components/ApplicantsAddAffairs.vue +++ b/ui/src/components/ApplicantsAddAffairs.vue @@ -7,10 +7,10 @@ - + @@ -121,7 +121,7 @@ export default { !_.isEmpty(form.inspectorId) ) { request - .post('http://localhost:8621/affair/add', form) + .post('/affair/add', form) .then((response) => { console.log(response.data) this.resetForm() @@ -130,7 +130,8 @@ export default { this.resetForm() console.log(reportError) }) - this.$router.go() + this.resetForm() + // this.$router.go() } else { if (_.isEmpty(form.title)) { ElMessage({ @@ -182,7 +183,7 @@ export default { }, // 动态时钟 getUser() { request - .get('http://localhost:8621/affair/add/getUser') + .get('/affair/add/get_user') .then((response) => { this.users = response.data.data }) @@ -192,13 +193,13 @@ export default { }, getCurrentUser() { request - .get('http://localhost:8621/affair/add/getCurrentUser') + .get('/affair/add/get_current_user') .then((response) => { this.currentUser = response.data.data }) .catch((reportError) => { console.log(reportError) - }) + }) // 获取当前用户 } }, created() { @@ -219,9 +220,9 @@ export default { width: 99%; } -.shortInput { - width: 150px; -} +/*.shortInput {*/ +/* width: 200px;*/ +/*}*/ .textarea { height: 70%; diff --git a/ui/src/components/ApproverApproved.vue b/ui/src/components/ApproverApproved.vue index 082c040..b8ef4bf 100644 --- a/ui/src/components/ApproverApproved.vue +++ b/ui/src/components/ApproverApproved.vue @@ -2,9 +2,9 @@
- +