完善

platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java

@@ -1,21 +1,19 @@
 package com.platform.activiti.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.platform.activiti.dao.dto.ActApplyInfoDTO;
-import com.platform.activiti.dao.dto.ActAssigneeDTO;
 import com.platform.activiti.dao.dto.ActModelDTO;
 import com.platform.activiti.dao.entity.ActApplyInfo;
-import com.platform.activiti.dao.entity.ActAssignee;
 import com.platform.activiti.dao.entity.ActAuditRecord;
 import com.platform.activiti.dao.entity.ActProcessDefinition;
 import com.platform.activiti.service.ActAssigneeService;
 import com.platform.activiti.service.ActivitiHandleService;
 import com.platform.activiti.service.ActivitiService;
-import com.platform.common.bean.Checkbox;
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.BusinessException;
@@ -27,9 +25,7 @@ import com.platform.common.util.SecurityUtils;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.bean.MyPage;
-import com.platform.dao.entity.upms.SysRole;
-import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.entity.upms.SysUserRole;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.upms.SysRoleMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
@@ -41,13 +37,9 @@ import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.editor.language.json.converter.BpmnJsonConverter;
 import org.activiti.engine.*;
 import org.activiti.engine.history.*;
-import org.activiti.engine.identity.Group;
-import org.activiti.engine.identity.User;
 import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.context.Context;
-import org.activiti.engine.impl.persistence.entity.GroupEntity;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.persistence.entity.UserEntity;
 import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.repository.Deployment;
@@ -67,7 +59,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -437,7 +428,7 @@ public class ActivitiController {
      */
     @GetMapping(value = "/my-task/finish/page")
     @ResponseBody
-    public R showTaskListFinish(Integer pageNum, Integer pageSize) {
+    public R showTaskListFinish(Integer pageNum, Integer pageSize,String keyword) {
         UserInfo userInfo = SecurityUtils.getUserInfo();
         String userId = userInfo.getUserId();
         List<HistoricTaskInstance> taskList  = historyService.createHistoricTaskInstanceQuery()
@@ -486,7 +477,12 @@ public class ActivitiController {
                         log.info("applyInfo--------"+ JsonUtils.objectToJson(applyInfo));
                         applyInfo.setProcessInstanceId(task.getProcessInstanceId());
                         applyInfo.setTaskId(task.getId());
-                        applyInfo.setStatus(customFieldTemplateDataMapper.selectByPrimaryKey(applyInfo.getTargetId()).getStatus());
+                        CustomFieldTemplateData data = customFieldTemplateDataMapper.selectByPrimaryKey(applyInfo.getTargetId());
+                        if(data != null){
+                            applyInfo.setStatus(data.getStatus());
+                            JSONObject jsonObject = JSON.parseObject(data.getData());
+                            applyInfo.setNo(jsonObject.getString("no"));
+                        }
                         /**如果是自己发起的，不展示*/
                         /*if (!userId.equals(applyInfo.getUserId())) {
                             tasks.add(applyInfo);

platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActApplyInfo.java

@@ -73,6 +73,11 @@ public class ActApplyInfo implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 单号
+     */
+    private String no;
+
     public ActApplyInfo() {
     }