需求

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

@@ -230,12 +230,18 @@ public class OrderBaseLogic {
             orderStatusList.add(OrderBaseStatusEnum.BFWG.getKey());
             orderStatusList.add(OrderBaseStatusEnum.YZP.getKey());
             orderStatusList.add(OrderBaseStatusEnum.DSM.getKey());
+
+            orderStatusList.add(OrderBaseStatusEnum.WDBH.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.XSBH.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.TJXSBH.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.ZBBH.getKey());
+            orderStatusList.add(OrderBaseStatusEnum.FZXBH.getKey());
         }
 
         Page page = pgOrderBaseService.lambdaQuery()
                 .eq(PgOrderBase::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-                .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()
+                .notIn(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.YQX.getKey(),OrderBaseStatusEnum.FWZT.getKey(),OrderBaseStatusEnum.FL.getKey(),
+                        OrderBaseStatusEnum.YCGB.getKey() ,OrderBaseStatusEnum.FWQX.getKey()
                         )
                 .ne(isYb != null && isYb,PgOrderBase::getPgIncreOrderId,"")
                 .ne(isWb != null && isWb,PgOrderBase::getRpProjectRepairId,"")

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

@@ -5,7 +5,7 @@
     <select id="countOrderStatus" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">
          select
             count(DISTINCT if((is_import_excel = false and a.order_status='DJD') or (is_import_excel = true and a.is_meet = false) ,a.id,null)) 'djd',
-            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP')  and a.is_meet = true,a.id,null)) 'fwz',
+            count(DISTINCT if(a.order_status in ('FWZ','GCSZT','BFWG','DSM','YZP','XSBH','TJXSBH','ZBBH','FZXBH','WDBH')  and a.is_meet = true,a.id,null)) 'fwz',
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
             count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'ywg',
@@ -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 not in ('YQX','XSBH','FWQX','FL','TJXSBH','ZBBH','FZXBH','LRCD')
+    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -231,6 +231,7 @@ public class OrderBaseLogic {
         orderBase.setIsQd(orderAddBeanDTO.getIsQd());
         orderBase.setIsQdNotice(true);
         orderBase.setId(orderBaseId);
+        orderBase.setIsImportExcel(old.getIsImportExcel() != null?old.getIsImportExcel():false);
         orderBase.setIsMeet(true);