From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 b890b41..2ba4b04 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();
}
@@ -276,6 +275,7 @@
com.setOepnValidDate(user.getOepnValidDate());
com.setLinker(user.getLinkName());
com.setLinkPhone(user.getLinkPhone());
+ com.setOpenUserNum(user.getOpenUserNum());
com.setAddr(user.getAddr());
com.setFileStoreAddr(user.getFileStoreAddr());
com.setShortName(user.getRemark());
@@ -331,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());
@@ -341,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){
@@ -356,19 +358,32 @@
//濡傛灉浼佷笟淇℃伅涓虹┖锛屾柊澧炰紒涓氫俊鎭�
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.setOpenUserNum(-1);
+ //娴嬭瘯缇氱緤鎵嬪姩瀵煎叆锛堟爣璁帮級
+ com.setRemark(user.getRemark());
+ //榛樿闄愬埗浜哄憳10
+ if(user.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
+ int userNum = 10;
+ try {
+ userNum =Integer.parseInt(systemDictDataBiz.queryByCode(Constants.LINGYANG_PARAM, Constants.LINGYANG_USERNUM_LIMIT).getCode());
+ }catch (Exception e){
+ }
+ com.setOpenUserNum(userNum);
+ }else{
+ com.setOpenUserNum(-1);
+ }
com.setOpenModules(Constants.ONE+"");
com.setOepnValidDate(DateUtil.StringToDate("2099-12-31 09:25:09"));
com.setOepnType(Constants.ONE);
+ com.setStatus(Constants.ONE);
com.setChannelId(Constants.TWO);
com.setOrigin(user.getOrigin());
-// com.setDingdingId(user.getco);
//鎻掑叆浼佷笟淇℃伅
companyExtMapper.insert(com);
@@ -456,6 +471,16 @@
}
}
initRedisCache(com);
+ }else{
+ Department department = new Department();
+ department.setCompanyId(com.getId());
+ department.setDeleted(Constants.ZERO);
+ department.setType(Constants.DEPART_TYPE.com);
+ department = departmentExtMapper.selectOne(new QueryWrapper<>(department).last("limit 1"));
+ if(department == null){
+ throw new BusinessException(ResponseStatus.ERR_STATUS.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅寮傚父锛岃鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
+ com.setRootDepartment(department);
}
}else{
if(com == null){
@@ -590,7 +615,7 @@
return companyInfoListVO;
}
String rPath =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.MENU_IMG).getCode();
- companyInfoListVO.setFileurlfull(rPath+"/"+companyInfoListVO.getFileStoreAddr());
+ companyInfoListVO.setFileurlfull(rPath+companyInfoListVO.getFileStoreAddr());
companyInfoListVO.setSystemUrl( systemDictDataBiz.queryByCode(Constants.EDGP_PARAM,Constants.SYSTEM_URL).getCode()+companyInfoListVO.getId());
--
Gitblit v1.9.3