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 8667ea5..519aa8e 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -1,5 +1,7 @@ package cn.palmte.work.controller.backend; +import com.alibaba.fastjson.JSON; + import org.springframework.beans.BeanUtils; import org.springframework.data.domain.Example; import org.springframework.data.domain.ExampleMatcher; @@ -130,6 +132,11 @@ public class ProcessController { return "/admin/business/process-review"; } + @GetMapping("/detail") + public String detail(Model model) { + return "/admin/business/process-detail"; + } + @ResponseBody @GetMapping("/projects") public List> query(@RequestParam String q) { @@ -203,12 +210,13 @@ public class ProcessController { @Transactional public void post(@RequestBody @Valid SaleContractProcessForm form) { ProjectProcess entity = new ProjectProcess(); - BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "applyDept"); + BeanUtils.copyProperties(form, entity, "sealTypes", "applyDate", "applyDept", "attachmentUri"); 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.getAttachmentUri())); if (entity.getStatus() == null) { entity.setStatus(ProcessStatus.to_be_audit); 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 521d1bc..da4a23d 100644 --- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java +++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java @@ -92,6 +92,9 @@ public class ProjectProcess { private String remark; + // 附件 JSON Array + private String attachmentUri; + // 项目类型 // @Enumerated(EnumType.STRING) // private ProjectType projectType; diff --git a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java index 02634ed..de25338 100644 --- a/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java +++ b/src/main/java/cn/palmte/work/model/process/form/SaleContractProcessForm.java @@ -76,4 +76,5 @@ public class SaleContractProcessForm { private String supplierName; + private List attachmentUri; } diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0.sql index 7a59f0b..0d8511c 100644 --- a/src/main/resources/sql/2.0.sql +++ b/src/main/resources/sql/2.0.sql @@ -19,6 +19,7 @@ create table project_process tax_rate varchar(255) null comment '税率', process_type varchar(255) null comment '流程类型', remark text null comment '备注', + attachment_uri text null comment '附件 JSON Array', current_audit varchar(255) null comment '当前审核人', @@ -28,7 +29,7 @@ create table project_process ); alter table project_process - add apply_person_id int null comment '申请人ID'; + add attachment_uri text null comment '附件 JSON Array'; # 采购合同 create table procurement_contract diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index 31bcb94..6518124 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -99,7 +99,7 @@ - +