|
@@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
-import com.google.common.collect.Maps;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.activiti.engine.RuntimeService;
|
|
import org.activiti.engine.RuntimeService;
|
|
import org.activiti.engine.TaskService;
|
|
import org.activiti.engine.TaskService;
|
|
@@ -740,7 +739,7 @@ public class ActBusinessController {
|
|
map.put("ortherParam",getPar(param));//高级查询条件
|
|
map.put("ortherParam",getPar(param));//高级查询条件
|
|
map.put("title",param.getTitle());//标题
|
|
map.put("title",param.getTitle());//标题
|
|
map.put("status",param.getStatus());//状态
|
|
map.put("status",param.getStatus());//状态
|
|
- map.put("result",param.getResult());//结果
|
|
|
|
|
|
+ map.put("result",param.getResult()==null?null:param.getResult()+"");//结果
|
|
map.put("createTime_begin",request.getParameter("createTime_begin"));//结果
|
|
map.put("createTime_begin",request.getParameter("createTime_begin"));//结果
|
|
map.put("createTime_end",request.getParameter("createTime_end"));//结果
|
|
map.put("createTime_end",request.getParameter("createTime_end"));//结果
|
|
|
|
|