diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java index e0d19264f..54756f0be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseDataController.java @@ -82,7 +82,9 @@ public class BaseDataController { for (int i = 0; i < jsonArray.size(); i++) { JSONObject companyObj = jsonArray.getJSONObject(i); Company company = new Company(); - company.setCompanySn(companyObj.getString("subcompanycode")); +// company.setCompanySn(companyObj.getString("subcompanycode")); + String uuid = UUID.randomUUID().toString().replace("-", "").toUpperCase(); + company.setCompanySn(uuid); company.setCompanyName(companyObj.getString("subcompanyname")); company.setExternalId(companyObj.getString("id")); company.setCreateTime(DateUtil.formatDateTime(new Date())); diff --git a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java index 6e24af522..44ddae7e4 100644 --- a/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java @@ -113,6 +113,7 @@ public class JiuzhuDateUtil { .eq(DictionaryItem::getName, xmlx) .eq(DictionaryItem::getDictionaryEncoding, "project_lx")); project.setProjectLx(projectLx.getData()); + project.setNature(projectObj.getString("xmlxxm").equals("0") ? 1 : 2); projectList.add(project); } projectService.saveOrUpdateBatch(projectList);