Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/BusFormDto.java

 package com.junmp.jyzb.api.bean.dto;
+import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -141,8 +143,7 @@ public class BusFormDto  {
     /**
      * 装备类别拼接
      */
-    private String equipmentList;
-
+    private String invList;
     /**
      * 仓库id
      */
@@ -165,7 +166,7 @@ public class BusFormDto  {
     private String updateUser;
 
     /**
-     * 报废销毁类型（1销毁出库，2移入报废区）
+     * 报废类型（1销毁出库，2移入报废区）
      */
     private Integer type;
    

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java

@@ -58,4 +58,12 @@ public class PolicemanDto {
      */
     private Integer identity;
 
+    /**
+     * 人脸照片list
+     */
+    private List<String> faceInfoList;
+    /**
+     * 指纹照片list
+     */
+    private List<String> fingerList;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryBusFormReq.java

@@ -199,7 +199,7 @@ public class QueryBusFormReq extends BaseRequest {
     /**
      *装备类别拼接
      */
-    private String equipmentList;
+    private String invList;
 
     /**
      * 装备名称

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateBusFormReq.java

@@ -178,6 +178,7 @@ public class UpdateBusFormReq extends BaseRequest {
     /**
      *装备类别拼接
      */
-    private String equipmentList;
+    private String invList;
 
 }
+

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java

@@ -53,7 +53,6 @@ public class UpdatePolicemanReq extends BaseRequest {
 
     private Date updateTime;
 
-    @NotBlank(message = "身份证号不能为空", groups = {add.class,edit.class})
     private String idCard;
 
     private String updateUser;
@@ -72,5 +71,14 @@ public class UpdatePolicemanReq extends BaseRequest {
     private List<Long> rolesList;
     //当前登录人的id
     private Long createUser;
+
+    /**
+     * 人脸照片list
+     */
+    private List<String> faceInfoList;
+    /**
+     * 指纹照片list
+     */
+    private List<String> fingerList;
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -64,6 +64,13 @@ public class PoliceController {
         return ApiRes.success(b);
     }
 
+    //添加人脸和指纹照片或修改
+    @PostMapping("/addFaceAndfinger")
+    @ApiOperation("添加警员人脸照片和指纹照片")
+    public ApiRes<Boolean> addFaceAndfinger(@RequestBody UpdatePolicemanReq req){
+        return ApiRes.success(policemanService.addFaceAndfinger(req));
+    }
+
 
     @PostMapping("/ChangePoliceState")
     @ApiOperation("修改警员状态")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/BusForm.java

@@ -175,8 +175,8 @@ public class BusForm implements Serializable {
     /**
      * 装备类别拼接
      */
-    @TableField(value = "equipment_list")
-    private String equipmentList;
+    @TableField(value = "inv_list")
+    private String invList;
     /**
      * 仓库id
      */

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -94,4 +94,8 @@ public interface PolicemanService extends IService<Policeman> {
 
     //查询没有组织机构的警员信息（添加警员时如果需要则在该列表中）
     List<Policeman> GetPoliceWithoutOrg();
+
+    //添加人脸和指纹照片或修改
+    boolean addFaceAndfinger(UpdatePolicemanReq req);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java

@@ -144,7 +144,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
                 startProcessInstanceDTO.setEndOrgName(req.getSupplierName());
             }
             //装备列表
-            startProcessInstanceDTO.setEquipmentList(req.getEquipmentList());
+            startProcessInstanceDTO.setInvList(req.getInvList());
             //业务类型
             startProcessInstanceDTO.setBussinessType(req.getBussinessType());
             processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
@@ -291,10 +291,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>()
                 //组织机构
                 .eq(ObjectUtil.isNotNull(req.getOrgId()),BusForm::getOrgId,req.getOrgId())
-                //当前登录人
-                .or(wrapper -> wrapper.eq(BusForm::getApplyUserId, req.getUserId()).eq(BusForm::getCurrentAssign, req.getUserId()))
+
                 //装备名称模糊查询
-                .like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getEquipmentList,req.getTypeName())
+                .like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getInvList,req.getTypeName())
                 //单号
                 .like(ObjectUtil.isNotNull(req.getBussinessCode()),BusForm::getBussinessCode,req.getBussinessCode())
                 //领用人
@@ -329,11 +328,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             List<String> bussinessTypeList=new ArrayList<>();
             bussinessTypeList.add("remove");
             bussinessTypeList.add("destruction");
-            eq.in(ObjectUtil.isNotNull(req.getExamineState() ) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState,bussinessTypeList);
+            eq.in(ObjectUtil.isNotNull(req.getBussinessType() ) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType,bussinessTypeList);
         }else {
             eq.eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType, req.getBussinessType());
         }
 
+        if (ObjectUtil.isNotNull(req.getUserId())){
+            //当前登录人
+            eq.and(wrapper-> wrapper.eq(BusForm::getAgent,req.getUserId()).or().eq(BusForm::getCurrentAssign,req.getUserId()));
+        }
+
         return eq;
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -259,6 +259,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             return roleId;
         }).collect(Collectors.toList());
         policemanDto.setRolesList(collect);
