mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

销售合同流程 优化创建流程

master
Harry Yang 2022-12-27 15:24:33 +08:00
parent c4f863a5bc
commit 314b59cf91
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/palmte/work/controller/backend/ProcessController.java
View File

@ -336,10 +336,9 @@ public class ProcessController {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void post(@RequestBody @Valid ProcessCreationForm form) throws Exception { public void post(@RequestBody @Valid ProcessCreationForm form) throws Exception {
ProjectProcess entity = new ProjectProcess(); 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.setApplyDate(LocalDate.parse(form.getApplyDate(), formatter));
entity.setSealTypes(SealTypeArray.of(form.getSealTypes())); entity.setSealTypes(SealTypeArray.of(form.getSealTypes()));
entity.setApplyDept(String.join(",", form.getApplyDept()));
Admin admin = InterfaceUtil.getAdmin(); Admin admin = InterfaceUtil.getAdmin();
entity.setApplyPersonId(admin.getId()); entity.setApplyPersonId(admin.getId());
entity.setAttachmentUri(JSON.toJSONString(form.getAttachments())); entity.setAttachmentUri(JSON.toJSONString(form.getAttachments()));

6
src/main/java/cn/palmte/work/model/process/ProjectProcess.java
View File

@ -60,11 +60,11 @@ public class ProjectProcess implements Serializable {
// 申请人 ID // 申请人 ID
private Integer applyPersonId; private Integer applyPersonId;
// 申请部门 部门1,部门2,部门3 // 申请部门 部门1,部门2,部门3 (逗号分割)
private String applyDept; private String applyDept;
// 申请部门ID // 申请部门ID(逗号分割)
private Integer applyDeptId; private String applyDeptId;
// 申请部门领导ID // 申请部门领导ID
private Integer applyDeptLeaderId; private Integer applyDeptLeaderId;

7
src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java
View File

@ -40,10 +40,11 @@ public class ProcessCreationForm {
// 申请人 // 申请人
private String applyPersonName; private String applyPersonName;
private String[] applyDept; // 申请部门 部门1,部门2,部门3 (逗号分割)
private String applyDept;
// 申请部门ID // 申请部门ID(逗号分割)
private Integer applyDeptId; private String applyDeptId;
// 申请部门领导ID // 申请部门领导ID
private Integer applyDeptLeaderId; private Integer applyDeptLeaderId;

4
src/main/resources/templates/admin/business/process-edit.ftl
View File

@ -640,8 +640,8 @@
} }
this.selectedDepts = leveled.map(level => level.id) this.selectedDepts = leveled.map(level => level.id)
this.processForm['applyDept'] = leveled.map(level => level.name).join(',') this.processForm['applyDept'] = leveled.map(level => level.name).join(',') // (逗号分割)
this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') // (逗号分割)
this.processForm['applyDeptLeaderId'] = opt.leaderId this.processForm['applyDeptLeaderId'] = opt.leaderId
this.processForm['applyDeptLeaderName'] = opt.leaderName this.processForm['applyDeptLeaderName'] = opt.leaderName
}, },

4
src/main/resources/templates/admin/business/process-new.ftl
View File

@ -774,8 +774,8 @@
} }
this.selectedDepts = leveled.map(level => level.id) this.selectedDepts = leveled.map(level => level.id)
this.processForm['applyDept'] = leveled.map(level => level.name).join(',') this.processForm['applyDept'] = leveled.map(level => level.name).join(',') // (逗号分割)
this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') this.processForm['applyDeptId'] = leveled.map(level => level.id).join(',') // (逗号分割)
this.processForm['applyDeptLeaderId'] = opt.leaderId this.processForm['applyDeptLeaderId'] = opt.leaderId
this.processForm['applyDeptLeaderName'] = opt.leaderName this.processForm['applyDeptLeaderName'] = opt.leaderName
}, },