bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk

This commit is contained in:
jiask 2025-09-12 14:54:11 +08:00
parent 2556628c21
commit 08e38c44d3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialPageVO.java
View File

@ -47,7 +47,7 @@ public class FetchMaterialPageVO {
@ApiModelProperty("领料人id") @ApiModelProperty("领料人id")
private Long fetchUserId; private Long fetchUserId;
@ApiModelProperty("领料人") @ApiModelProperty("领料人")
private String fetchUserName; private String fetchUser;
@ApiModelProperty("审批状态(1待审核,2审批中,3审批通过,4审批不通过)") @ApiModelProperty("审批状态(1待审核,2审批中,3审批通过,4审批不通过)")
private Integer approveStatus; private Integer approveStatus;
@ApiModelProperty("审批流程id") @ApiModelProperty("审批流程id")
@ -133,10 +133,6 @@ public class FetchMaterialPageVO {
return this.fetchUserId; return this.fetchUserId;
} }
public String getFetchUserName() {
return this.fetchUserName;
}
public Integer getApproveStatus() { public Integer getApproveStatus() {
return this.approveStatus; return this.approveStatus;
} }
@ -267,11 +263,6 @@ public class FetchMaterialPageVO {
return this; return this;
} }
public FetchMaterialPageVO setFetchUserName(final String fetchUserName) {
this.fetchUserName = fetchUserName;
return this;
}
public FetchMaterialPageVO setApproveStatus(final Integer approveStatus) { public FetchMaterialPageVO setApproveStatus(final Integer approveStatus) {
this.approveStatus = approveStatus; this.approveStatus = approveStatus;
return this; return this;
@ -321,4 +312,12 @@ public class FetchMaterialPageVO {
this.curUserApprove = curUserApprove; this.curUserApprove = curUserApprove;
return this; return this;
} }
public String getFetchUser() {
return fetchUser;
}
public void setFetchUser(String fetchUser) {
this.fetchUser = fetchUser;
}
} }

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml
View File

@ -161,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dw.warehouse_name, dw.warehouse_name,
a.fetch_material_time, a.fetch_material_time,
a.fetch_user_id, a.fetch_user_id,
su.user_name AS fetch_user_name, a.fetch_user AS fetchUser,
a.approve_status, a.approve_status,
a.process_instance_id, a.process_instance_id,
a.fetch_user, a.fetch_user,