admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jiuzhu' into jiuzhu

Browse Source
This commit is contained in:
guoshengxiong 2024-09-10 21:30:37 +08:00
commit bc85884bfd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java
View File

@ -82,9 +82,9 @@ public class BaseDataController {
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject companyObj = jsonArray.getJSONObject(i); JSONObject companyObj = jsonArray.getJSONObject(i);
Company company = new Company(); Company company = new Company();
// company.setCompanySn(companyObj.getString("subcompanycode")); company.setCompanySn(companyObj.getString("subcompanycode"));
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); // String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
company.setCompanySn(uuid); // company.setCompanySn(uuid);
company.setCompanyName(companyObj.getString("subcompanyname")); company.setCompanyName(companyObj.getString("subcompanyname"));
company.setExternalId(companyObj.getString("id")); company.setExternalId(companyObj.getString("id"));
company.setCreateTime(DateUtil.formatDateTime(new Date())); company.setCreateTime(DateUtil.formatDateTime(new Date()));
@ -132,10 +132,10 @@ public class BaseDataController {
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject companyObj = jsonArray.getJSONObject(i); JSONObject companyObj = jsonArray.getJSONObject(i);
Company company = new Company(); Company company = new Company();
// company.setCompanySn(companyObj.getString("departmentcode")); company.setCompanySn(companyObj.getString("departmentcode"));
company.setCompanyName(companyObj.getString("departmentname")); company.setCompanyName(companyObj.getString("departmentname"));
String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); // String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
company.setCompanySn(uuid); // company.setCompanySn(uuid);
company.setExternalId(companyObj.getString("id")); company.setExternalId(companyObj.getString("id"));
company.setCreateTime(DateUtil.formatDateTime(new Date())); company.setCreateTime(DateUtil.formatDateTime(new Date()));
company.setCompanyType(4); company.setCompanyType(4);