bugfix

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java

@@ -238,8 +238,8 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                     knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.PASS.getStatus()).set(Knowledge::getDraftBelongUserId, null)
                             .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
                 } else if (flowType.equals(FlowTypeEnum.RECALL.getFlowType())) {
-                    // 如果是撤回,就置为撤回
-                    knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.RECALL.getStatus()).set(Knowledge::getDraftBelongUserId, null)
+                    // 如果是撤回,就置为草稿
+                    knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.DRAFT.getStatus()).set(Knowledge::getDraftBelongUserId, null)
                             .eq(Knowledge::getId, reqVO.getKnowledgeId()).update();
                 } else if (flowType.equals(FlowTypeEnum.DELETE.getFlowType())) {
                     knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.DELETE.getStatus()).set(Knowledge::getDraftBelongUserId, null)
@@ -320,7 +320,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
 
             }
             return node;
-        }).sorted(Comparator.comparing(KnowledgeFlowRecordResVO::getProcessTime)).toList();
+        }).sorted(Comparator.comparing(KnowledgeFlowRecordResVO::getProcessTime).reversed()).toList();
         // 然后把人名和部门名进行转换
         Set<String> userIdSet = result.stream().map(KnowledgeFlowRecordResVO::getProcessUserId).collect(Collectors.toSet());
         List<SystemUser> systemUsers = new ArrayList<>();

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java

@@ -208,6 +208,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
      * @param reqVO
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateKnowledge(ModifyKnowledgeReqVO reqVO) {
         if (2 == reqVO.getOperate()) {
             Assert.notBlank(reqVO.getBaseId(), "应用子库不能为空");
@@ -263,6 +264,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
         if (1 != reqVO.getOperate()) {
             UserInfo user = UserUtil.getUser();
             knowledgeFlowService.submitFlowProcess(knowledge, FlowTypeEnum.SUBMIT, user.getId(), user.getDeptId(), reqVO.getRemark());
+            // 将状态修改问待审批
+            knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.WAIT_APPROVAL.getStatus()).eq(Knowledge::getId, knowledge.getId()).update();
             // 如果提交了审批,就把草稿所属人置为空
             knowledgeService.lambdaUpdate().set(Knowledge::getDraftBelongUserId, null).eq(Knowledge::getId, knowledge.getId()).update();
 
@@ -328,6 +331,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
         // 走撤回流程
         UserInfo user = UserUtil.getUser();
         knowledgeFlowService.submitFlowProcess(knowledge, FlowTypeEnum.RECALL, user.getId(), user.getDeptId(), remark);
+        // 然后将状态修改问带审核
+        knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.WAIT_APPROVAL_RECALL.getStatus()).eq(Knowledge::getId, knowledge.getId()).update();
     }
 
     @Override
@@ -376,6 +381,8 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
             // 这时需要走审批流程进行删除
             UserInfo user = UserUtil.getUser();
             knowledgeFlowService.submitFlowProcess(knowledge, FlowTypeEnum.DELETE, user.getId(), user.getDeptId(), remark);
+            // 然后将状态修改为待审核
+            knowledgeService.lambdaUpdate().set(Knowledge::getStatus, StatusEnum.WAIT_APPROVAL_DELETE.getStatus()).eq(Knowledge::getId, knowledge.getId()).update();
         } else {
             throw new BusinessException("审批中的知识不支持删除");
         }

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

@@ -46,7 +46,7 @@
         <where>
             t1.todo_user_id = #{userId}
             <if test="title != null and title != ''">
-                and t2.title like #{title}
+                and t2.title like concat('%',#{title},'%')
             </if>
             <if test="baseId != null and baseId != ''">
                 and t2.base_id = #{baseId}
@@ -87,7 +87,7 @@
         <where>
             t1.process_user_id = #{userId}
             <if test="title != null and title != ''">
-                and t2.title like #{title}
+                and t2.title like concat('%',#{title},'%')
             </if>
             <if test="baseId != null and baseId != ''">
                 and t2.base_id = #{baseId}