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 cd5b64a..9d8db35 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -27,7 +27,9 @@ import java.util.Map; import java.util.stream.Collectors; import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import cn.palmte.work.model.Admin; import cn.palmte.work.model.DeptRepository; @@ -36,6 +38,8 @@ import cn.palmte.work.model.ProjectBudgetIncomeDetail; import cn.palmte.work.model.ProjectRepository; import cn.palmte.work.model.enums.CooperationType; import cn.palmte.work.model.enums.Enumerable; +import cn.palmte.work.model.enums.ProcessStatus; +import cn.palmte.work.model.enums.ProcessType; import cn.palmte.work.model.enums.ProjectType; import cn.palmte.work.model.enums.SealType; import cn.palmte.work.model.process.SaleContractProcess; @@ -45,6 +49,7 @@ import cn.palmte.work.model.process.form.SaleContractProcessForm; import cn.palmte.work.service.ProjectBudgetService; import cn.palmte.work.utils.InterfaceUtil; import lombok.Builder; +import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -107,7 +112,8 @@ public class ProcessController { * 待我审核 */ @GetMapping("/review") - public String review() { + public String review(Model model) { + model.addAttribute("processTypes", ProcessType.values()); return "/admin/business/process-review"; } @@ -212,4 +218,45 @@ public class ProcessController { } } + @Data + static class ProcessQueryForm { + + private String projectNo; + private String projectTitle; + private String projectCreator; + + private ProcessType processType; + private ProcessStatus processStatus; + + } + + @ResponseBody + @PostMapping("/query") + public List list(@RequestBody ProcessQueryForm form) { + TypedQuery query = entityManager.createQuery( + "from SaleContractProcess ", SaleContractProcess.class); + +// query.setMaxResults(); + return query.getResultList(); + } + + // 审核 + @Data + static class AuditForm { + + private Integer processId; + + @NotNull + private String auditOpinion; + + private ProcessStatus processStatus; + + } + + @ResponseBody + @PostMapping("/audit") + public void audit(@RequestBody @Valid AuditForm form) { + + } + } diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java index f8cf2bd..6f15fe0 100644 --- a/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java +++ b/src/main/java/cn/palmte/work/model/enums/ProcessStatus.java @@ -1,12 +1,17 @@ package cn.palmte.work.model.enums; /** + * 审核状态 + * * @author Harry Yang * @since 2.0 2022/12/13 16:12 */ public enum ProcessStatus implements Enumerable { draft("草稿"), + to_be_audit("待审核"), + audit_passed("审核通过"), + audit_not_passed("审核不通过"), completed("完成"); private final String description; diff --git a/src/main/java/cn/palmte/work/model/enums/ProcessType.java b/src/main/java/cn/palmte/work/model/enums/ProcessType.java new file mode 100644 index 0000000..9f5f740 --- /dev/null +++ b/src/main/java/cn/palmte/work/model/enums/ProcessType.java @@ -0,0 +1,22 @@ +package cn.palmte.work.model.enums; + +/** + * @author Harry Yang + * @since 2.0 2022/12/19 16:47 + */ +public enum ProcessType implements Enumerable { + sale_contract("销售合同流程"), + business_procurement("业务采购流程"); + + private final String description; + + ProcessType(String description) { + this.description = description; + } + + @Override + public String getDescription() { + return description; + } + +} diff --git a/src/main/resources/templates/admin/business/process-review.ftl b/src/main/resources/templates/admin/business/process-review.ftl index f82c5c9..6f1c4ca 100644 --- a/src/main/resources/templates/admin/business/process-review.ftl +++ b/src/main/resources/templates/admin/business/process-review.ftl @@ -1,44 +1,252 @@ <#assign base=request.contextPath /> <#import "../../common/defaultLayout.ftl" as defaultLayout> <@defaultLayout.layout> + -
{{ message }}
+
+
+
+
业务应用 / + 待我审核
+
- +
+
+ + +
+ + + + + + + + + + + + <#list processTypes as processType> + + + + + + + + + + + 查询 +
+ +
+ + + + + + + + + + + + + + + + + +
+
+ + + + + + + 审核通过 + 审核不通过 + + + + + + + + + + + + + +
+ +
+ + + - - - - - - - - - - - - - - -