diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java index 9ac06abd..1de67b5f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java @@ -27,6 +27,14 @@ public class DepotHeadVo4List extends DepotHead{ private String depotHeadType; + private String creatorName; + + private String contacts; + + private String telephone; + + private String address; + public String getProjectName() { return projectName; } @@ -106,4 +114,36 @@ public class DepotHeadVo4List extends DepotHead{ public void setDepotHeadType(String depotHeadType) { this.depotHeadType = depotHeadType; } + + public String getCreatorName() { + return creatorName; + } + + public void setCreatorName(String creatorName) { + this.creatorName = creatorName; + } + + public String getContacts() { + return contacts; + } + + public void setContacts(String contacts) { + this.contacts = contacts; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 2f5d5a58..ae8afbc8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -652,6 +652,7 @@ public class DepotHeadService { } dh.setOperTimeStr(getCenternTime(dh.getOperTime())); dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); + dh.setCreatorName(userService.getUser(dh.getCreator()).getUsername()); resList.add(dh); } } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 27e53ec0..57b49ee0 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -7,6 +7,9 @@ + + + @@ -447,7 +450,8 @@