更改

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/ygz/YgzDataSendManagerImpl.java

@@ -37,7 +37,7 @@ public class YgzDataSendManagerImpl extends AbstractCommManager implements YgzDa
             List<YgzInterfaceLog> logs = logRepo.listBySendStatusLessThen5Times(YgzSendStatus.WAIT_SEND);
             logger.info("营改增---查询营改增记录条数：{}", logs.size());
             for (YgzInterfaceLog log : logs) {
-                executor.execute(() -> {
+//                executor.execute(() -> {
                     try {
                         switch (log.getNioTransferType()) {
                             case USERUPLOAD:
@@ -64,7 +64,7 @@ public class YgzDataSendManagerImpl extends AbstractCommManager implements YgzDa
                     } catch (Exception e) {
                         logger.error("营改增定时器异常：", e);
                     }
-                });
+//                });
             }
         } catch (Exception e) {
             logger.error("营改增定时器异常：", e);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/nio/AbstractCommNioManager.java

@@ -83,7 +83,7 @@ public class AbstractCommNioManager extends AbstractManager {
             oldLog.setStatus(log.getStatus());
             oldLog.setErrorMsg(log.getErrorMsg());
             oldLog.setUpdateTime(LocalDateTime.now());
-            logRepo.save(oldLog);
+            logRepo.merge(oldLog);
             return;
         }else{
             //成功