From 768a1dea35de125d677b9a4bfc148bc71458678d Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 12 Jun 2023 10:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=BF=E7=94=A8=E9=83=A8=E9=97=A8=EF=BC=88?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E9=83=A8=E9=97=A8=EF=BC=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 32 ++++++++++++++----- .../controller/PageController.java | 12 +++++-- .../pojo/ApplicationOutRecordP.java | 7 +++- .../impl/DepositoryRecordServiceImpl.java | 1 + .../application/form-step-look_back.html | 6 +++- .../templates/pages/depository/table-out.html | 1 + 6 files changed, 47 insertions(+), 12 deletions(-) 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 1d9e83d1..4cea647d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -284,8 +284,7 @@ public class DepositoryRecordController { } } } - } - else { + } else { List errMsg = new ArrayList<>(); List successMsg = new ArrayList<>(); for (Integer param : params) { @@ -1110,11 +1109,30 @@ public class DepositoryRecordController { ) { depositoryName.append(depository.getDname()).append(","); } + // 部门负责人 + String departmentHead = outRecordP.getDepartmenthead(); + String[] split = departmentHead.split(","); + if ("".equals(departmentHead) || departmentHead.isEmpty()) { + // 如果当前没有部门负责人 + split = new String[0]; + } + String useAdminorgName = ""; + for (String value : split) { + if ("".equals(value)) { + continue; + } + UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); + if ("".equals(useAdminorgName)) { + useAdminorgName = departmenthead.getMaindeparmentname(); + } else { + break; + } + } + outRecordP.setUseAdminorgName(useAdminorgName); outRecordP.setDepositoryName(depositoryName.toString()); outRecordP.setQuantity(sumQuantity); outRecordP.setPrice(sumPrice); outRecordP.setMnameStringList(mnameForMobiles); - } return new RestResponse(list, countBy, 200); } @@ -1685,8 +1703,7 @@ public class DepositoryRecordController { } }); - } - else if ("out".equals(type)) { + } else if ("out".equals(type)) { // 获取部门负责人 List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); @@ -1969,8 +1986,7 @@ public class DepositoryRecordController { } }); - } - else if ("out".equals(type)) { + } else if ("out".equals(type)) { Map mainRecord = new HashMap<>(); Integer sumQuantity = 0; for (Object o : quantitys) { @@ -1999,7 +2015,7 @@ public class DepositoryRecordController { mainRecord.put("adminorgId", userToken.getMaindeparment()); mainRecord.put("createUid", userToken.getId()); mainRecord.put("flagForAgency", 2); - mainRecord.put("depositoryId",depositoryIds.get(0)); + mainRecord.put("depositoryId", depositoryIds.get(0)); // 插入主表 depositoryRecordService.insertApplicationOutRecord(mainRecord, userToken, userkey, usertoken); 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 0745f4a1..db83549d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2501,8 +2501,10 @@ public class PageController { } } } - // 申请人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token); + // 申请人Id + Integer applicantId = applicationOutRecordPById.getApplicantId(); + // 获取申请人信息 + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicantId, userKey, token); // 部门负责人 String departmentHead = applicationOutRecordPById.getDepartmenthead(); String[] split = departmentHead.split(","); @@ -2511,12 +2513,14 @@ public class PageController { split = new String[0]; } StringBuilder departmentHeadName = new StringBuilder(); + String useAdminorgName = ""; for (String value : split) { if ("".equals(value)) { continue; } UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); departmentHeadName.append(departmenthead.getName()).append(","); + useAdminorgName = departmenthead.getMaindeparmentname(); } // 仓储中心负责人 String manager = applicationOutRecordPById.getDepositoryManager(); @@ -2536,6 +2540,10 @@ public class PageController { depositoryManagerNames.append(user.getName()); } + // 设置使用部门为第一个审批节点人所在的部门 + applicationOutRecordPById.setUseAdminorgName(useAdminorgName); + + Integer adminorgId = applicationOutRecordPById.getAdminorgId(); Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); if (adminorgId != null) { diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index e4f18ef0..72019d66 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -204,10 +204,15 @@ public class ApplicationOutRecordP { /** - * 部门名称 + * 申请人部门名称 */ private String adminorgName; + /** + * 使用部门名称 + */ + private String useAdminorgName; + /** * 摘要 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index bf8c009e..9406ac94 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -4738,6 +4738,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { recordP.setApplyRemark(recordP.getApplyRemark() == null ? "" : recordP.getApplyRemark()); ApplicationOutRecordP aorp = new ApplicationOutRecordP(recordP); aorp.setAdminorgName(userByPortById.getMaindeparmentname()); + result.add(aorp); } return result; diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index ca295d9d..a4134857 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -56,9 +56,13 @@ 外芯仓库 - 部门 + 申请部门 部门 + + 使用部门 + 部门 + 施工单位 施工单位 diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 32cf68ef..98287feb 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -189,6 +189,7 @@ }, {field: 'applicantName', width: 150, title: '申请人'}, {field: 'adminorgName', width: 150, title: '申请人部门'}, + {field: 'useAdminorgName', width: 150, title: '使用部门'}, {field: 'applicantTime', width: 200, title: '申请时间', sort: true}, { field: 'istransfer', title: '是否为转移申请', minWidth: 120, templet: function (d) {