工单jsm修复返回所有数据问题

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

@@ -6,6 +6,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -2463,26 +2464,24 @@ public class OrderBaseLogic {
     }
 
     public IPage<PgOrderBaseDetail> orderDetailJsmMini(JsmWorkerOrder jsmWorkerOrder) {
-
+        log.info("工单jsm请求参数: {}", JSONUtil.toJsonStr(jsmWorkerOrder));
+        if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds())) {
+            return new Page<PgOrderBaseDetail>();
+        }
 
 
         IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
-                .isNull(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"),PgOrderBase::getAppointmentTime)
-                .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","WDBH","XSBH","TJXSBH","ZBBH","FZXBH")
-                .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DPJ"),PgOrderBase::getAppraiseStatus,"N")
-                .isNotNull(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DPJ"),PgOrderBase::getOverTime)
-
-                .in(!StringUtil.isEmpty(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("YWC"),PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
-
-                .and(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()) && !StringUtil.isEmpty(jsmWorkerOrder.getMobile()),item ->
-                                item.in(PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
-                                .or()
-                .eq(PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
-                )
-                .eq(!StringUtil.isEmpty(jsmWorkerOrder.getOrderId()),PgOrderBase::getSaleOrderId,jsmWorkerOrder.getOrderId())
+                .in(StringUtils.isBlank(jsmWorkerOrder.getMobile()), PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                .isNull(StringUtils.isNotBlank(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DYY"), PgOrderBase::getAppointmentTime)
+                .notIn(StringUtils.isNotBlank(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(StringUtils.isNotBlank(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", "WDBH", "XSBH", "TJXSBH", "ZBBH", "FZXBH")
+                .in(StringUtils.isNotBlank(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DPJ"), PgOrderBase::getAppraiseStatus, "N")
+                .isNotNull(StringUtils.isNotBlank(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("DPJ"), PgOrderBase::getOverTime)
+                .in(StringUtils.isNotBlank(jsmWorkerOrder.getStatus()) && jsmWorkerOrder.getStatus().equals("YWC"), PgOrderBase::getOrderStatus, "YWG", "GCSZX", "WDWG", "YWGO", "YJS", "LRCD")
+                .eq(StringUtils.isNotBlank(jsmWorkerOrder.getMobile()), PgOrderBase::getUserMobile, jsmWorkerOrder.getMobile())
+                .eq(StringUtils.isNotBlank(jsmWorkerOrder.getOrderId()), PgOrderBase::getSaleOrderId, jsmWorkerOrder.getOrderId())
                 .orderByDesc(PgOrderBase::getCreateTime)
                 .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
 
@@ -2531,13 +2530,20 @@ public class OrderBaseLogic {
     }
 
     public IPage<PgOrderBaseDetail> orderDetailJsmMiniOne(JsmWorkerOrder jsmWorkerOrder) {
+        log.info("工单jsm详情请求参数: {}", JSONUtil.toJsonStr(jsmWorkerOrder));
         IPage pgOrderBases;
         if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds())
                 && StringUtils.isNotBlank(jsmWorkerOrder.getOrderId())) {
             pgOrderBases = pgOrderBaseService.lambdaQuery()
-                    .eq(PgOrderBase::getSaleOrderId, jsmWorkerOrder.getOrderId())
+                    .eq(PgOrderBase::getId, jsmWorkerOrder.getOrderId())
                     .orderByDesc(PgOrderBase::getCreateTime)
                     .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+            if (CollectionUtils.isEmpty(pgOrderBases.getRecords())) {
+                pgOrderBases = pgOrderBaseService.lambdaQuery()
+                        .eq(PgOrderBase::getSaleOrderId, jsmWorkerOrder.getOrderId())
+                        .orderByDesc(PgOrderBase::getCreateTime)
+                        .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+            }
         } else {
             pgOrderBases = pgOrderBaseService.lambdaQuery()
                     .in(PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())