From 6e873adc94aaeb4f918cf4fd45f7bdf936f45db4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十二月 2023 08:58:19 +0800
Subject: [PATCH] 羚羊数据导入
---
server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
index 9fc1fcf..8f42773 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java
@@ -134,7 +134,7 @@
com.setLinkPhone(user.getLinkPhone());
com.setAddr(user.getAddr());
com.setFileStoreAddr(user.getFileStoreAddr());
- com.setOpenUserNum(-1);
+ com.setOpenUserNum(Constants.formatIntegerNum(user.getOpenUserNum()));
com.setShortName(user.getRemark());
com.setOpenModules(Constants.ONE+"");
com.setOepnType(user.getOepnType());
@@ -146,15 +146,15 @@
// 鎻掑叆 浼佷笟璐︽埛寮�閫氬巻鍙茶褰曡〃
CompanyOpen companyOpen = new CompanyOpen();
companyOpen.setDeleted(Constants.ZERO);
-// companyOpen.setCreateUser();
companyOpen.setCreateTime(new Date());
-// companyOpen.setUpdateUser();
companyOpen.setUpdateTime(new Date());
companyOpen.setCompanyId(com.getId());
-// companyOpen.setUserNum();
-// companyOpen.setModules();
companyOpen.setValidDate(user.getOepnValidDate());
companyOpen.setOepnType(user.getOepnType());
+// companyOpen.setCreateUser();
+// companyOpen.setUpdateUser();
+// companyOpen.setUserNum();
+// companyOpen.setModules();
companyOpenExtMapper.insert(companyOpen);
//鍒涘缓鏍圭洰褰�
@@ -243,7 +243,6 @@
}
}
initRedisCache(com);
-
systemUserBiz.importPlat(user,pwd,com);
return com.getId();
}
@@ -332,7 +331,7 @@
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public Company createByLingyang(UserDTO user, String pwd){
+ public Company createByLingyang(UserDTO user,Date date,String remark, String pwd){
AutoLoginUserDTO param = new AutoLoginUserDTO();
param.setOrgName(user.getOrgName());
param.setName(user.getName());
@@ -342,6 +341,8 @@
param.setManager(user.getManager());
param.setUserinfo(JSONObject.toJSONString(user));
param.setOrigin(Constants.COMPANY_ORIGIN.lingyang);
+ param.setDate(date!=null ?date:new Date());
+ param.setRemark(remark);
return createByThirdParam(param,pwd);
}
public Company createByThirdParam(AutoLoginUserDTO user, String pwd){
@@ -357,12 +358,15 @@
//濡傛灉浼佷笟淇℃伅涓虹┖锛屾柊澧炰紒涓氫俊鎭�
com = new Company();
com.setDeleted(Constants.ZERO);
- com.setCreateTime(new Date());
+ com.setCreateTime(user.getDate()!=null?user.getDate():new Date());
+ com.setIsNew(Constants.ONE);
// com.setOrigin(Constants.THREE);
com.setCreditCode(user.getCreditCode());
com.setName(user.getOrgName());
com.setLingyangInfo(user.getUserinfo());
com.setLegalPersonPhone(user.getPhone());
+ //娴嬭瘯缇氱緤鎵嬪姩瀵煎叆锛堟爣璁帮級
+ com.setRemark(user.getRemark());
//榛樿闄愬埗浜哄憳10
if(user.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
int userNum = 10;
--
Gitblit v1.9.3