add

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceUploadListServiceImpl.java

@@ -11,6 +11,7 @@ import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.utils.DataUtil;
 import com.zfire.jiasm.syncdata.utils.PrepareTaskLog;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -57,18 +58,25 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         log.info("开始预处理需要上传的工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        Test orderno = testService.lambdaQuery()
-                .eq(Test::getFlag,1)
-                .last("limit 1").one();
-        if (orderno==null){
+        List<String> orderNos = new ArrayList<>();
+        List<Test> orderno = testService.lambdaQuery()
+                .eq(Test::getFlag,1).list();
+        if (CollectionUtils.isEmpty(orderno)){
             return;
         }
+        orderno.stream().forEach(event->{
+            orderNos.add(event.getId());
+        });
+        orderno.clear();
+
+
+
 
         // 从需要上传的订单数据表中提取数据
         taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId, 20916)// 测试用
-                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId)
                 .list();
         try {

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -1004,7 +1004,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                         (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
                                 ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
 
-log.info("测试信息a   id={} ",ojtutl.getSynReqId());
+                    log.info("测试信息a   id={} ",ojtutl.getSynReqId());
 
 
                     // 生成taskno,pgwcmxid 共用

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -16,6 +16,7 @@ import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.RepairProduceUploadListService;
 import com.zfire.jiasm.syncdata.utils.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -70,19 +71,23 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         log.info("开始预处理需要上传的维修工单数据: \uF0B7{}",sdf.format(new Date()));
 
         //测试使用
-        Test orderno = testService.lambdaQuery()
-                .eq(Test::getFlag,1)
-                .last("limit 1").one();
-        if (orderno==null){
+        List<String> orderNos = new ArrayList<>();
+        List<Test> orderno = testService.lambdaQuery()
+                .eq(Test::getFlag,1).list();
+        if (CollectionUtils.isEmpty(orderno)){
             return;
         }
+        orderno.stream().forEach(event->{
+            orderNos.add(event.getId());
+        });
+        orderno.clear();
 
 
         // 从需要上传的订单数据表中提取数据
         List<OutJiasmToGreeUploadnotifylist> taskResults = outJiasmToGreeUploadnotifylistService.lambdaQuery()
                 .eq(OutJiasmToGreeUploadnotifylist::getSynStatus,0)
                 // .eq(OutJiasmToGreeUploadnotifylist::getSynReqId,20916)// 测试用
-                .eq(OutJiasmToGreeUploadnotifylist::getOrderNo, orderno.getId())// 测试用
+                .in(OutJiasmToGreeUploadnotifylist::getOrderNo, orderNos)// 测试用
                 .orderByAsc(OutJiasmToGreeUploadnotifylist::getSynReqId).list();
         try{
             Token token = tokenCenter.getCurrentToken();