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 ca35363..8667ea5 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.Model; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -25,6 +26,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -266,6 +268,10 @@ public class ProcessController { .withMatcher("projectTitle", ExampleMatcher.GenericPropertyMatcher::contains) .withMatcher("applyPersonName", ExampleMatcher.GenericPropertyMatcher::contains); + // 只展示自己创建的草稿 + // Admin admin = InterfaceUtil.getAdmin(); + // projectProcess.setApplyPersonId(admin.getId()); + return repository.findAll(Example.of(projectProcess, exampleMatcher), pageRequest); } @@ -298,4 +304,45 @@ public class ProcessController { return entityManager.find(ProjectProcess.class, id); } + @ResponseBody + @PostMapping("/revoke/{id}") + public void revoke(@PathVariable("id") int id) { + // TODO 发起申请的人,在第一个人还没审批的情况下可以撤回 + jdbcTemplate.update("update project_process set `status` =? where id =? ", ProcessStatus.draft.getValue(), id); + } + + @ResponseBody + @DeleteMapping("/{id}") + public void delete(@PathVariable("id") int id) { + Admin admin = InterfaceUtil.getAdmin(); + Integer applyUserId = admin.getId(); + int update = jdbcTemplate.update("delete from project_process where id =? and apply_person_id=?", id, applyUserId); + if (update != 1) { + throw new RuntimeException("删除的流程不存在或者不属于自己"); + } + } + + /** + * 查看审核流程 + */ + @ResponseBody + @GetMapping("/audits/{id}") + public List> showAudits(@PathVariable("id") int id) { + ArrayList> ret = new ArrayList<>(); + + ret.add(create("2021-01-03 12:07:45", "提交审核")); + ret.add(create("2021-01-28 12:15:05", "工程运维管理部孙果审核已通过")); + ret.add(create("2021-02-03 22:01:12", "系统产品集成部尹浩审核已通过")); + ret.add(create("2021-03-03 22:05:12", "财务部主管何丹审核已通过")); + + return ret; + } + + private Map create(String timestamp, String content) { + Map map = new HashMap<>(); + map.put("content", content); + map.put("timestamp", timestamp); + return map; + } + } diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index 31f5ebe..31bcb94 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -29,7 +29,7 @@
业务应用 / - 待我审核
+ 已办流程
@@ -84,6 +84,7 @@ +