From 981df0b37214cef77498840a4c421e752b9dc9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Sat, 7 Jun 2025 14:37:57 +0800 Subject: [PATCH] feat: --- .../BusinessTripApprovalController.java | 29 ++++++++++++++ ...NonWorkingDayDrinkingReportController.java | 19 +++++++++- .../database/domain/ApprovalProcess.java | 38 +++++++++++++------ .../database/domain/BusinessTripApproval.java | 11 ++++-- .../database/domain/PoliceLeaveApproval.java | 2 +- 5 files changed, 81 insertions(+), 18 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java index b955160..2d42cb8 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java @@ -8,8 +8,12 @@ import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.database.domain.ApprovalProcess; import com.ruoyi.database.domain.BaseAddressInfo; import com.ruoyi.database.domain.BusinessTripApproval; +import com.ruoyi.database.service.ApprovalProcessService; import com.ruoyi.database.service.BaseAddressInfoService; import com.ruoyi.database.service.BusinessTripApprovalService; import com.ruoyi.system.service.ISysDeptService; @@ -19,6 +23,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -38,6 +43,7 @@ public class BusinessTripApprovalController extends BaseController { private final ISysUserService sysUserService; private final ISysDeptService sysDeptService; private final BaseAddressInfoService baseAddressInfoService; + private final ApprovalProcessService approvalsProcessService; @PostMapping("/list") @@ -87,6 +93,21 @@ public class BusinessTripApprovalController extends BaseController { } dto.setTogUserIds(ids.toString()); } + + String s = OrderNumberGenerator(); + dto.setApplyNo(s); + ApprovalProcess approvalProcess = new ApprovalProcess(); + approvalProcess.setApprovalNo(s); + approvalProcess.setProcessTitle("饮酒报备"); + approvalProcess.setSubmitterName(user.getNickName()); + approvalProcess.setSubmitterId(user.getUserId()); + approvalProcess.setSubmitTime(new Date().getTime()); + approvalProcess.setMatterType(0); + approvalProcess.setApprovalStatus(0); + approvalProcess.setReadStatus(0); + approvalProcess.setStartTime(approvalProcess.getStartTime()); + approvalProcess.setCreateTime(new Date().getTime()); + approvalsProcessService.save(approvalProcess); return toAjax(businessTripApprovalService.save(dto)); } @@ -166,6 +187,14 @@ public class BusinessTripApprovalController extends BaseController { }) .collect(Collectors.toList()); } + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + private static final String DATA_KEY = "DDATAKEY:"; + public static String OrderNumberGenerator() { + String format = sdf.format(new Date()); + RedisCache bean = SpringUtils.getBean(RedisCache.class); + bean.setCacheObject(DATA_KEY + format, bean.getCacheObject(DATA_KEY + format) == null ? 1 : (Integer) (bean.getCacheObject(DATA_KEY + format)) + 1); + return format + String.format("%04d", (Integer) (bean.getCacheObject(DATA_KEY + format))); + } } 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 5c92658..388f34e 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 @@ -8,9 +8,11 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.database.domain.ApprovalProcess; import com.ruoyi.database.domain.NonWorkingDayDrinkingReport; import com.ruoyi.database.domain.dto.ApprovaltDto; import com.ruoyi.database.domain.gwglLog; +import com.ruoyi.database.service.ApprovalProcessService; import com.ruoyi.database.service.NonWorkingDayDrinkingReportService; import com.ruoyi.database.service.gwglLogService; import com.ruoyi.system.service.ISysDeptService; @@ -40,6 +42,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController { private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService; private final ISysDeptService deptService; private final gwglLogService gwglLogService; + private final ApprovalProcessService approvalsProcessService; @ApiOperation("查询非工作日饮酒报备单") @PostMapping("/list") @@ -112,9 +115,10 @@ public class NonWorkingDayDrinkingReportController extends BaseController { List leaderLeader = sysDepts.stream().map(SysDept::getLeaderLeader).distinct().collect(Collectors.toList()); SysUser user = getLoginUser().getUser(); if (nonWorkingDayDrinkingReport.getId() == null) { + String s = OrderNumberGenerator(); nonWorkingDayDrinkingReport.setCreateBy(user.getNickName()); nonWorkingDayDrinkingReport.setState(0); - nonWorkingDayDrinkingReport.setApplyNo(OrderNumberGenerator()); + nonWorkingDayDrinkingReport.setApplyNo(s); nonWorkingDayDrinkingReport.setName(user.getNickName()); nonWorkingDayDrinkingReport.setUserId(user.getUserId()); nonWorkingDayDrinkingReport.setDeptName(user.getDept().getDeptName()); @@ -129,6 +133,19 @@ public class NonWorkingDayDrinkingReportController extends BaseController { // 普通民警 nonWorkingDayDrinkingReport.setUserType(0); } + + ApprovalProcess approvalProcess = new ApprovalProcess(); + approvalProcess.setApprovalNo(s); + approvalProcess.setProcessTitle("饮酒报备"); + approvalProcess.setSubmitterName(user.getNickName()); + approvalProcess.setSubmitterId(user.getUserId()); + approvalProcess.setSubmitTime(new Date().getTime()); + approvalProcess.setMatterType(0); + approvalProcess.setApprovalStatus(0); + approvalProcess.setReadStatus(0); + approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime()); + approvalProcess.setCreateTime(new Date().getTime()); + approvalsProcessService.save(approvalProcess); boolean result = nonWorkingDayDrinkingReportService.save(nonWorkingDayDrinkingReport); if (!result) { return AjaxResult.error("新增非工作日失败"); diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java index 6ab43ca..05f06fd 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java @@ -1,9 +1,6 @@ package com.ruoyi.database.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,6 +19,7 @@ public class ApprovalProcess { private Long id; @ApiModelProperty("审批编号") + @TableField(condition = SqlCondition.EQUAL) private String approvalNo; @ApiModelProperty("流程标题") @@ -33,6 +31,12 @@ public class ApprovalProcess { @ApiModelProperty("提交人ID") private Long submitterId; + @ApiModelProperty("抄送人姓名") + private String ccName; + + @ApiModelProperty("抄送人ID") + private Long ccId; + @ApiModelProperty("提交时间") private Long submitTime; @@ -44,39 +48,56 @@ public class ApprovalProcess { @ApiModelProperty("到达日期") private Long arrivalDate; + @TableField(exist = false) + private String arrivalDateCn; @ApiModelProperty("处理日期") private Long handleDate; + @TableField(exist = false) + private String handleDateCn; @ApiModelProperty("阅读状态：0-未读 1-已读") + @TableField(condition = SqlCondition.EQUAL) private Integer readStatus; @ApiModelProperty("开始时间") private Long startTime; + @TableField(exist = false) + private String startTimeCn; @ApiModelProperty("结束时间") private Long endTime; + @TableField(exist = false) + private String endTimeCn; @ApiModelProperty("出差目的地") private String businessTripDestination; @ApiModelProperty("起止日期") - private String startEndDate; + private Long startEndDate; + @TableField(exist = false) + private String startEndDateCn; @ApiModelProperty("饮酒时间") private Long drinkingTime; + @TableField(exist = false) + private String drinkingTimeCn; @ApiModelProperty("饮酒地点") private String drinkingPlace; @ApiModelProperty("创建时间") private Long createTime; + @TableField(exist = false) + private String createTimeCn; @ApiModelProperty("创建人") private String createBy; @ApiModelProperty("修改时间") private Long updateTime; + @TableField(exist = false) + private String updateTimeCn; @ApiModelProperty("修改人") private String updateBy; @@ -90,11 +111,4 @@ public class ApprovalProcess { @ApiModelProperty("开始时间（格式化字符串）") private String startTimeStr; - @TableField(exist = false) - @ApiModelProperty("结束时间（格式化字符串）") - private String endTimeStr; - - @TableField(exist = false) - @ApiModelProperty("饮酒时间（格式化字符串）") - private String drinkingTimeStr; } diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java index 15bee9b..091e120 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java @@ -1,14 +1,14 @@ package com.ruoyi.database.domain; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntityMini; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; @Data @@ -20,6 +20,9 @@ public class BusinessTripApproval extends BaseEntityMini { @ApiModelProperty("主键ID") private Long id; + @ApiModelProperty("申请编号") + private String applyNo; + @ApiModelProperty("出差人id") private Long userId; diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java index 3ff8450..cff898f 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java @@ -42,7 +42,7 @@ public class PoliceLeaveApproval { private Integer userType; @ApiModelProperty("是否已读") - private Integer read; + private Integer isRead; @ApiModelProperty("所在单位") private String deptName;