修改装备统计报表，修改出入库单据接口

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

@@ -314,7 +314,7 @@ public class CounterSignListener implements ExecutionListener {
                             MessageSendReq sendReq = new MessageSendReq();
                             sendReq.setReceiveUserIds(String.valueOf(userId));
                             sendReq.setMsgTitle("您有新的待办任务");
-                            sendReq.setBizType("assign/"+execution.getVariable(ORDER_TYPE).toString());
+                            sendReq.setBizType("assign/"+execution.getVariable(TYPE_ORDER).toString());
                             sendReq.setBizId(Long.valueOf(execution.getProcessInstanceId()));
                             String StartUser=execution.getVariable(START_USER_INFO).toString();
                             UserInfo user=  JSONObject.parseObject(StartUser, UserInfo.class);

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -116,12 +116,12 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                         .singleResult();
                 // 获取流程定义ID
                 String processDefinitionId = event.getProcessDefinitionId();
-                List<HistoricVariableInstance> orderType = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("orderType").list();
+                List<HistoricVariableInstance> typeOrder = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("typeOrder").list();
 
-                if(orderType.size()>0) {
+                if(typeOrder.size()>0) {
 
 
-                    String Type= orderType.get(0).getValue().toString();
+                    String Type= typeOrder.get(0).getValue().toString();
                     if (Type.equals("workOrder") )//出入库单据
                     {
                         OrderMain existOrder= orderMainService.getOne(new LambdaQueryWrapper<OrderMain>()
@@ -183,7 +183,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                     MessageSendReq sendReq = new MessageSendReq();
                     String startUser= MapUtil.getStr(historicProcessInstance.getProcessVariables(),START_USER_INFO);
                     UserInfo user=  JSONObject.parseObject(startUser, UserInfo.class);
-                    String Types= MapUtil.getStr(historicProcessInstance.getProcessVariables(),ORDER_TYPE);
+                    String Types= MapUtil.getStr(historicProcessInstance.getProcessVariables(),TYPE_ORDER);
                     sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
 
                     sendReq.setBizType("pass/"+Types);

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

@@ -209,7 +209,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
         startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
         startProcessInstanceDTO.setOrderId(busForm.getId());
-        startProcessInstanceDTO.setOrderType("bussinessOrder");
+        startProcessInstanceDTO.setTypeOrder("bussinessOrder");
         startProcessInstanceDTO.setUserId(req.getApplyUserId());
         startProcessInstanceDTO.setBussinessType(req.getBussinessType());
         //设置领用人

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

@@ -103,7 +103,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
                 startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
                 startProcessInstanceDTO.setOrderId(BI.getId());
-                startProcessInstanceDTO.setOrderType("stocktakeOrder");
+                startProcessInstanceDTO.setTypeOrder("stocktakeOrder");
                 startProcessInstanceDTO.setType("stocktakeDto");
                 String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
                 BI.setProcessId(ProcessInstanceId);
@@ -162,7 +162,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
                 startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
                 startProcessInstanceDTO.setOrderId(BI.getId());
-                startProcessInstanceDTO.setOrderType("stocktakeOrder");
+                startProcessInstanceDTO.setTypeOrder("stocktakeOrder");
 //            startProcessInstanceDTO.setUserId(req.getUserId());
                 String processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
 

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

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -335,6 +336,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         //查询inventory表中数据，对响应数据进行修改
         //判断是对整一类的装备进行修改还是说对个别几个装备进行批量修改
 //        if (req.getInventoryIdList().size()!=0){
+        List<InventorySummary> delList=new ArrayList<>();
         PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
         int size = req.getInventoryIdList().size();
         List<Object[]> searchItem=new ArrayList<>();
@@ -344,7 +346,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
             searchItem.add(item);
             searchItem.add(item1);
             List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
-            if (inventorySummaryList.size()==1){
+            if (inventorySummaryList.size()==1){//等于1表示他修改后的单价的汇总信息没有，需要新增一条
                 InventorySummary is = inventorySummaryList.get(0);
                 is.setStockNumber(is.getStockNumber()-size);
                 is.setNumber(is.getNumber()-size);
@@ -353,6 +355,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 InventorySummary inventorySummary = new InventorySummary();
                 BeanPlusUtil.copyProperties(req,inventorySummary);
                 is.setValuekey(pubOrg.getOrgCode()+req.getTypeId()+req.getSizeId()+req.getLocationId()+req.getPrice());
+                inventorySummary.setValuekey(pubOrg.getOrgCode()+req.getLocationId()+req.getTypeId()+req.getSizeId()+req.getPrice());
                 inventorySummary.setOrgName(pubOrg.getOrgName());
                 inventorySummary.setOrgCode(pubOrg.getOrgCode());
                 inventorySummary.setNumber(size);
@@ -372,16 +375,22 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
                 inventorySummaryService.updateBatchById(inventorySummaryList);
             }else {
                 for (InventorySummary is:inventorySummaryList) {
-                    if (is.getUnitPrice().compareTo(req.getOriginalPrice())==0){
+                    if (is.getUnitPrice().compareTo(req.getOriginalPrice())==0){//如果单价和修改前的价格一致
                         is.setStockNumber(is.getStockNumber()-size);
                         is.setNumber(is.getNumber()-size);
                         is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
-                    }else {
+                        if (is.getNumber()==0 && is.getStockNumber()==0 && is.getOutboundNumber()==0 && is.getDestructionNumber()==0){
+                            delList.add(is);
+                        }
+                    }else {//单价和修改后的价格一致
                         is.setStockNumber(is.getStockNumber()+size);
                         is.setNumber(is.getNumber()+size);
                         is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
                     }
                 }
+                if (CollectionUtil.isNotEmpty(delList)){
+                    inventorySummaryService.removeBatchByIds(delList);
+                }
                 inventorySummaryService.updateBatchById(inventorySummaryList);
             }
         }

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

@@ -249,13 +249,13 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
            if (!req.getBussinessType().equals("quick") && req.getExamineState().equals("working"))//其他出入库单
            {
-               startProcessInstanceDTO.setOrderType("workOrder");
+               startProcessInstanceDTO.setTypeOrder("workOrder");
                processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
                
 
 
            }else if (req.getBussinessType().equals("quick") && req.getExamineState().equals("working")){//快速移库单
-               startProcessInstanceDTO.setOrderType("quickOrder");
+               startProcessInstanceDTO.setTypeOrder("quickOrder");
                processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
 
            }

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

@@ -1129,7 +1129,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
         startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
         startProcessInstanceDTO.setOrderId(reassignment.getId());
-        startProcessInstanceDTO.setOrderType("reassignment");
+        startProcessInstanceDTO.setTypeOrder("reassignment");
         startProcessInstanceDTO.setUserId(req.getUserId());
         startProcessInstanceDTO.setType("reassignmentDto");
         startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());

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

@@ -79,7 +79,7 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
             startProcessInstanceDTO.setOrderId(stocktake.getId());
-            startProcessInstanceDTO.setOrderType("stocktakeOrder");
+            startProcessInstanceDTO.setTypeOrder("stocktakeOrder");
             startProcessInstanceDTO.setUserId(req.getUserId());
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             stocktake.setProcessId(ProcessInstanceId);
@@ -113,7 +113,7 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
             StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
             startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
             startProcessInstanceDTO.setOrderId(stocktake.getId());
-            startProcessInstanceDTO.setOrderType("stocktakeOrder");
+            startProcessInstanceDTO.setTypeOrder("stocktakeOrder");
             startProcessInstanceDTO.setUserId(req.getUserId());
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             stocktake.setProcessId(ProcessInstanceId);

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

@@ -136,7 +136,7 @@ public class TjServiceImpl implements TjService {
                     req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
             allData.add(OrgData);
         }
-if (!req.getOrgId().equals("1369509498032808905"))
+if (req.getOrgId()!=1369509498032808905L)
 {
     TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
             req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),

jyzb-biz/src/main/resources/mapper/DeviceConfigMapper.xml

@@ -60,12 +60,12 @@
     </select>
     <select id="alignDeviceConfigInfo" resultType="java.lang.String">
         select device_config from base_device_config where org_id=#{orgId}
-        <if test="deviceCode != null and deviceCode != ''">
-            and device_code=#{deviceCode}
-        </if>
-        <if test="deviceCode == null or deviceCode == ''">
-            and device_type=0
-        </if>
+<!--        <if test="deviceCode != null and deviceCode != ''">-->
+<!--            and device_code=#{deviceCode}-->
+<!--        </if>-->
+<!--        <if test="deviceCode == null or deviceCode == ''">-->
+<!--            and device_type=0-->
+<!--        </if>-->
         <if test="date != null and date!= ''">
             and update_time &gt; #{date}
         </if>

jyzb-biz/src/main/resources/mapper/InventoryMapper.xml

@@ -479,7 +479,8 @@
         SELECT bi.id,bi.type_id,bi.size_id,bi.supplier_id,bi.shelf_id,bi.shelf_location,bi.epc,
                bi.org_id_int as org_id,bi.state,bi.bussiness_state,bi.location_state,
                bi.production_date,bi.warranty_period,bi.maintenance_period,bi.location_id,
-               bi.location_type,bi.term_state,bi.area_id,po.org_name, es.name, et.name, bs.name, bw.name
+               bi.location_type,bi.term_state,bi.area_id,po.org_name, es.name as size_name,
+               et.name as type_name, bs.name as supplier_name, bw.name as location_name
         FROM base_inventory bi
                  JOIN pub_org po ON po.org_id = bi.org_id_int
                  JOIN base_equipment_size es ON es.id = bi.size_id
@@ -494,14 +495,15 @@
         SELECT bi.id,bi.type_id,bi.size_id,bi.supplier_id,bi.shelf_id,bi.shelf_location,bi.epc,
             bi.org_id_int as org_id,bi.state,bi.bussiness_state,bi.location_state,
             bi.production_date,bi.warranty_period,bi.maintenance_period,bi.location_id,
-            bi.location_type,bi.term_state,bi.area_id, po.org_name, es.name, et.name, bs.name, bc.name
+            bi.location_type,bi.term_state,bi.area_id, po.org_name,es.name as size_name,
+        et.name as type_name, bs.name as supplier_name, bc.name as location_name
         FROM base_inventory bi
-                 JOIN pub_org po ON po.org_id = bi.org_id_int
-                 JOIN base_equipment_size es ON es.id = bi.size_id
-                 JOIN base_equipment_type et ON et.id = bi.type_id
-                 JOIN base_supplier bs ON bs.id = bi.supplier_id
-                 JOIN base_cabinet_box bcb ON bcb.id = bi.location_id
-                 JOIN base_cabinet bc ON bc.id = bcb.cabinet_id
+                  JOIN pub_org po ON po.org_id = bi.org_id_int
+                  JOIN base_equipment_size es ON es.id = bi.size_id
+                  JOIN base_equipment_type et ON et.id = bi.type_id
+                  JOIN base_supplier bs ON bs.id = bi.supplier_id
+                  JOIN base_cabinet_box bcb ON bcb.id = bi.location_id
+                  JOIN base_cabinet bc ON bc.id = bcb.cabinet_id
         WHERE bi.location_type = 1 AND epc IN
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -473,8 +473,13 @@
                  LEFT JOIN `base_inventory_summary` `bis` ON `po`.`org_id` = `bis`.`org_id_int`
         WHERE
 
-            `po`.`del_flag` = 1 and (po.org_id=#{orgId} or `po`.org_parent_id=#{orgId})
-          and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
+            `po`.`del_flag` = 1 and (po.org_id=#{orgId} or (`po`.org_parent_ids like  CONCAT('%', #{orgId}, '%')
+          <if test="levelNum !=0">
+              AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
+          </if>
+        ))
+          and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
+               `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
             AND type_id IN
             <foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
@@ -738,30 +743,38 @@
     </select>
     <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
 
-        SELECT wi.*, i.supplier_id, i.price, i.state, i.bussiness_state,
-        i.production_date, i.warranty_period, i.maintenance_period, i.term_state,
-        i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
-        bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
-        es.photo as photo,es.instructions as instructions
+        SELECT wi.type_id,wi.size_id,wi.shelf_id,wi.shelf_location, wi.epc,wi.org_id,wi.location_state,
+               wi.location_type,wi.location_id,i.id,i.supplier_id,i.price,i.state,i.bussiness_state,
+               i.production_date,i.warranty_period,i.maintenance_period, i.term_state,
+               i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
+               bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
+               es.photo as photo,es.instructions as instructions
         FROM base_warehouse_inventory wi
         LEFT JOIN base_inventory i ON i.epc = wi.epc
-        JOIN base_equipment_type et ON et.id = i.type_id
-        JOIN base_equipment_size es ON es.id = i.size_id
-        JOIN pub_org po ON i.org_id_int = po.org_id
+        LEFT JOIN base_equipment_type et ON et.id = i.type_id
+        LEFT JOIN base_equipment_size es ON es.id = i.size_id
+        LEFT JOIN pub_org po ON i.org_id_int = po.org_id
         LEFT JOIN base_supplier bs ON bs.id = i.supplier_id
         LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id AND i.location_type = 1
         LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id
         LEFT JOIN base_warehouse bw ON i.location_id = bw.id AND i.location_type = 0
-        WHERE wi.org_id_int=#{req.orgId} and wi.type_id=#{req.typeId}
+        WHERE wi.org_id=#{req.orgId} and wi.type_id=#{req.typeId}
         <if test="req.locationType !='all' and req.locationType != null">
             and wi.location_type=#{req.locationType}
         </if>
+        <if test="req.termState!= -1">
+          and i.term_state=#{req.termState}
+        </if>
+        <if test="req.locationState!=all and req.locationState !=null and req.locationState!=''">
+          and i.location_state=#{req.locationState}
+        </if>
         <if test="req.sizeId !=null and req.sizeId != ''">
             and wi.size_id=#{req.sizeId}
         </if>
         <if test="req.price !=null and req.price != ''">
-            and wi.price=#{req.price}
+            and i.price=#{req.price}
         </if>
+
         ORDER BY wi.type_id,i.size_id
         <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
             limit #{pageNo},#{pageSize}

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

@@ -14,7 +14,7 @@ public interface CommonConstants {
     String PROCESS_STATUS="processStatus";
     String START_USER_INFO="startUser";
     String ORDER_ID="orderId";
-    String ORDER_TYPE="orderType";
+    String TYPE_ORDER="typeOrder";
     String START_ORG_NAME="startOrgName";//发物单位
     String END_ORG_NAME="endOrgName";//收物单位
     String INVLIST="invList";//装备列表拼接

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

@@ -19,7 +19,7 @@ public class StartProcessInstanceDTO {
     private JSONObject formData;
     private String orderId;
     //单据类型（入库单，出库单，业务单）
-    private String orderType;
+    private String typeOrder;
     private String userId;
     private String triggerId;
     //发物单位

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

@@ -675,7 +675,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             Map<String,Object> processVariables= new HashMap<>();
             processVariables.put(FORM_VAR,formData);
             processVariables.put(ORDER_ID,processInstanceDto.getOrderId());
-            processVariables.put(ORDER_TYPE,processInstanceDto.getOrderType());
+            processVariables.put(TYPE_ORDER,processInstanceDto.getTypeOrder());
             processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser));
             processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
             ArrayList<LoginUser> userInfos = CollUtil.newArrayList(StartUser);
@@ -854,7 +854,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
             String Name= bpmnModel.getMainProcess().getName();
             historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
-            historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            historyProcessInstanceVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             historyProcessInstanceVO.setType(MapUtil.getStr(processVariables, TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
@@ -923,7 +923,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             SysUser staruser= sysUserService.getById(startUserId);
             taskVO.setStartUser(this.SetUser(staruser));
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
-            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            taskVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             taskVO.setType(MapUtil.getStr(processVariables, TYPE));
             taskVO.setStartTime(processInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
@@ -996,7 +996,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             taskVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
             }));
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
-            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            taskVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             taskVO.setType(MapUtil.getStr(processVariables, TYPE));
             taskVO.setStartTime(historicProcessInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId()));

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

@@ -139,7 +139,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
         processVariables.put(FORM_VAR,formData);
         processVariables.put(FORM_Trigger,processInstanceDto.getTriggerId());//获取触发器信息
         processVariables.put(ORDER_ID,processInstanceDto.getOrderId());
-        processVariables.put(ORDER_TYPE,processInstanceDto.getOrderType());
+        processVariables.put(TYPE_ORDER,processInstanceDto.getTypeOrder());
         processVariables.put(BUSSINESS_TYPE,processInstanceDto.getBussinessType());
         //单据类型
         processVariables.put(TYPE,processInstanceDto.getType());

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

@@ -294,7 +294,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(task.getProcessInstanceId()).singleResult();
             String startUser= MapUtil.getStr(processInstance.getProcessVariables(),START_USER_INFO);
             UserInfo user=  JSONObject.parseObject(startUser, UserInfo.class);
-            String Types= MapUtil.getStr(processInstance.getProcessVariables(),ORDER_TYPE);
+            String Types= MapUtil.getStr(processInstance.getProcessVariables(),TYPE_ORDER);
             String bussinessType= MapUtil.getStr(processInstance.getProcessVariables(),BUSSINESS_TYPE);
             sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
 //            sendReq.setBizId(Long.valueOf(processInstance.getProcessInstanceId()));
@@ -492,7 +492,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
             taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
-            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            taskVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             taskVO.setStartTime(processInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
             taskVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS));
@@ -542,7 +542,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks()
                 .orderByTaskCreateTime().desc();
 
-        historicTaskQuery = historicTaskQuery.processVariableValueNotEquals(ORDER_TYPE,"stocktakeOrder");
+        historicTaskQuery = historicTaskQuery.processVariableValueNotEquals(TYPE_ORDER,"stocktakeOrder");
         //根据条件查询（流程名称，开始时间，结束时间）
         if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
             historicTaskQuery = historicTaskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
@@ -610,7 +610,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
             taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             taskVO.setType(MapUtil.getStr(processVariables,TYPE));
-            taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            taskVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             taskVO.setStartTime(historicProcessInstance.getStartTime());
             taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId()));
             taskVO.setBusinessStatus(MapUtil.getStr(processVariables, PROCESS_STATUS));
@@ -683,7 +683,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (ObjectUtil.isNotNull(applyDTO.getEndTime())) {
             desc = desc.startedBefore(applyDTO.getEndTime());
         }
-        desc = desc.variableValueNotEquals(ORDER_TYPE,"stocktakeOrder");
+        desc = desc.variableValueNotEquals(TYPE_ORDER,"stocktakeOrder");
         //装备名称
         if (ObjectUtil.isNotNull(applyDTO.getTypeName()) && ! applyDTO.getTypeName().trim().isEmpty()){
             desc=desc.variableValueLike(INVLIST,"%"+applyDTO.getTypeName()+"%");
@@ -726,7 +726,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             String Name= bpmnModel.getMainProcess().getName();
 
             historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
-            historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
+            historyProcessInstanceVO.setTypeOrder(MapUtil.getStr(processVariables, TYPE_ORDER));
             historyProcessInstanceVO.setType(MapUtil.getStr(processVariables,TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
 //            historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {

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

@@ -24,7 +24,7 @@ public class HistoryProcessInstanceVO {
     @ApiModelProperty("单据ID")
     private String orderId;
     @ApiModelProperty("单据类型")
-    private String orderType;
+    private String typeOrder;
     @ApiModelProperty("提交时间")
     private Date startTime;
     @ApiModelProperty("结束时间")

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

@@ -22,7 +22,7 @@ public class TaskVO {
     @ApiModelProperty("订单表ID")
     private String orderId;
     @ApiModelProperty("订单类型")
-    private String orderType;
+    private String typeOrder;
     @ApiModelProperty("审批类型")
     private String processDefinitionName;
     @ApiModelProperty("发起人")