bugfix:修复知识审批类型不生效的问题

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,

know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 public interface KnowledgeFlowService {
 
-    IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
+    IPage<KnowledgeFlowResVO> 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);
 

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<KnowledgeFlowResVO> 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, "审批状态不能为空");

know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java

@@ -25,7 +25,7 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
             @Param("publishDeptId") String publishDeptId,
             @Param("baseId") String baseId,
             @Param("submitDeptId") String submitDeptId,
-            @Param("flowType") Instant flowType,
+            @Param("flowType") Integer flowType,
             @Param("publishDateBegin") LocalDate publishDateBegin,
             @Param("publishDateEnd") LocalDate publishDateEnd,
             @Param("submitDateBegin") LocalDate submitDateBegin,
@@ -37,7 +37,7 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
                                                              @Param("publishDeptId") String publishDeptId,
                                                              @Param("baseId") String baseId,
                                                              @Param("submitDeptId") String submitDeptId,
-                                                             @Param("flowType") Instant flowType,
+                                                             @Param("flowType") Integer flowType,
                                                              @Param("publishDateBegin") LocalDate publishDateBegin,
                                                              @Param("publishDateEnd") LocalDate publishDateEnd,
                                                              @Param("submitDateBegin") LocalDate submitDateBegin,

know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java

@@ -21,7 +21,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
      * 查询待办
      */
     IPage<KnowledgeFlowResVO> 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<KnowledgeFlowResVO> page);
 
@@ -29,7 +29,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
      * 查询已办
      */
     IPage<KnowledgeFlowResVO> 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<KnowledgeFlowResVO> page);
 

know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java

@@ -23,14 +23,14 @@ public class KnowledgeFlowRecordServiceImpl extends ServiceImpl<KnowledgeFlowRec
         implements KnowledgeFlowRecordService {
 
     @Override
-    public IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
+    public IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType,
                                                                 LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd,
                                                                 Page<KnowledgeFlowResVO> page) {
         return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, submitDateBegin,submitDateEnd,page);
     }
 
     @Override
-    public IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
+    public IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType,
                                                                     LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Page<KnowledgeFlowResVO> page) {
         return this.baseMapper.queryKnowledgeFlowCompletePage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, page);
     }

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;

know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml

@@ -74,7 +74,7 @@
             <if test="submitDateEnd != null ">
                 and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
             </if>
-            <if test="flowType != null and flowType != ''">
+            <if test="flowType != null ">
                 and t1.flow_type = #{flowType}
             </if>
         </where>
@@ -126,7 +126,7 @@
             <if test="submitDateEnd != null ">
                 and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
             </if>
-            <if test="flowType != null and flowType != ''">
+            <if test="flowType != null ">
                 and t1.flow_type = #{flowType}
             </if>
         </where>