From 314b59cf912137ca2a02c59b1a4cee6e6a1742c5 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Tue, 27 Dec 2022 15:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E4=BC=98=E5=8C=96=E5=88=9B=E5=BB=BA=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProcessController.java | 3 +-- .../java/cn/palmte/work/model/process/ProjectProcess.java | 6 +++--- .../work/model/process/form/ProcessCreationForm.java | 7 ++++--- .../resources/templates/admin/business/process-edit.ftl | 4 ++-- .../resources/templates/admin/business/process-new.ftl | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index aa04695..07b79fc 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -336,10 +336,9 @@ public class ProcessController { @Transactional(rollbackFor = Exception.class) public void post(@RequestBody @Valid ProcessCreationForm form) throws Exception { ProjectProcess entity = new ProjectProcess(); - BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "applyDept", "attachments"); + BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "attachments"); entity.setApplyDate(LocalDate.parse(form.getApplyDate(), formatter)); entity.setSealTypes(SealTypeArray.of(form.getSealTypes())); - entity.setApplyDept(String.join(",", form.getApplyDept())); Admin admin = InterfaceUtil.getAdmin(); entity.setApplyPersonId(admin.getId()); entity.setAttachmentUri(JSON.toJSONString(form.getAttachments())); diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java index 853e1b7..7290c72 100644 --- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java +++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java @@ -60,11 +60,11 @@ public class ProjectProcess implements Serializable { // 申请人 ID private Integer applyPersonId; - // 申请部门 部门1,部门2,部门3 + // 申请部门 部门1,部门2,部门3 (逗号分割) private String applyDept; - // 申请部门ID - private Integer applyDeptId; + // 申请部门ID(逗号分割) + private String applyDeptId; // 申请部门领导ID private Integer applyDeptLeaderId; diff --git a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java index cab7600..160ae3c 100644 --- a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java +++ b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java @@ -40,10 +40,11 @@ public class ProcessCreationForm { // 申请人 private String applyPersonName; - private String[] applyDept; + // 申请部门 部门1,部门2,部门3 (逗号分割) + private String applyDept; - // 申请部门ID - private Integer applyDeptId; + // 申请部门ID(逗号分割) + private String applyDeptId; // 申请部门领导ID private Integer applyDeptLeaderId; diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index 8643dc9..e8e1864 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -640,8 +640,8 @@ } this.selectedDepts = leveled.map(level => level.id) - this.processForm['applyDept'] = leveled.map(level => level.name).join(',') - this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') + this.processForm['applyDept'] = leveled.map(level => level.name).join(',') // (逗号分割) + this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') // (逗号分割) this.processForm['applyDeptLeaderId'] = opt.leaderId this.processForm['applyDeptLeaderName'] = opt.leaderName }, diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index 9c43fbd..1ffd125 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -774,8 +774,8 @@ } this.selectedDepts = leveled.map(level => level.id) - this.processForm['applyDept'] = leveled.map(level => level.name).join(',') - this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') + this.processForm['applyDept'] = leveled.map(level => level.name).join(',') // (逗号分割) + this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') // (逗号分割) this.processForm['applyDeptLeaderId'] = opt.leaderId this.processForm['applyDeptLeaderName'] = opt.leaderName },