From 8ff8b4652c49fafbc31025cfe16e3c81bab37f9d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 23:24:54 +0800
Subject: [PATCH] 计划执法时间添加
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 7 +++++++
project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java | 3 +++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 1 +
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java | 4 ++++
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java | 5 +++++
project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java | 12 ++----------
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 1 +
7 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
index 2101771..65cb3e9 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysProfileController.java
@@ -59,14 +59,6 @@
public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = getLoginUser();
- user.setUserName(user.getUserName());
- SysUser byId = userService.getById(user.getUserId());
- byId.setNickName(user.getNickName());
- byId.setPhonenumber(user.getPhonenumber());
- byId.setEmail(user.getEmail());
- byId.setSex(user.getSex());
- byId.setAvatar(user.getAvatar());
- byId.setDeptId(user.getDeptId());
if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
@@ -77,11 +69,11 @@
{
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- int upd = userService.updateUser(byId);
+ int upd = userService.updateUser(user);
if (upd > 0)
{
// 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- loginUser.setUser(byId);
+ loginUser.setUser(user);
tokenService.setLoginUser(loginUser);
return success();
}
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
index 66c85ce..cebd7b4 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceOrder.java
@@ -97,6 +97,9 @@
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ private Date planTime;
+
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
index 21d6bbc..a2cebdc 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceOrderBo.java
@@ -91,6 +91,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date planTime;
+
/** 鎵ф硶闃熷憳浜烘暟 */
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
index f107541..662a385 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceOrderQueryBo.java
@@ -88,6 +88,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
+
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date planTime;
+
/** 鎵ф硶闃熷憳浜烘暟 */
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index 07b5ae9..6145a70 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -77,6 +77,13 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
+
+
+ @Excel(name = "璁″垝鎵ф硶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty("璁″垝鎵ф硶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date planTime;
+
@Excel(name = "鎵ф硶闃熷憳浜烘暟")
@ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 25b35ac..db43b7e 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -161,6 +161,7 @@
qw.eq(bo.getApplyDeptId() != null, "apply_dept_id", bo.getApplyDeptId());
qw.like(StringUtils.isNotEmpty(bo.getApplyDeptName()), "apply_dept_name", bo.getApplyDeptName());
qw.eq(bo.getApplyTime() != null, "apply_time", bo.getApplyTime());
+ qw.eq(bo.getPlanTime() != null, "plan_time", bo.getPlanTime());
qw.eq(bo.getUserNum() != null, "user_num", bo.getUserNum());
qw.eq(bo.getWarnStatus() != null, "warn_status", bo.getWarnStatus());
qw.eq(StringUtils.isNotEmpty(bo.getWarnReason()), "warn_reason", bo.getWarnReason());
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index 0de0eb8..ce87128 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -23,6 +23,7 @@
<result property="applyDeptId" column="apply_dept_id" />
<result property="applyDeptName" column="apply_dept_name" />
<result property="applyTime" column="apply_time" />
+ <result property="planTime" column="plan_time" />
<result property="userNum" column="user_num" />
<result property="warnStatus" column="warn_status" />
<result property="warnReason" column="warn_reason" />
--
Gitblit v1.9.1