|
|
@ -29,16 +29,13 @@ import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.yxt.anrui.flowable.api.flowcomment.FlowComment; |
|
|
|
import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeignBusinessStartDTO; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; |
|
|
|
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; |
|
|
|
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; |
|
|
|
import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
@ -61,7 +58,6 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.web.bind.annotation.PathVariable; |
|
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
@ -504,11 +500,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable |
|
|
|
voList.removeAll(Collections.singleton(null)); |
|
|
|
//定义的app的sid的index集合
|
|
|
|
Map<String, List<Integer>> appVer = new HashMap<>(); |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
for (int i = 0; i < voList.size(); i++) { |
|
|
|
FlowTaskDoVo f = voList.get(i); |
|
|
|
f.setCreateTime(sdf.format(new Date(Long.parseLong(f.getCreateTime())))); |
|
|
|
f.setProcessCreateTime(sdf.format(new Date(Long.parseLong(f.getProcessCreateTime())))); |
|
|
|
Map<String, Object> flowMap = f.getProcessVariables(); |
|
|
|
Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app"); |
|
|
|
String json = JSONObject.toJSONString(appMap); |
|
|
|