From f03a9b9f00f538cc9b690e564a2d0f1df519cae7 Mon Sep 17 00:00:00 2001 From: assina045 Date: Tue, 16 May 2023 20:20:13 +0800 Subject: [PATCH] 1. Added the dynamic time effect of creating a time item in the Add transaction page 2. When inserting a new transaction or approving a new transaction, the transactions are arranged in reverse chronological order according to the creation time and approval time. The newly added transaction and the newly approved transaction appear at the top 3. You can obtain the current time when approving. You can see the approval time on the approved page --- .../pinnacle/controller/AffairController.java | 4 +- .../com/cfive/pinnacle/entity/Affair.java | 1 + .../cfive/pinnacle/mapper/AffairMapper.java | 2 +- ui/src/components/ApplicantsAddAffairs.vue | 14 ++++-- ui/src/components/ApproverApproved.vue | 28 +++++------ ui/src/components/ApproverNotApproved.vue | 46 ++++++++++++------- 6 files changed, 60 insertions(+), 35 deletions(-) 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 6caafb6..4da6806 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java @@ -34,6 +34,7 @@ public class AffairController { public ResponseResult select_NotApproved() { 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)); } @@ -41,7 +42,8 @@ public class AffairController { @GetMapping("/Approved") public ResponseResult select_Approved() { LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); - wrapper2.ne(Affair::getStatus, 0); + 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)); } diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Affair.java b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Affair.java index e289b38..3105b1b 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Affair.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/entity/Affair.java @@ -84,6 +84,7 @@ public class Affair implements Serializable { * 审核时间 */ @TableField("inspect_time") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",timezone = "UTC") private LocalDateTime inspectTime; /** 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 3032203..245bee2 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/AffairMapper.java @@ -27,7 +27,7 @@ public interface AffairMapper extends BaseMapper { //根据id，撤回新建的事务，在新建事务时，会再进行一次确定 // (是否撤回,当用户撤回新建的事务时，根据新建的事务的id，删除该条事务在数据库中的信息) - @Update("update t_affair set status=1 where id=#{id}") + @Update("update t_affair set status=1,inspect_time=#{inspectTime} where id=#{id}") int updateAffairs_Yes(Affair affair); //管理员权限--->修改事务的状态(AffairsStatus)--->达到审批的效果 //同意 diff --git a/ui/src/components/ApplicantsAddAffairs.vue b/ui/src/components/ApplicantsAddAffairs.vue index be5516f..04a83b5 100644 --- a/ui/src/components/ApplicantsAddAffairs.vue +++ b/ui/src/components/ApplicantsAddAffairs.vue @@ -35,7 +35,7 @@ - + { this.$refs.ruleForm.resetFields() }) + }, + alarm() { + setInterval(() => { + this.form.createTime = new Date() + }, 500) } + }, + created() { + this.alarm() } } diff --git a/ui/src/components/ApproverApproved.vue b/ui/src/components/ApproverApproved.vue index 278be8b..082c040 100644 --- a/ui/src/components/ApproverApproved.vue +++ b/ui/src/components/ApproverApproved.vue @@ -138,15 +138,15 @@ export default { id: '', title: '', content: '', - type_id: '', + typeId: '', status: '', - applicant_id: '', - inspector_id: '', - create_time: '', - inspect_time: '', + applicantId: '', + inspectorId: '', + createTime: new Date(), + inspectTime: new Date(), priority: '', - modify_time: '', - origin_id: '', + modifyTime: '', + originId: '', old: '', deleted: '', version: '' @@ -168,15 +168,15 @@ export default { id: '', title: '', content: '', - type_id: '', + typeId: '', status: '', - applicant_id: '', - inspector_id: '', - create_time: '', - inspect_time: '', + applicantId: '', + inspectorId: '', + createTime: new Date(), + inspectTime: new Date(), priority: '', - modify_time: '', - origin_id: '', + modifyTime: '', + originId: '', old: '', deleted: '', version: '' diff --git a/ui/src/components/ApproverNotApproved.vue b/ui/src/components/ApproverNotApproved.vue index 009b292..8e0a8db 100644 --- a/ui/src/components/ApproverNotApproved.vue +++ b/ui/src/components/ApproverNotApproved.vue @@ -124,6 +124,7 @@