+        List<PoliceFace> paceList = policeFaceService.list(new LambdaQueryWrapper<PoliceFace>()
+                .eq(PoliceFace::getPoliceId, req.getId()));
+        List<String> faceList=new ArrayList<>();
+        for (PoliceFace policeFace:paceList) {
+            faceList.add(policeFace.getFaceInfo());
+        }
+        policemanDto.setFaceInfoList(faceList);
+
         return policemanDto;
     }
 
@@ -830,4 +838,105 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return list(new LambdaQueryWrapper<Policeman>().isNull(Policeman::getOrgId));
     }
 
+    //添加人脸和指纹照片或修改
+    @Override
+    public boolean addFaceAndfinger(UpdatePolicemanReq req) {
+        List<PoliceFace> addFaceInfoList=new ArrayList<>();
+        List<PoliceFace> delFaceInfoList=new ArrayList<>();
+        //库中存储的照片信息
+        List<PoliceFace> faceList = policeFaceService.list(new LambdaQueryWrapper<PoliceFace>()
+                .eq(PoliceFace::getPoliceId, req.getId()));
+        List<String> faceInfoList = req.getFaceInfoList();
+        Set<String> set = new HashSet<>();
+        for (PoliceFace face : faceList) {
+            set.add(face.getFaceInfo());
+        }
+        if (faceList.size()>0){
+            if (faceInfoList.size()>0){
+                for (String face : faceInfoList) {
+                    if (!set.contains(face)) {
+                        PoliceFace policeFace = new PoliceFace();
+                        policeFace.setFaceInfo(face);
+                        policeFace.setPoliceId(req.getId());
+                        policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                        addFaceInfoList.add(policeFace);
+                    }
+                }
+                for (PoliceFace face : faceList) {
+                    if (!faceInfoList.contains(face.getFaceInfo())) {
+                        delFaceInfoList.add(face);
+                    }
+                }
+            }
+        }else {
+            if (faceInfoList.size()>0){
+                for (String face:faceInfoList) {
+                    PoliceFace policeFace = new PoliceFace();
+                    policeFace.setFaceInfo(face);
+                    policeFace.setPoliceId(req.getId());
+                    policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                    addFaceInfoList.add(policeFace);
+                }
+            }
+        }
+        boolean a=true;
+        if (addFaceInfoList.size()>0){
+            a=policeFaceService.saveBatch(addFaceInfoList);
+        }
+        boolean b=true;
+        if (delFaceInfoList.size()>0){
+            b=policeFaceService.removeByIds(delFaceInfoList);
+        }
+
+        List<PoliceFinger> addFingerList=new ArrayList<>();
+        List<PoliceFinger> delFingerList=new ArrayList<>();
+        //库中存储的指纹信息
+        List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
+                .eq(PoliceFinger::getPoliceId, req.getId()));
+        List<String> fingerInfoList = req.getFingerList();
+        Set<String> set1 = new HashSet<>();
+        for (PoliceFinger finger : fingerList) {
+            set1.add(finger.getFingerInfo());
+        }
+        if (fingerList.size()>0){
+            if (fingerInfoList.size()>0){
+                for (String finger : fingerInfoList) {
+                    if (!set1.contains(finger)) {
+                        PoliceFinger finger1 = new PoliceFinger();
+                        finger1.setFingerInfo(finger);
+                        finger1.setPoliceId(req.getId());
+                        finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                        addFingerList.add(finger1);
+                    }
+                }
+                for (PoliceFinger finger : fingerList) {
+                    if (!fingerInfoList.contains(finger.getFingerInfo())) {
+                        delFingerList.add(finger);
+                    }
+                }
+            }
+        }else {
+            if (fingerInfoList.size()>0){
+                for (String finger:fingerInfoList) {
+                    PoliceFinger finger1 = new PoliceFinger();
+                    finger1.setFingerInfo(finger);
+                    finger1.setPoliceId(req.getId());
+                    finger1.setCreateTime(DateTimeUtil.getCurrentDateTime());
+                    addFingerList.add(finger1);
+                }
+            }
+        }
+        boolean c=true;
+        if (addFingerList.size()>0){
+            c=policeFingerService.saveBatch(addFingerList);
+        }
+        boolean d=true;
+        if (delFingerList.size()>0){
+            policeFingerService.removeByIds(delFingerList);
+        }
+        return (a && b && c && d);
+    }
+
+
+
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -17,7 +17,7 @@ public interface CommonConstants {
     String ORDER_TYPE="orderType";
     String START_ORG_NAME="startOrgName";//发物单位
     String END_ORG_NAME="endOrgName";//收物单位
-    String EQUIPMENT_LIST="equipmentList";//装备列表拼接
+    String INVLIST="invList";//装备列表拼接
     String BUSSINESS_TYPE="bussinessType"; //单据业务类型
     String OUT_IN_STATE="outInState";//出入库单据状态（出库还是入库）
 

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/ApplyDTO.java

@@ -22,8 +22,9 @@ public class ApplyDTO extends PageDTO {
     private Date endTime;
     //发物单位
     private String startOrgName;
+    private String endOrgName;
     //装备名称
     private String typeName;
     //审核状态
-    private String bussinessStatus;
+    private String businessStatus;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -27,7 +27,7 @@ public class StartProcessInstanceDTO {
     //收物单位
     private String endOrgName;
     //装备列表拼接
-    private String equipmentList;
+    private String invList;
 
     //单据业务类型
     private String bussinessType;

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/TaskDTO.java

@@ -24,8 +24,10 @@ public class TaskDTO extends PageDTO {
     private Date endTime;
     //发物单位
     private String startOrgName;
+    //发物单位
+    private String endOrgName;
     //装备名称
     private String typeName;
     //审核状态
-    private String bussinessStatus;
+    private String businessStatus;
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java

@@ -141,16 +141,16 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         processVariables.put(ORDER_ID,processInstanceDto.getOrderId());
         processVariables.put(ORDER_TYPE,processInstanceDto.getOrderType());
         //发物单位
-        if (ObjectUtil.isNotNull(processInstanceDto.getOutInState())){
+        if (ObjectUtil.isNotNull(processInstanceDto.getStartOrgName())){
             processVariables.put(START_ORG_NAME,processInstanceDto.getStartOrgName());
         }
         //收物单位
-        if (ObjectUtil.isNotNull(processInstanceDto.getOutInState())){
+        if (ObjectUtil.isNotNull(processInstanceDto.getEndOrgName())){
             processVariables.put(END_ORG_NAME,processInstanceDto.getEndOrgName());
         }
         //装备名称拼接
-        if (ObjectUtil.isNotNull(processInstanceDto.getEquipmentList())){
-            processVariables.put(EQUIPMENT_LIST,processInstanceDto.getEquipmentList());
+        if (ObjectUtil.isNotNull(processInstanceDto.getInvList())){
+            processVariables.put(INVLIST,processInstanceDto.getInvList());
         }
         //单据类型
         processVariables.put(BUSSINESS_TYPE,processInstanceDto.getBussinessType());
@@ -186,8 +186,11 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         if (ObjectUtils.isNotEmpty(skip) && BooleanUtils.toBoolean(skip.toString())){
             return "skip"+processInstance.getId();
         }
-        else
-        {
+        else{
+            List<Task> list = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+            for (Task a:list) {
+                System.out.println("a = " + a);
+            }
             Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
             task.setAssignee(StartUser.getUserId().toString());
             return  processInstance.getProcessInstanceId();

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -272,29 +272,37 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         //装备名称
         if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
-            taskQuery=taskQuery.taskVariableValueLike(EQUIPMENT_LIST,"%"+taskDTO.getTypeName()+"%");
+            taskQuery=taskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
         }
         //发物单位
         if (ObjectUtil.isNotNull(taskDTO.getStartOrgName()) && ! taskDTO.getStartOrgName().trim().isEmpty()){
-            taskQuery = taskQuery.taskVariableValueLike(START_ORG_NAME,"%"+taskDTO.getStartOrgName()+"%");
+            taskQuery = taskQuery.processVariableValueLike(START_ORG_NAME,"%"+taskDTO.getStartOrgName()+"%");
         }
-        //流程状态
-        if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("正在处理")){
-            taskQuery=taskQuery.taskVariableValueEquals(BUSINESS_STATUS_1,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("撤销")){
-            taskQuery=taskQuery.taskVariableValueEquals(BUSINESS_STATUS_2,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("驳回")){
-            taskQuery=taskQuery.taskVariableValueEquals(BUSINESS_STATUS_3,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("已结束")){
-            taskQuery=taskQuery.taskVariableValueEquals(BUSINESS_STATUS_4,taskDTO.getBussinessStatus());
-        }
-        //开始时间
-        if (ObjectUtil.isNotNull(taskDTO.getStartTime()))      {
-            taskQuery = taskQuery.taskCreatedAfter(taskDTO.getStartTime());
-        }
-        if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
-            taskQuery =taskQuery.taskCreatedBefore(taskDTO.getEndTime());
+        if (ObjectUtil.isNotNull(taskDTO.getEndOrgName()) && ! taskDTO.getEndOrgName().trim().isEmpty()){
+            taskQuery = taskQuery.processVariableValueLike(END_ORG_NAME,"%"+taskDTO.getEndOrgName()+"%");
         }
+        //流程状态
+        if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("正在处理")){
+            taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("撤销")){
+            taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("驳回")){
+            taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("已结束")){
+            taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }
+
+//        //开始时间
+//        if (ObjectUtil.isNotNull(taskDTO.getStartTime())) {
+//            taskQuery = taskQuery.taskCreatedAfter(taskDTO.getStartTime());
+//            taskQuery.taskDueAfter(taskDTO.getStartTime());
+//
+//        }
+//        //结束时间
+//        if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
+//            taskQuery=taskQuery.taskCreatedBefore(taskDTO.getEndTime());
+//            taskQuery.taskDueBefore(taskDTO.getEndTime());
+//        }
         List<Task> tasks = taskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
         //根据条件查询符合条件的数据并统计数量条数
         long count = taskQuery.count();
@@ -324,8 +332,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
             taskVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
             taskVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
-            taskVO.setEquipmentList(MapUtil.getStr(processVariables,EQUIPMENT_LIST));
-            taskVO.setBussinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
+            taskVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
+            taskVO.setBusinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             taskVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
 
 
@@ -358,38 +366,46 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         HistoricTaskInstanceQuery historicTaskQuery  = historyService.createHistoricTaskInstanceQuery()
                 .taskAssignee(StartUser.getUserId().toString())
                 .finished()
-                .includeProcessVariables()
+                .includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks()
                 .orderByTaskCreateTime().desc();
 
         //根据条件查询（流程名称，开始时间，结束时间）
         if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
             historicTaskQuery = historicTaskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
         }
-        if (ObjectUtil.isNotNull(taskDTO.getStartTime()))      {
-            historicTaskQuery = historicTaskQuery.taskCreatedAfter(taskDTO.getStartTime());
-        }
-        if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
-            historicTaskQuery =historicTaskQuery.taskCreatedBefore(taskDTO.getEndTime());
-        }
+        //开始时间
+//        if (ObjectUtil.isNotNull(taskDTO.getStartTime())) {
+//            historicTaskQuery = historicTaskQuery.taskCompletedAfter(taskDTO.getStartTime());
+//
+//        }
+//        //结束时间
+//        if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
+//            historicTaskQuery = historicTaskQuery.taskCompletedAfter(taskDTO.getEndTime());
+//        }
         //装备名称
         if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
-            historicTaskQuery=historicTaskQuery.taskVariableValueLike(EQUIPMENT_LIST,"%"+taskDTO.getTypeName()+"%");
+            historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
+
         }
         //发物单位
         if (ObjectUtil.isNotNull(taskDTO.getStartOrgName()) && ! taskDTO.getStartOrgName().trim().isEmpty()){
-            historicTaskQuery = historicTaskQuery.taskVariableValueLike(START_ORG_NAME,"%"+taskDTO.getStartOrgName()+"%");
-        }
-        //流程状态
-        if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("正在处理")){
-            historicTaskQuery=historicTaskQuery.taskVariableValueEquals(BUSINESS_STATUS_1,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("撤销")){
-            historicTaskQuery=historicTaskQuery.taskVariableValueEquals(BUSINESS_STATUS_2,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("驳回")){
-            historicTaskQuery=historicTaskQuery.taskVariableValueEquals(BUSINESS_STATUS_3,taskDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(taskDTO.getBussinessStatus()) && taskDTO.getBussinessStatus().equals("已结束")){
-            historicTaskQuery=historicTaskQuery.taskVariableValueEquals(BUSINESS_STATUS_4,taskDTO.getBussinessStatus());
+            historicTaskQuery = historicTaskQuery.processVariableValueLike(START_ORG_NAME,"%"+taskDTO.getStartOrgName()+"%");
         }
 
+        if (ObjectUtil.isNotNull(taskDTO.getEndOrgName()) && ! taskDTO.getEndOrgName().trim().isEmpty()){
+            historicTaskQuery = historicTaskQuery.processVariableValueLike(END_ORG_NAME,"%"+taskDTO.getEndOrgName()+"%");
+        }
+        //流程状态
+        if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("正在处理")){
+            historicTaskQuery=historicTaskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("撤销")){
+            historicTaskQuery=historicTaskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("驳回")){
+            historicTaskQuery=historicTaskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("已结束")){
+            historicTaskQuery=historicTaskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
+        }
+//        List<HistoricTaskInstance> tasks = historicTaskQuery.list();
         List<HistoricTaskInstance> tasks = historicTaskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
         long count = historicTaskQuery.count();
 //        long count = historyService.createHistoricTaskInstanceQuery()
@@ -431,8 +447,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
             taskVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
             taskVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
-            taskVO.setEquipmentList(MapUtil.getStr(processVariables,EQUIPMENT_LIST));
-            taskVO.setBussinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
+            taskVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
+            taskVO.setBusinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             taskVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
 
             long totalTimes = task.getEndTime() == null ?
@@ -487,29 +503,31 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (ObjectUtil.isNotNull(applyDTO.getStartTime())) {
             desc = desc.startedAfter(applyDTO.getStartTime());
         }
-        if (ObjectUtil.isNotNull(applyDTO.getEndTime())){
-            desc =desc.startedBefore(applyDTO.getEndTime());
+        if (ObjectUtil.isNotNull(applyDTO.getEndTime())) {
+            desc = desc.startedBefore(applyDTO.getEndTime());
         }
         //装备名称
         if (ObjectUtil.isNotNull(applyDTO.getTypeName()) && ! applyDTO.getTypeName().trim().isEmpty()){
-            desc=desc.variableValueLike(EQUIPMENT_LIST,"%"+applyDTO.getTypeName()+"%");
+            desc=desc.variableValueLike(INVLIST,"%"+applyDTO.getTypeName()+"%");
         }
         //发物单位
         if (ObjectUtil.isNotNull(applyDTO.getStartOrgName()) && ! applyDTO.getStartOrgName().trim().isEmpty()){
             desc = desc.variableValueLike(START_ORG_NAME,"%"+applyDTO.getStartOrgName()+"%");
         }
+        if (ObjectUtil.isNotNull(applyDTO.getEndOrgName()) && ! applyDTO.getEndOrgName().trim().isEmpty()){
+            desc = desc.variableValueLike(END_ORG_NAME,"%"+applyDTO.getEndOrgName()+"%");
+        }
         //流程状态
-        if (ObjectUtil.isNotNull(applyDTO.getBussinessStatus()) && applyDTO.getBussinessStatus().equals("正在处理")){
-            desc=desc.variableValueEquals(BUSINESS_STATUS_1,applyDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(applyDTO.getBussinessStatus()) && applyDTO.getBussinessStatus().equals("撤销")){
-            desc=desc.variableValueEquals(BUSINESS_STATUS_2,applyDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(applyDTO.getBussinessStatus()) && applyDTO.getBussinessStatus().equals("驳回")){
-            desc=desc.variableValueEquals(BUSINESS_STATUS_3,applyDTO.getBussinessStatus());
-        }else if (ObjectUtil.isNotNull(applyDTO.getBussinessStatus()) && applyDTO.getBussinessStatus().equals("已结束")){
-            desc=desc.variableValueEquals(BUSINESS_STATUS_4,applyDTO.getBussinessStatus());
+        if (ObjectUtil.isNotNull(applyDTO.getBusinessStatus()) && applyDTO.getBusinessStatus().equals("正在处理")){
+            desc=desc.variableValueEquals(PROCESS_STATUS,applyDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(applyDTO.getBusinessStatus()) && applyDTO.getBusinessStatus().equals("撤销")){
+            desc=desc.variableValueEquals(PROCESS_STATUS,applyDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(applyDTO.getBusinessStatus()) && applyDTO.getBusinessStatus().equals("驳回")){
+            desc=desc.variableValueEquals(PROCESS_STATUS,applyDTO.getBusinessStatus());
+        }else if (ObjectUtil.isNotNull(applyDTO.getBusinessStatus()) && applyDTO.getBusinessStatus().equals("已结束")){
+            desc=desc.variableValueEquals(PROCESS_STATUS,applyDTO.getBusinessStatus());
         }
 
-
         List<HistoricProcessInstance> historicProcessInstances = desc.listPage((applyDTO.getPageNo() - 1) * applyDTO.getPageSize(), applyDTO.getPageSize());
         long count = desc.count();
 //        long count = historyService.createHistoricProcessInstanceQuery()
@@ -540,7 +558,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
             historyProcessInstanceVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
             historyProcessInstanceVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
-            historyProcessInstanceVO.setEquipmentList(MapUtil.getStr(processVariables,EQUIPMENT_LIST));
+            historyProcessInstanceVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
             historyProcessInstanceVO.setBussinessType(MapUtil.getStr(processVariables,BUSSINESS_TYPE));
             historyProcessInstanceVO.setOutInState(MapUtil.getStr(processVariables,OUT_IN_STATE));
 

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java

@@ -40,7 +40,7 @@ public class HistoryProcessInstanceVO {
     @ApiModelProperty("收物单位")
     private String endOrgName;
     @ApiModelProperty("装备列表")
-    private String equipmentList;
+    private String invList;
     @ApiModelProperty("单据类型")
     private String bussinessType;
     @ApiModelProperty("出入库状态")

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TaskVO.java

@@ -46,9 +46,9 @@ public class TaskVO {
     @ApiModelProperty("收物单位")
     private String endOrgName;
     @ApiModelProperty("装备列表")
-    private String equipmentList;
+    private String invList;
     @ApiModelProperty("单据类型")
-    private String bussinessType;
+    private String businessType;
     @ApiModelProperty("出入库状态")
     private String outInState;
 

pom.xml

@@ -70,10 +70,6 @@
 
     <dependencyManagement>
         <dependencies>
-
-
-
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>