diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java index c058b64..ea2b425 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java @@ -52,7 +52,7 @@ public class KnowledgeFlowController { @RequestParam(required = false) String publishDeptId, @RequestParam(required = false) String baseId, @RequestParam(required = false) String submittedDeptId, - @RequestParam(required = false) Instant flowType, + @RequestParam(required = false) Integer flowType, @RequestParam(required = false) LocalDate publishDateBegin, @RequestParam(required = false) LocalDate publishDateEnd, @RequestParam(required = false) LocalDate submitDateBegin, diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java index cad3768..7bbea17 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java @@ -17,7 +17,7 @@ import java.util.List; public interface KnowledgeFlowService { - IPage queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, + IPage queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, Integer pageNum, Integer pageSize); diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java index cabed00..6f84abb 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java @@ -60,7 +60,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService { @Override public IPage queryKnowledgeFlowPage(Integer processStatus, String title, String publishDeptId, String baseId, - String submitDeptId, Instant flowType, + String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Integer pageNum, Integer pageSize) { Assert.notNull(processStatus, "审批状态不能为空"); diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java index 4f92407..0947b5d 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java @@ -25,7 +25,7 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, - String submitDeptId, Instant flowType, + String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, Page page); @@ -29,7 +29,7 @@ public interface KnowledgeFlowRecordService extends IService queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, - String submitDeptId, Instant flowType, + String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, Page page); diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java index c4a9a4a..134d7ff 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java @@ -23,14 +23,14 @@ public class KnowledgeFlowRecordServiceImpl extends ServiceImpl queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, + public IPage queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Page page) { return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, submitDateBegin,submitDateEnd,page); } @Override - public IPage queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, + public IPage queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType, LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Page page) { return this.baseMapper.queryKnowledgeFlowCompletePage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, page); } diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java index a9ab28a..bbba6d1 100644 --- a/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java +++ b/know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java @@ -23,7 +23,7 @@ public class KnowledgeFlowResVO { private String flowType; @Schema(description = "发文部门名称") private String publishDeptName; - @Schema(description = "流转状态 1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回)") + @Schema(description = "流转状态 1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回) 15驳回(新增) 16驳回(删除) 17驳回(撤回)") private Integer status; private String publishDeptId; diff --git a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml index 539d07c..c3fce83 100644 --- a/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml +++ b/know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml @@ -74,7 +74,7 @@ and t2.create_time #{submitDateEnd} - + and t1.flow_type = #{flowType} @@ -126,7 +126,7 @@ and t2.create_time #{submitDateEnd} - + and t1.flow_type = #{flowType}