添加查询条件

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

@@ -18,6 +18,8 @@ public class LogDetailDto implements Serializable {
      */
     private String inventoryId;
 
+    private String bussinessType;
+
     /**
      * 出入库汇总ID
      */

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

@@ -19,9 +19,7 @@ public class OrderMainReq extends BaseRequest {
 
     @NotBlank(message = "业务类型不能为空",groups = {edit.class})
     private String orderType;
-
-    private String processInstanceId;
-
+    //实例流程id
     private String processId;
 
     private String bussinessType;

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

@@ -24,9 +24,11 @@ public class QueryReassignmentReq extends BaseRequest {
     private String agent;
 
     /**
-     * 工作流id
+     * 工作流定义id
      */
     private String processDefinitionId;
+    //实例id
+    private String processId;
 
     private String orderCode;
 

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

@@ -32,6 +32,8 @@ public class UpdateReassignmentReq extends BaseRequest {
      */
     private String processDefinitionId;
 
+    private String processId;
+
     /**
      * 业务类型
      */

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

@@ -472,7 +472,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>()
                 //组织机构
                 .eq(ObjectUtil.isNotNull(req.getOrgId()) && !req.getBussinessType().equals("allocate"),BusForm::getOrgId,req.getOrgId())
-
+                .eq(ObjectUtil.isNotNull(req.getProcessId()),BusForm::getProcessId,req.getProcessId())
                 //装备名称模糊查询
                 .like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getInvList,req.getTypeName())
                 //单号

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

@@ -1058,7 +1058,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         if (req.getOrderType().equals("workOrder")){
             OrderDto orderDto = new OrderDto();
             OrderMain one = getOne(new LambdaQueryWrapper<OrderMain>()
-                    .eq(OrderMain::getProcessId, req.getProcessInstanceId()));
+                    .eq(OrderMain::getProcessId, req.getProcessId()));
             if (ObjectUtil.isNull(one)){
                 return processOrderDto;
             }
@@ -1075,19 +1075,19 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         } else if (req.getOrderType().equals("bussinessOrder")) {
             BusFormDto busFormDto = new BusFormDto();
             BusForm one = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
-                    .eq(BusForm::getProcessId, req.getProcessInstanceId()));
+                    .eq(BusForm::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,busFormDto);
             processOrderDto.setBusFormDto(busFormDto);
         } else if (req.getOrderType().equals("stacktakeOrder")) {
             StocktakeDto stocktakeDto = new StocktakeDto();
             Stocktake one = stocktakeService.getOne(new LambdaQueryWrapper<Stocktake>()
-                    .eq(Stocktake::getProcessId, req.getProcessInstanceId()));
+                    .eq(Stocktake::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,stocktakeDto);
             processOrderDto.setStocktakeDto(stocktakeDto);
         } else if (req.getOrderType().equals("reassigment")) {
             ReassignmentDto reassignmentDto = new ReassignmentDto();
             Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()
-                    .eq(Reassignment::getProcessId, req.getProcessInstanceId()));
+                    .eq(Reassignment::getProcessId, req.getProcessId()));
             BeanPlusUtil.copyProperties(one,reassignmentDto);
             processOrderDto.setReassignmentDto(reassignmentDto);
         }

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

@@ -1099,6 +1099,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         LambdaQueryWrapper<Reassignment> eq = new LambdaQueryWrapper<Reassignment>()
                 .eq(ObjectUtil.isNotNull(req.getOrgId()), Reassignment::getOrgId, req.getOrgId())
                 .eq(ObjectUtil.isNotNull(req.getReassignmentType()),Reassignment::getReassignmentType,req.getReassignmentType())
+                .eq(ObjectUtil.isNotNull(req.getProcessId()),Reassignment::getProcessId,req.getProcessId())
                 .eq(ObjectUtil.isNotNull(req.getExamineState()) && !req.getExamineState().trim().isEmpty(), Reassignment::getExamineState, req.getExamineState())
                 .like(ObjectUtil.isNotNull(req.getPoliceName()), Reassignment::getPoliceName, req.getPoliceName())
                 .like(ObjectUtil.isNotNull(req.getTypeName()),Reassignment::getInvList,req.getTypeName())

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

@@ -72,6 +72,9 @@
         <if test="null !=  req.bussinessType  and '' != req.bussinessType  ">
         and bussiness_type = #{req.bussinessType}
         </if>
+        <if test="null !=  req.processId  and '' != req.processId  ">
+            and process_id=#{req.processId}
+        </if>
         <if test="null !=  req.typeName  and '' != req.typeName  ">
             and inv_list like concat('%',#{req.typeName},'%')
         </if>