From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 115 insertions(+), 25 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..ed13d2a 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
@@ -102,6 +102,35 @@
}
@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.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
+ @Transactional
public void updateSolutions(Company company) {
if(company.getId()==null
||company.getSolutionList() == null
@@ -153,7 +182,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);
}
@@ -172,7 +201,7 @@
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
user.setSalt(salt);
- user.setType(Constants.ONE);
+ user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
@@ -199,7 +228,7 @@
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
user.setSalt(salt);
- user.setType(Constants.ONE);
+ user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
@@ -223,6 +252,55 @@
* @param company
*/
private void dealSolutionsData(Company company) {
+ List<Integer> sIds = new ArrayList<>();
+ List<CompanySolution> list = new ArrayList<>();
+ int num =0;
+ Date date = new Date();
+ 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(date);
+ 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;
@@ -258,8 +336,7 @@
}
}
companySolutionJoinMapper.insertBatchSomeColumn(list);
- }
-
+ }*/
private void isValidCreateParam(Company company) {
if(StringUtils.isBlank(company.getPhone())
||StringUtils.isBlank(company.getName())
@@ -292,7 +369,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()){
@@ -498,6 +575,7 @@
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
//澶勭悊鐧婚檰璐﹀彿淇℃伅
+ company.setType(model.getType());
dealSystemUserDataForUpdate(company,model.getUsername());
}
@@ -704,17 +782,24 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(company.getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ if(Constants.equalsInteger(company.getType(),Constants.ONE)){
+
+
+ }else {
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁
+ if(company.getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+ } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
- } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
+
return companyMapper.selectList(wrapper);
}
@@ -725,17 +810,22 @@
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(pageWrap.getModel().getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
- }
+ if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
+
+ }else{
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁锛屽彧鑳界湅鏉冮檺鑼冨洿鍐�
+ if(pageWrap.getModel().getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
- } else if (pageWrap.getModel().getQueryFlag() == 1) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ } else if (pageWrap.getModel().getQueryFlag() == 1) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ }
}
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId());
--
Gitblit v1.9.3