qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feature/jp-0331 #526

Open
jungpyo2001 wants to merge 998 commits from feature/jp-0331 into main
pull from: feature/jp-0331
merge into: qcast3:main
Conversation 0 Commits 998 Files Changed 12805 +6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b57a90d51 - Show all commits

4
src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotPlanResponse.java
View File

@ -53,6 +53,8 @@ public class QuotPlanResponse {
private String saleStoreId; private String saleStoreId;
@Schema(description = "최종갱신자 最終更新者") @Schema(description = "최종갱신자 最終更新者")
private String lastEditUser; private String lastEditUser;
@Schema(description = "최종갱신자명 最終更新者名")
private String lastEditUserName;
@Schema(description = "지붕종류 屋根種類 ") @Schema(description = "지붕종류 屋根種類 ")
private String rofTyp; private String rofTyp;
@Schema(description = "지붕재 屋根材") @Schema(description = "지붕재 屋根材")
@ -121,4 +123,6 @@ public class QuotPlanResponse {
private String createDatetime; private String createDatetime;
@Schema(description = "플랜정보 등록자 プラン情報登録者") @Schema(description = "플랜정보 등록자 プラン情報登録者")
private String createUser; private String createUser;
@Schema(description = "플랜정보 등록자명 プラン情報登録者名")
private String createUserName;
} }

2
src/main/resources/mappers/excelDown/excelDownMapper.xml
View File

@ -202,6 +202,8 @@
, P.LAST_EDIT_USER , P.LAST_EDIT_USER
, PI.CREATE_DATETIME , PI.CREATE_DATETIME
, PI.CREATE_USER , PI.CREATE_USER
, (SELECT NAME FROM M_USER WHERE USER_ID = P.LAST_EDIT_USER) AS LAST_EDIT_USER_NAME
, (SELECT NAME FROM M_USER WHERE USER_ID = PI.CREATE_USER) AS CREATE_USER_NAME
FROM T_OBJECT O WITH (NOLOCK) FROM T_OBJECT O WITH (NOLOCK)
LEFT OUTER JOIN T_OBJECT_INFO OI WITH (NOLOCK) LEFT OUTER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
ON O.OBJECT_NO = OI.OBJECT_NO ON O.OBJECT_NO = OI.OBJECT_NO