From 53fa646f57f7d10b843a584e2a4c7d9788374a20 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Jun 2021 16:03:07 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
index d82fffb..e8101fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.matrix.component.redis.RedisClient;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
@@ -241,6 +242,7 @@
}
}
+ // sys_users 中 id 为 200 的无法找到
Long staffId = sysVipInfo.getStaffId();
if (staffId != null) {
Object o = sysUsersMap.get(staffId.toString());
@@ -985,8 +987,8 @@
Long oldOrderId = sysOrder.getId();
sysOrder.setId(null);
sysOrder.setCreateBy("数据迁移");
- sysOrder.setCreateTime(sysOrder.getOrderTime());
- sysOrder.setUpdateTime(sysOrder.getOrderTime());
+ sysOrder.setCreateTime(sysOrder.getOrderTime() == null ? DateUtil.stringToDate("2018-10-17 19:03:28", DateUtil.DATE_FORMAT_SS) : sysOrder.getOrderTime());
+ sysOrder.setUpdateTime(sysOrder.getOrderTime() == null ? DateUtil.stringToDate("2018-10-17 19:03:28", DateUtil.DATE_FORMAT_SS) : sysOrder.getOrderTime());
sysOrderDao.insert(sysOrder);
orderIds.put(oldOrderId, sysOrder.getId());
@@ -1013,6 +1015,8 @@
}
flow.setOrderId(sysOrder.getId());
flow.setCreateBy("数据迁移");
+ flow.setCreateTime(sysOrder.getCreateTime());
+ flow.setUpdateTime(sysOrder.getUpdateTime());
sysOrderFlowDao.insert(flow);
}
}
--
Gitblit v1.9.1