需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/OrderBaseController.java

@@ -46,7 +46,7 @@ public class OrderBaseController {
             @ApiParam(value = "延保订单id",required = false) @RequestParam(required = false) String pgIncreOrderId,
             @ApiParam(value = "是否延保单 true=是 false=否",required = false) @RequestParam(required = false) Boolean isYb,
             @ApiParam(value = "是否维保 true=是 false=否",required = false) @RequestParam(required = false) Boolean isWb,
-            @ApiParam(value = "DJD=待接单，FWZ=服务中，YCD=异常待处理 YWG=已完工",required = false)@RequestParam(required = false) OrderBaseStatusEnum orderBaseStatus,
+            @ApiParam(value = "DJD=待接单，FWZ=服务中，YCD=异常待处理 YWG=已完工 DCL=待处理",required = false)@RequestParam(required = false) OrderBaseStatusEnum orderBaseStatus,
             @ApiParam(value = "1=今天 2=明天 3=其他",required = false) @RequestParam(required = false) Integer byDay,
             @ApiParam(value = "开始时间",required = false) @RequestParam(required = false) String startTime,
             @ApiParam(value = "结束时间",required = false) @RequestParam(required = false) String endTime,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/workorder/OrderBaseStatusEnum.java

@@ -57,6 +57,7 @@ public enum OrderBaseStatusEnum implements BaseEnum {
     FWQX("FWQX","服务取消"),
     FL("FL","分流3.0"),
     YWGO("YWGO","已完工"),
+    DCL("DCL","待处理"),
     ;
 
     @EnumValue

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -234,7 +234,9 @@ public class OrderBaseLogic {
 
         Page page = pgOrderBaseService.lambdaQuery()
                 .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-                .ne(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey())
+                .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.XSBH.getKey(),OrderBaseStatusEnum.FWQX.getKey(),OrderBaseStatusEnum.FL.getKey(),
+                        OrderBaseStatusEnum.TJXSBH.getKey() ,OrderBaseStatusEnum.ZBBH.getKey(),OrderBaseStatusEnum.FZXBH.getKey(),OrderBaseStatusEnum.LRCD.getKey()
+                        )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")
                 .eq(StringUtils.isNotBlank(pgIncreOrderId),PgOrderBase::getPgIncreOrderId,pgIncreOrderId)

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -15,7 +15,7 @@
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id
-    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status!='YQX'
+    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','XSBH','FWQX','FL','TJXSBH','ZBBH','FZXBH','LRCD')
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>