From d911bf5c02ec6438da7dd564f061633124b6eb12 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 七月 2025 18:04:36 +0800
Subject: [PATCH] art: 技术状态变更-接口问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java | 3 +--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java | 4 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java | 20 ++++++++++++++++++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
index 5e63993..23634fb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
@@ -11,7 +11,6 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.TechnicalStatusChangeOrderStatusEnum;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
@@ -113,7 +112,7 @@
if (entity == null) {
return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if (!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
+ if (!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
}
entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.ABOLISH.name());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java
index 6004b87..03b593c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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 lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -48,39 +51,52 @@
private String changeOrderNum;
/**鍙樻洿鍗曠姸鎬�*/
@ApiModelProperty(value = "鍙樻洿鍗曠姸鎬�")
+ @Dict(dicCode = "technical_status_change_order_status")
private String changeStatus;
/**鐢宠鍗曚綅*/
@ApiModelProperty(value = "鐢宠鍗曚綅")
+ @Dict(dictTable = "eam_base_factory", dicText = "factory_name", dicCode = "org_code")
private String factoryOrgCode;
/**缂栧埗浜�*/
@ApiModelProperty(value = "缂栧埗浜�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String designer;
/**缂栧埗鏃堕棿*/
@ApiModelProperty(value = "缂栧埗鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date designerTime;
/**浣跨敤鍗曚綅瀹や富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String departHeaderSignature;
/**浣跨敤鍗曚綅瀹や富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date departHeaderSignatureTime;
/**浣跨敤鍗曚綅瀹や富绠＄瀛楃粨鏋�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠＄瀛楃粨鏋�")
+ @Dict(dicCode = "approve_reject")
private String departHeaderSignatureResult;
/**浣跨敤鍗曚綅瀹や富绠℃剰瑙�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠℃剰瑙�")
private String departHeaderComment;
/**浣跨敤鍗曚綅閮ㄤ富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String departLeaderSignature;
/**浣跨敤鍗曚綅閮ㄤ富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛楁椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date departLeaderSignatureTime;
/**浣跨敤鍗曚綅閮ㄤ富绠＄瀛楃粨鏋�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛楃粨鏋�")
+ @Dict(dicCode = "approve_reject")
private String departLeaderSignatureResult;
- /**浣跨敤鍗曚綅閮ㄤ富绠＄瀛�*/
- @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠＄瀛�")
+ /**浣跨敤鍗曚綅閮ㄤ富绠℃剰瑙�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠℃剰瑙�")
private String departLeaderComment;
/**HF缂栫爜*/
@ApiModelProperty(value = "HF缂栫爜")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
index 6654758..15d9139 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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 lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -52,6 +54,8 @@
private String changeCategory;
/**鍙樻洿鏃ユ湡*/
@ApiModelProperty(value = "鍙樻洿鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date changeDate;
/**鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�*/
@ApiModelProperty(value = "鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�")
--
Gitblit v1.9.3