订单流程状态

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java

@@ -59,4 +59,9 @@ public class OrderSelectDto extends BaseSelectDto {
      */
     private String compareStr;
 
+    /**
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
+     */
+    private Integer flowStatus;
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -110,6 +110,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.eq("o", OrderInfo::getSettlementStatus, dto.getSettlementStatus());
         wrapper.ge("o", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
+        wrapper.eq("o", OrderInfo::getFlowStatus, dto.getFlowStatus());
         wrapper.and(q -> q
                 .and(r -> r.eq("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 2))
                 .or(r -> r.ne("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 1))

sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -46,7 +46,9 @@
                o.create_time,
                o.update_user,
                o.update_time,
-               d.name departmentName
+               d.name departmentName,
+               o.flow_id,
+               o.flow_status
         from order_info o
                  left join department d on d.id = o.department_id
             ${ew.customSqlSegment}