需求

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

@@ -2366,7 +2366,7 @@ public class OrderBaseLogic {
 
         IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .isNull(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getAppointmentTime)
-                .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB",
+                .notIn(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YQX","FWZT","YCGB",
                         "FWQX","FL","YJS","LRCD","DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP","DTJXSSPGP","DZBSPGP")
                 .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DFW"),PgOrderBase::getOrderStatus,"DSHPG","CJ","YPD","DXSPD","DZBPG","DWDSPGP","DXSSPGP","DTJXSSPGP","DZBSPGP","DFZXPD",
                         "DFZXSPGP","DWDPG","DWDPD","FWZ","GCSZT","BFWG","DSM","YZP","WDBH","XSBH","TJXSBH","ZBBH","FZXBH")
@@ -2390,7 +2390,7 @@ public class OrderBaseLogic {
 
             List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
                     .notIn(PgOrderOperatorLog::getType,"异常反馈","其他","改约",
-                            "异常反馈","完工反馈","回访","费用申请单","费用申请单审核","待件"
+                            "异常反馈","回访","费用申请单","费用申请单审核","待件"
                             ,"拉修","不接电话","延误","质量信息")
                     .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
                     .orderByDesc(PgOrderOperatorLog::getId)