From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 2a7bdce..6bf7765 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -88,6 +88,7 @@
company.setStatus(Constants.ZERO);
company.setType(Constants.ZERO);
company.setSignStatus(Constants.ZERO);
+ company.setType(Constants.ZERO);
company.setSignIdStatus(Constants.ZERO);
companyMapper.insert(company);
company.setEditDate(company.getCreateDate());
@@ -98,6 +99,36 @@
dealFileData(company);
//澶勭悊鍏宠仈鏂规
dealSolutionsData(company);
+ return company;
+ }
+ @Override
+ @Transactional
+ public Company createShop(Company company) {
+ isValidCreateParam(company);
+ if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+ .eq(Company::getCode,company.getCode())
+ .or().eq(Company::getPhone,company.getPhone())
+ .or().eq(Company::getEmail,company.getEmail())
+ .or().eq(Company::getUsername,company.getUsername())
+ .or().eq(Company::getName,company.getName()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ company.setCreator(user.getId());
+ company.setCreateDate(new Date());
+ company.setType(Constants.ONE);
+ company.setIsdeleted(Constants.ZERO);
+ company.setStatus(Constants.ZERO);
+ company.setType(Constants.ZERO);
+ company.setSignStatus(Constants.ZERO);
+ company.setSignIdStatus(Constants.ZERO);
+ companyMapper.insert(company);
+ company.setEditDate(company.getCreateDate());
+ company.setEditor(user.getId());
+ //澶勭悊鐧婚檰璐﹀彿淇℃伅
+ dealSystemUserData(company);
+ //澶勭悊闄勪欢淇℃伅
+ dealFileData(company);
return company;
}
@Override
@@ -153,7 +184,7 @@
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
response.setHeader("eva-download-filename", encodeFileName);
- Constants. packFilesToZip(fileList,response.getOutputStream());
+ Constants.packFilesToZip(fileList,response.getOutputStream());
} catch (IOException e) {
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
@@ -227,6 +258,54 @@
List<CompanySolution> list = new ArrayList<>();
int num =0;
for(CompanySolution s :company.getSolutionList()){
+ if(Objects.isNull(s.getSolution())){
+ continue;
+ }
+ if(s.getSolution().getBaseId() == null){
+ continue;
+ }
+ Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
+ .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+ if(Objects.isNull(newVersion)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ sIds.add(s.getSolution().getBaseId());
+ s.setCompanyId(company.getId());
+ s.setIsdeleted(Constants.ZERO);
+ s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
+ s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
+ s.setCreateDate(company.getCreateDate());
+ s.setCreator(company.getCreator());
+ s.setSortnum(num++);
+ s.setSolutionBaseId( s.getSolution().getBaseId() );
+ s.setSolutionId( newVersion.getId() );
+ s.setStatus(Constants.ZERO);
+ list.add(s);
+ }
+ if(list.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
+ .in(Solutions::getId,sIds)
+ .eq(Solutions::getIsdeleted,Constants.ZERO));
+ if(solutionsList.size()!= list.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅鍝�");
+ }
+ for(Solutions s:solutionsList){
+ if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
+ }
+ }
+ companySolutionJoinMapper.insertBatchSomeColumn(list);
+ }
+
+
+
+ /* private void dealSolutionsData(Company company) {
+ List<Integer> sIds = new ArrayList<>();
+ List<CompanySolution> list = new ArrayList<>();
+ int num =0;
+ for(CompanySolution s :company.getSolutionList()){
if(s.getSolution() == null || s.getSolution().getBaseId() == null ||s.getSolution().getId()==null){
continue;
}
@@ -258,8 +337,7 @@
}
}
companySolutionJoinMapper.insertBatchSomeColumn(list);
- }
-
+ }*/
private void isValidCreateParam(Company company) {
if(StringUtils.isBlank(company.getPhone())
||StringUtils.isBlank(company.getName())
@@ -292,7 +370,7 @@
if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
}else {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
+ // throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
}
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
for(Multifile f : company.getIdcardImgList()){
--
Gitblit v1.9.3