diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java index a9927b7a..00807170 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java @@ -339,9 +339,6 @@ public class PublicConfig { JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class); - if ("302299".equals(userByPort.getNumber())) { - userByPort.setMaindeparment(280); - } if("300732".equals(userByPort.getNumber())){ userByPort.setMaindeparment(361); userByPort.setMaindeparmentname("仓储中心"); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 3dd3e6a0..9c866891 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1468,14 +1468,13 @@ public class DepositoryRecordController { managerList.add(userByPort); } } - } StringBuilder sb = new StringBuilder(); - Map completeUserIconMap = new HashMap<>(); + Map completeUserIconMap = new HashMap<>(); for (UserByPort userByPort : managerList) { - String name = userByPort.getName(); + String name = userByPort.getMaindeparmentname() + "-" + userByPort.getName(); sb.append(name).append(","); - completeUserIconMap.put(name,userByPort.getIconphoto()); + completeUserIconMap.put(name, userByPort.getIconphoto()); } @@ -1487,15 +1486,15 @@ public class DepositoryRecordController { recordPById.setDepositoryManagerTime(DateUtil.TimeStampToDateTime(ObjectFormatUtil.toLong(recordPById.getDepositoryManagerTime()))); // 获取平衡岗人员 String balancePoster = recordPById.getBalancePoster(); - Map balancePosterIconPhoto = new HashMap<>(); + Map balancePosterIconPhoto = new HashMap<>(); StringBuilder balancePosterName = new StringBuilder(); if (balancePoster != null) { String[] split = balancePoster.split(","); for (String s : split) { if (!"".equals(s)) { UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); - String name = userByPort.getName(); - balancePosterIconPhoto.put(name,userByPort.getIconphoto()); + String name = userByPort.getMaindeparmentname() + "-" + userByPort.getName(); + balancePosterIconPhoto.put(name, userByPort.getIconphoto()); balancePosterName.append(name).append(","); } } @@ -1516,15 +1515,15 @@ public class DepositoryRecordController { depositoryManagerId = manager.split(","); } StringBuilder depositoryManagerNames = new StringBuilder(); - Map depositoryManagerIconPhoto = new HashMap<>(); + Map depositoryManagerIconPhoto = new HashMap<>(); for (String s : depositoryManagerId) { if ("".equals(s)) { continue; } Integer managerid = ObjectFormatUtil.toInteger(s); UserByPort user = PublicConfig.FindUserById(managerid, userKey, token); - String name = user.getName(); - depositoryManagerIconPhoto.put(name,user.getIconphoto()); + String name = user.getMaindeparmentname() + "-" + user.getName(); + depositoryManagerIconPhoto.put(name, user.getIconphoto()); depositoryManagerNames.append(name); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 0bcc219c..d36f4b4d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2522,7 +2522,7 @@ public class PageController { continue; } UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); - String name = departmenthead.getName(); + String name = departmenthead.getMaindeparmentname()+"-"+departmenthead.getName(); departmentHeadUserIcon.put(name,departmenthead.getIconphoto()); departmentHeadName.append(name).append(","); useAdminorgName = departmenthead.getMaindeparmentname(); diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java index 90497fc5..b2ffdd6a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java @@ -74,4 +74,9 @@ public class ApplicationOutRecordMin { */ private String project; + /** + * 完成时间 + */ + private String completeOutTime; + } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 6eed19ad..11ef2438 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -148,6 +148,7 @@ + @@ -190,7 +191,7 @@ - aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project + aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project,aorm.completeOutTime