|
|
|
@@ -1,5 +1,7 @@ |
|
|
|
package com.iformall.service.impl; |
|
|
|
|
|
|
|
import com.alibaba.druid.support.json.JSONUtils; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
@@ -191,10 +193,12 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
result.add(taskInfoMap); |
|
|
|
} |
|
|
|
} |
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result,pageSize); |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData applyHistory(Long businessId,String tenantId) { |
|
|
|
List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); |
|
|
|
@@ -214,7 +218,16 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); |
|
|
|
result.add(0,wxFlowRecord); |
|
|
|
} |
|
|
|
|
|
|
|
for (WxFlowRecord wxFlowRecord:result) { |
|
|
|
if(wxFlowRecord.getStatus() == 1){ |
|
|
|
wxFlowRecord.setIsLastStart(1); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
|