完善

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

@@ -30,6 +30,7 @@ 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.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.upms.SysRoleMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.mapper.upms.SysUserRoleMapper;
@@ -126,6 +127,9 @@ public class ActivitiController {
     @Autowired
     ProcessEngineConfiguration processEngineConfiguration;
 
+    @Autowired
+    private CustomFieldTemplateDataMapper customFieldTemplateDataMapper;
+
     /**
      * 添加模型
      */
@@ -462,14 +466,27 @@ public class ActivitiController {
             List<HistoricDetail> list = historyService.createHistoricDetailQuery().
                     processInstanceId(task.getProcessInstanceId()).orderByTime().desc().list();
             if (CollectionUtil.isNotEmpty(list)) {
-                for(HistoricDetail historicDetail: list){
-                    HistoricVariableUpdate variable = (HistoricVariableUpdate) historicDetail;
+                /*HistoricVariableUpdate variable = (HistoricVariableUpdate) list.get(list.size()-1);
+                if("userId".equals(variable.getVariableName())){
+                    variable = (HistoricVariableUpdate) list.get(list.size()-2);
+                }
+                System.out.println("-----------------"+variable.getVariableName());
+                ActApplyInfo applyInfo = (ActApplyInfo)variable.getValue();
+                log.info("applyInfo--------"+ JsonUtils.objectToJson(applyInfo));
+                applyInfo.setProcessInstanceId(task.getProcessInstanceId());
+                applyInfo.setTaskId(task.getId());
+                applyInfo.setStatus(customFieldTemplateDataMapper.selectByPrimaryKey(applyInfo.getTargetId()).getStatus());
+                tasks.add(applyInfo);*/
+                for(int j=0;j<list.size();j++){
+                    HistoricVariableUpdate variable = (HistoricVariableUpdate) list.get(j);
                     String variableName = variable.getVariableName();
+                    log.info("taskId="+task.getId()+"-variableName" + variableName);
                     if ("data".equals(variableName)) {
                         ActApplyInfo applyInfo = (ActApplyInfo)variable.getValue();
                         log.info("applyInfo--------"+ JsonUtils.objectToJson(applyInfo));
                         applyInfo.setProcessInstanceId(task.getProcessInstanceId());
                         applyInfo.setTaskId(task.getId());
+                        applyInfo.setStatus(customFieldTemplateDataMapper.selectByPrimaryKey(applyInfo.getTargetId()).getStatus());
                         /**如果是自己发起的，不展示*/
                         /*if (!userId.equals(applyInfo.getUserId())) {
                             tasks.add(applyInfo);

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

@@ -68,6 +68,11 @@ public class ActApplyInfo implements Serializable {
      */
     private Boolean handleFlag = false;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
     public ActApplyInfo() {
     }