Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java =================================================================== diff -u -r25083 -r26779 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 25083) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java (.../RecyclingRecord.java) (revision 26779) @@ -106,6 +106,10 @@ */ private String recyclingUser; /** + * 自送人 + */ + private String departmentSender; + /** * 申请单类型 */ private String recyclingApplicationType; @@ -250,6 +254,14 @@ this.recyclingUser = recyclingUser; } + public String getDepartmentSender() { + return departmentSender; + } + + public void setDepartmentSender(String departmentSender) { + this.departmentSender = departmentSender; + } + public String getRecyclingApplicationType() { return recyclingApplicationType; } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java =================================================================== diff -u -r26282 -r26779 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java (.../RecyclingContext.java) (revision 26282) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java (.../RecyclingContext.java) (revision 26779) @@ -41,6 +41,10 @@ */ private String departCode; /** + * 自送人 + */ + private String departmentSender; + /** * 回收人 */ private String recyclingUser; @@ -316,5 +320,11 @@ public void setMaterialsJsonForSave(JSONObject materialsJsonForSave) { this.materialsJsonForSave = materialsJsonForSave; } + public String getDepartmentSender() { + return departmentSender; + } + public void setDepartmentSender(String departmentSender) { + this.departmentSender = departmentSender; + } } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r26500 -r26779 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 26500) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 26779) @@ -1201,6 +1201,14 @@ } JSONObject userObj = new JSONObject(); userObj.put("fullName", user.getFullName()); + String unitCode = user.getCurrentOrgUnitCode(); + if(StringUtils.isNotBlank(unitCode)){ + OrgUnit orgUnit = orgUnitManager.getByCode(unitCode); + JSONObject orgUnitObj = new JSONObject(); + orgUnitObj.put("orgUnitName", orgUnit.getName()); + orgUnitObj.put("orgUnitNameCode", user.getCurrentOrgUnitCode()); + userObj.put("userOrgUnit", orgUnitObj); + } return userObj; }