From b003b843a47f87bc47f870274d5d012d5208f00b Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 10:29:35 +0800
Subject: [PATCH] 问题修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java | 37 +++++++++++++++++++------------------
project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java | 3 +++
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 2 +-
project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java | 3 +++
project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java | 3 +++
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java | 5 +++++
6 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java b/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
index 9de9954..dea4833 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/EnforceComplaintLog.java
@@ -81,6 +81,9 @@
@ApiModelProperty("鎶曡瘔绫诲瀷")
private String complaintType;
+ @ApiModelProperty("鎵ф硶鏃堕棿")
+ private Date executeTime;
+
@ApiModelProperty("鎶曡瘔鏃堕棿")
private Date complaintTime;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
index cc6b0ba..3f43f48 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/editBo/EnforceComplaintLogBo.java
@@ -73,6 +73,9 @@
@ApiModelProperty("鎶曡瘔绫诲瀷")
private String complaintType;
+ @ApiModelProperty("鎵ф硶鏃堕棿")
+ private Date executeTime;
+
@ApiModelProperty("鎶曡瘔鏃堕棿")
private Date complaintTime;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
index 74e2435..72d7f4d 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/bo/queryBo/EnforceComplaintLogQueryBo.java
@@ -74,6 +74,9 @@
@ApiModelProperty("鎶曡瘔绫诲瀷")
private String complaintType;
+ @ApiModelProperty("鎵ф硶鏃堕棿")
+ private Date executeTime;
+
@ApiModelProperty("鎶曡瘔鏃堕棿")
private Date complaintTime;
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
index 3f26818..c5c4bc2 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceComplaintLogVo.java
@@ -64,6 +64,11 @@
@ApiModelProperty("鎶曡瘔绫诲瀷")
private String complaintType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鎵ф硶鏃堕棿")
+ private Date executeTime;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鎶曡瘔鏃堕棿")
private Date complaintTime;
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
index 3e7842c..5fc4cb2 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceComplaintLogServiceImpl.java
@@ -140,25 +140,26 @@
if (StringUtils.isEmpty(entity.getExecuteDeptName()) && entity.getExecuteDeptName()!=null){
entity.setExecuteDeptName(deptService.getDeptAllName(entity.getExecuteDeptId()));
}
- if (entity.getCompanyId()==null
- || StringUtils.isEmpty(entity.getCompanyName())
- || StringUtils.isEmpty(entity.getCompanyUser())
- || StringUtils.isEmpty(entity.getCompanyPhone())
- ){
- throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�");
- }
- if (entity.getExecuteDeptId() == null
- || StringUtils.isEmpty(entity.getExecuteDeptName())
- ){
- throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
- }
- if (StringUtils.isEmpty(entity.getComplaintType())){
- throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
- }
- if (StringUtils.isEmpty(entity.getComplaintReason())){
- throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
- }
if (entity.getId()==null){
+ if (entity.getCompanyId()==null
+ || StringUtils.isEmpty(entity.getCompanyName())
+ || StringUtils.isEmpty(entity.getCompanyUser())
+ || StringUtils.isEmpty(entity.getCompanyPhone())
+ ){
+ throw new BaseException("鎶曡瘔浼佷笟涓嶈兘涓虹┖锛�");
+ }
+ if (entity.getExecuteDeptId() == null
+ || StringUtils.isEmpty(entity.getExecuteDeptName())
+ ){
+ throw new BaseException("鎶曡瘔鍗曚綅涓嶈兘涓虹┖锛�");
+ }
+ if (StringUtils.isEmpty(entity.getComplaintType())){
+ throw new BaseException("璇烽�夋嫨瑕佹姇璇夌被鍨嬶紒");
+ }
+ if (StringUtils.isEmpty(entity.getComplaintReason())){
+ throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
+ }
+
if (entity.getOrderId()!=null){ //鎵ф硶鍗曟姇璇�
int count = this.count(lq().eq(EnforceComplaintLog::getOrderId, entity.getOrderId()));
if (count >0){
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 cbeb807..ecc19c3 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
@@ -312,7 +312,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
order.setExecuteId(user.getUserId());
order.setExecuteUser(user.getNickName());
- order.setExecutePhone(user.getRecommendPhone());
+ order.setExecutePhone(user.getPhonenumber());
order.setExecuteDeptId(user.getDeptId());
order.setExecuteDeptName(deptService.getDeptAllName(user.getDeptId()));
order.setInTime(DateUtils.getNowDate());
--
Gitblit v1.9.1