lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 字段修改

This commit is contained in:
李京通 2025-05-29 16:23:49 +08:00
parent 6d5fe820f1
commit 8febff08af
7 changed files with 70 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java
View File

@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
@ -40,7 +41,7 @@ public class BusinessTripApproval {
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
@ApiModelProperty("拟乘交通工具（飞机/火车/汽车/轮船/其他）")
@ApiModelProperty("拟乘交通工具（0-飞机/1-火车/2-汽车/3-轮船/4-其他）")
private String transport;
@ApiModelProperty("是否自带公务车辆（0-否 1-是）")
@ -55,7 +56,22 @@ public class BusinessTripApproval {
@ApiModelProperty("局主要领导意见")
private String mainLeaderOpinion;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("创建人")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private LocalDateTime updateTime;
@ApiModelProperty("修改人")
private String updateBy;
@TableField(exist = false)
private String fTime;
@TableField(exist = false)
private String eTime;
}

18
gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java
View File

@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
@ -67,7 +68,22 @@ public class NonWorkingDayDrinkingReport {
@ApiModelProperty("责任领导签名")
private String leaderSign;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("创建人")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private LocalDateTime updateTime;
@ApiModelProperty("修改人")
private String updateBy;
@TableField(exist = false)
private String fTime;
@TableField(exist = false)
private String eTime;
}

15
gather-app/src/main/java/com/ruoyi/database/domain/PoliceBusinessReport.java
View File

@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
@ -56,10 +57,22 @@ public class PoliceBusinessReport {
@ApiModelProperty("局领导意见")
private String leaderOpinion;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("创建人")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private LocalDateTime updateTime;
@ApiModelProperty("修改人")
private String updateBy;
@TableField(exist = false)
private String fTime;
@TableField(exist = false)
private String eTime;
}

15
gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java
View File

@ -1,6 +1,7 @@
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.fasterxml.jackson.annotation.JsonFormat;
@ -59,10 +60,22 @@ public class PoliceLeaveApproval {
@ApiModelProperty("局领导审批意见")
private String leaderApproval;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("创建人")
private String createBy;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("修改时间")
private LocalDateTime updateTime;
@ApiModelProperty("修改人")
private String updateBy;
@TableField(exist = false)
private String fTime;
@TableField(exist = false)
private String eTime;
}

8
gather-app/src/main/java/com/ruoyi/database/domain/PublicBusinessTrip.java
View File

@ -25,9 +25,6 @@ public class PublicBusinessTrip {
@ApiModelProperty("申请人姓名")
private String applicantName;
@ApiModelProperty("警号")
private String policeNumber;
@ApiModelProperty("联系方式")
private String contactWay;
@ -94,8 +91,7 @@ public class PublicBusinessTrip {
private String updateBy;
@TableField(exist = false)
private String fTime; // 临时字段：开始时间字符串
private String fTime;
@TableField(exist = false)
private String eTime; // 临时字段：结束时间字符串
private String eTime;
}

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://50.146.63.166:55306/PublicAffairs?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/PublicAffairs?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: '!QAZ1qaz'
password: '123456'
# 从库数据源
slave:
# 从数据源开关/默认关闭

25
ruoyi-admin/src/main/resources/application.yml
View File

@ -69,28 +69,9 @@ spring:
enabled: true
# redis 配置
redis:
# 地址
# host: 127.0.0.1
host: 50.146.63.43
# 端口，默认为6379
# port: 26379
port: 26379
# 数据库索引
database: 6
# 密码
password: livegbs@2019
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池中的最小空闲连接
min-idle: 0
# 连接池中的最大空闲连接
max-idle: 8
# 连接池的最大数据库连接数
max-active: 50
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
host: 127.0.0.1
port: 6379
# password: 123456
# token配置
token: