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 19:01:13 +08:00
commit dc71befc33
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +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();
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()));

1
src/main/java/com/zhgd/xmgl/util/JiuzhuDateUtil.java
View File

@ -113,6 +113,7 @@ public class JiuzhuDateUtil {
.eq(DictionaryItem::getName, xmlx) .eq(DictionaryItem::getName, xmlx)
.eq(DictionaryItem::getDictionaryEncoding, "project_lx")); .eq(DictionaryItem::getDictionaryEncoding, "project_lx"));
project.setProjectLx(projectLx.getData()); project.setProjectLx(projectLx.getData());
project.setNature(projectObj.getString("xmlxxm").equals("0") ? 1 : 2);
projectList.add(project); projectList.add(project);
} }
projectService.saveOrUpdateBatch(projectList); projectService.saveOrUpdateBatch(projectList);