From bb94fcc4d4e03d6d50ccc8330d1585b4fbb24cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Mon, 9 Jun 2025 15:50:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApprovalProcessController.java | 8 ++------ .../NonWorkingDayDrinkingReportController.java | 4 ++-- .../controller/PoliceLeaveApprovalController.java | 2 +- .../main/java/com/ruoyi/database/domain/gwglLog.java | 12 ++++++------ 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index 66c042e..5a046a8 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -17,17 +17,13 @@ import com.ruoyi.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -50,7 +46,7 @@ public class ApprovalProcessController extends BaseController { @PostMapping("/list") @ApiOperation("查询列表") - public TableDataInfo list(ApprovalProcess approvalProcess) { + public TableDataInfo list(@RequestBody ApprovalProcess approvalProcess) { startPage(); QueryWrapper queryWrapper = new QueryWrapper<>(approvalProcess); queryWrapper.orderByDesc("create_time"); diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java index 73ccaff..df3fdad 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java @@ -48,7 +48,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController { @ApiOperation("查询非工作日饮酒报备单") @PostMapping("/list") - public TableDataInfo query(NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { + public TableDataInfo query(@RequestBody NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport) { List sysDepts = deptService.selectAllDeptList(); // 部门领导 List leader = sysDepts.stream().map(SysDept::getLeader).collect(Collectors.toList()); @@ -206,7 +206,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController { gwglLog.setReason(dto.getReason()); gwglLog.setApplyNo(nonWorkingDayDrinkingReport.getApplyNo()); gwglLog.setChecker(user.getNickName()); - gwglLog.setCheckTime(LocalDateTime.now()); + gwglLog.setCheckTime(System.currentTimeMillis()); gwglLog.setCheckState(state); boolean result1 = gwglLogService.save(gwglLog); if (!result || !result1) { diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index 054493b..4096bf7 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -206,7 +206,7 @@ public class PoliceLeaveApprovalController extends BaseController { gwglLog.setType(1); gwglLog.setReason(policeLeaveApproval.getReason()); gwglLog.setChecker(user.getNickName()); - gwglLog.setCheckTime(LocalDateTime.now()); + gwglLog.setCheckTime(System.currentTimeMillis()); gwglLog.setCheckState(state); boolean result1 = gwglLogService.save(gwglLog); if (!result || !result1) { diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/gwglLog.java b/gather-app/src/main/java/com/ruoyi/database/domain/gwglLog.java index b501c7a..3941cdb 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/gwglLog.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/gwglLog.java @@ -1,13 +1,11 @@ package com.ruoyi.database.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDateTime; - /** * @Description DwglLog * @Author lijingtong @@ -43,8 +41,9 @@ public class gwglLog { private String userName; @ApiModelProperty("申请时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Long createTime; + @TableField(exist = false) + private String createTimeCn; @ApiModelProperty("申请类型") private Integer type; @@ -53,8 +52,9 @@ public class gwglLog { private String checker; @ApiModelProperty("审核时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime checkTime; + private Long checkTime; + @TableField(exist = false) + private String checkTimeCn; @ApiModelProperty("审核状态") private Integer checkState;