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

调整

Browse Source
This commit is contained in:
pengjie 2024-09-09 16:11:45 +08:00
parent 24bfd2bb10
commit 6ca42bae44
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -294,17 +294,16 @@
</dependency> </dependency>
<!--mysql--> <!--mysql-->
<dependency> <!-- <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.48</version> <version>5.1.48</version>
</dependency> </dependency>-->
<!--<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.11</version> <version>8.0.11</version>
</dependency> </dependency>
-->
<!-- Swagger API文档 --> <!-- Swagger API文档 -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>

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

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