搬运工对账单及用户管理

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/mapper/xml/ActBusinessMapper.xml

@@ -33,6 +33,21 @@
                     ${map.ortherParam}
                 </if>
 
+                <if test="map.title!=null and map.title!=''">
+                    AND azb.title=#{map.title}
+                </if>
+                <if test="map.status!=null and map.status!=''">
+                    AND azb.status=#{map.status}
+                </if>
+                <if test="map.result!=null and map.result!=''">
+                    AND azb.result=#{map.result}
+                </if>
+                <if test="map.createTime_begin!=null and map.createTime_begin!=''">
+                    AND date_format(azb.create_time, '%Y-%m-%d') &gt;= #{map.createTime_begin}
+                </if>
+                <if test="map.createTime_end!=null and map.createTime_end!=''">
+                    AND date_format(azb.create_time, '%Y-%m-%d') &lt;= #{map.createTime_end}
+                </if>
             ORDER BY
                 azb.create_time DESC
     </select>

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -8,24 +8,19 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.activiti.engine.task.TaskQuery;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.Area;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.api.ISysBaseAPI;
-import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.activiti.entity.*;
 import org.jeecg.modules.activiti.mapper.TbTableInfoMapper;
 import org.jeecg.modules.activiti.service.IActBusinessService;
@@ -570,12 +565,19 @@ public class ActBusinessController {
         //公司id 过滤数据
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         queryWrapper.lambda().eq(ActBusiness::getPkOrg,sysUser.getOrgCode());//公司id
+        List<ActBusiness> actBusinessList = actBusinessService.list(queryWrapper);
 
         Map<String,Object> map=new HashMap<>();
         map.put("userId",loginUser.getUsername());//当前登陆人
         map.put("pkOrg",loginUser.getOrgCode());//公司id
         map.put("tableName",param.getTableName());//业务表单
         map.put("ortherParam",getPar(param));//高级查询条件
+        map.put("title",param.getTitle());//标题
+        map.put("status",param.getStatus());//状态
+        map.put("result",param.getResult());//结果
+        map.put("createTime_begin",request.getParameter("createTime_begin"));//结果
+        map.put("createTime_end",request.getParameter("createTime_end"));//结果
+
         //获取业务表单列明
         //根据表明获取字段名称与字段说明
 //        List<Map<String,Object>> tableColumnList=tbTableInfoService.getTableColumnList(param.getTableName());