From b86dfa724a8140412f24b4a2aef0b582df7af151 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 15:59:32 +0800
Subject: [PATCH] # 字段添加
---
server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java | 6 ++++++
.gitignore | 3 ++-
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 2 ++
server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java | 3 +++
4 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index faec672..091cb8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
*/node_modules
/web_standard/web
/web_standard/doumeeplant_web
-/web_standard/.vscode
\ No newline at end of file
+/web_standard/.vscode
+.idea
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
index 466ae31..66fb8d0 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderExtListVO.java
@@ -30,6 +30,9 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
private Integer createUser;
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮佸悕绉�", example = "1")
+ private String createUserName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
index 81c179c..316944f 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
@@ -77,4 +77,10 @@
@ApiModelProperty(value = "鐢熶骇浜哄憳鍒嗛厤闆嗗悎" )
private List<WorkorderUserExtListVO> proUserList;
+
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ private String createUserName;
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index 0c8029b..dd32a26 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -410,6 +410,8 @@
tModle.setUnqualifiedNum(0);
tModle.setProUserId(w.getProUserId());
tModle.setProUserName(w.getProUserName());
+ tModle.setProUserName(w.getProUserName());
+ tModle.setCreateUser(w.getCreateUser());
if(w.getProUserId()!=null){
//鏌ヨ鐝粍淇℃伅
QueryCompanyUserExtDTO queryCompanyUserExtDTO = new QueryCompanyUserExtDTO();
--
Gitblit v1.9.3