表单发送接口

platform-dao/src/main/resources/mapper/workflow/WorkflowMapper.xml

@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.workflow.WorkflowMapper">
-    <sql id="Base_Column_List">
-        workflow
-        .
-        id
-        ,
-                                     workflow.created_user_id,
-                                     workflow.update_user_id,
-                                     workflow.created_time,
-                                     workflow.update_time,
-                                     workflow.created_user_name,
-                                     workflow.update_user_name,
-                                     workflow.name,
-                                     workflow.total_node,
-                                     workflow.level_node
-    </sql>
-    <sql id="Ref_Column_List">
-        workflow
-        .
-        name
-        ,
-                                     workflow.total_node,
-                                     workflow.level_node
-    </sql>
     <sql id="List_Condition">
         <if test="id != null and id != ''">
             and workflow.id = #{id}
@@ -59,7 +36,7 @@
             and workflow.update_user_name = #{updateUserName}
         </if>
         <if test="name != null and name != ''">
-            and workflow.name = #{name}
+            and workflow.name like concat(concat('%',#{name}),'%')
         </if>
         <if test="totalNode != null">
             and workflow.total_node = #{totalNode}

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormDataServiceImpl.java

@@ -23,10 +23,7 @@ import com.platform.dao.mapper.custom.CustomFormBomMapper;
 import com.platform.dao.mapper.custom.CustomFormDataMapper;
 import com.platform.dao.mapper.custom.CustomFormMapper;
 import com.platform.dao.mapper.upms.SysUserDeptMapper;
-import com.platform.dao.mapper.workflow.WorkflowMapper;
-import com.platform.dao.mapper.workflow.WorkflowNodeMapper;
-import com.platform.dao.mapper.workflow.WorkflowTaskBomMapper;
-import com.platform.dao.mapper.workflow.WorkflowTaskMapper;
+import com.platform.dao.mapper.workflow.*;
 import com.platform.dao.vo.query.custom.CustomFormDataVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.custom.CustomFormDataService;
@@ -69,6 +66,8 @@ public class CustomFormDataServiceImpl extends BaseServiceImpl<CustomFormDataMap
     private SysUserDeptMapper sysUserDeptMapper;
     @Autowired
     private WorkflowNodeMapper workflowNodeMapper;
+    @Autowired
+    private WorkflowTaskRecordMapper workflowTaskRecordMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -128,7 +127,7 @@ public class CustomFormDataServiceImpl extends BaseServiceImpl<CustomFormDataMap
         record.setHandleStatus(TaskRecordStatusEnum.APPLY.getValue());
         record.setTaskId(taskId);
         record.setHandleRemark("任务待发起");
-
+        workflowTaskRecordMapper.insert(record);
     }
 
     /**

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowTaskBomServiceImpl.java

@@ -14,6 +14,7 @@ import com.platform.dao.entity.custom.CustomClassName;
 import com.platform.dao.entity.custom.CustomFormData;
 import com.platform.dao.entity.workflow.WorkflowTask;
 import com.platform.dao.entity.workflow.WorkflowTaskBom;
+import com.platform.dao.entity.workflow.WorkflowTaskRecord;
 import com.platform.dao.enums.FlowTaskStatusEnum;
 import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.custom.CustomClassNameMapper;
@@ -21,6 +22,7 @@ import com.platform.dao.mapper.custom.CustomFormDataMapper;
 import com.platform.dao.mapper.workflow.WorkflowNodeMapper;
 import com.platform.dao.mapper.workflow.WorkflowTaskBomMapper;
 import com.platform.dao.mapper.workflow.WorkflowTaskMapper;
+import com.platform.dao.mapper.workflow.WorkflowTaskRecordMapper;
 import com.platform.dao.vo.query.workflow.WorkflowNodeVO;
 import com.platform.dao.vo.query.workflow.WorkflowTaskBomVO;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -28,7 +30,6 @@ import com.platform.service.workflow.WorkflowTaskBomService;
 import com.platform.service.workflow.viewStrategy.BomViewStrategy;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
@@ -53,12 +54,14 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
     private List<BomViewStrategy> bomViewStrategyList; // 查看实现类
     @Resource
     private WorkflowTaskMapper workflowTaskMapper;
-    @Autowired
+    @Resource
     private WorkflowNodeMapper workflowNodeMapper;
-    @Autowired
+    @Resource
     private CustomClassNameMapper customClassNameMapper;
-    @Autowired
+    @Resource
     private CustomFormDataMapper customFormDataMapper;
+    @Resource
+    private WorkflowTaskRecordMapper workflowTaskRecordMapper;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -147,6 +150,20 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
         mapper.updateByPrimaryKey(updBom);
         // 修改任务
         workflowTaskMapper.updateByPrimaryKeySelective(updTask);
+        // 存储处理记录
+        saveTaskRecord(FlowTaskStatusEnum.VERIFYING.getValue(),SecurityUtils.getUserInfo().getRealName() + "发送任务",updTask.getId());
+    }
+
+    private void saveTaskRecord(Integer status,String remark,String taskId) {
+        WorkflowTaskRecord record = new WorkflowTaskRecord();
+        record.setId(IdGeneratorUtils.getObjectId());
+        record.setCreatedUserId(SecurityUtils.getUserInfo().getUserId());
+        record.setCreatedTime(LocalDateTime.now());
+        record.setCreatedUserName(SecurityUtils.getUserInfo().getRealName());
+        record.setHandleStatus(status);
+        record.setTaskId(taskId);
+        record.setHandleRemark(remark);
+        workflowTaskRecordMapper.insert(record);
     }
 
     /**