From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 15 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index a51db4a..b076e7f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -11,6 +11,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CateAttrMapper;
import com.doumee.dao.business.CateParamMapper;
+import com.doumee.dao.business.CateParamSelectMapper;
import com.doumee.dao.business.CategoryMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.CategoryService;
@@ -47,6 +48,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private CateParamSelectMapper cateParamSelectMapper;
@Override
public Integer create(Category category) {
@@ -131,6 +135,7 @@
category.setCreateDate(new Date());
category.setCreator(user.getId());
category.setIsdeleted(Constants.ZERO);
+ category.setCompanyId(user.getCompanyId());
//澶勭悊鎷奸煶闂
category.setPinyin(PinYinUtil.getFullSpell(category.getName()));
category.setShortPinyin(PinYinUtil.getFirstSpell(category.getName()));
@@ -393,13 +398,11 @@
@Override
public Category findById(Integer id) {
Category category = categoryMapper.selectById(id);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
category.setPrefixUrl(prefixUrl);
category.setParamList(cateParamMapper.selectList(new QueryWrapper<CateParam>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
- category.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
- category.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",id).orderByAsc(" SORTNUM ")));
- category.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
+ category.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",id).eq("ISDELETED",Constants.ZERO).orderByAsc(" SORTNUM ")));
return category;
}
@@ -411,21 +414,78 @@
@Override
public List<Category> findList(Category category) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Category> wrapper = new QueryWrapper<>(category)
.eq("STATUS",Constants.ZERO)
.eq("ISDELETED",Constants.ZERO)
+ .eq("COMPANY_ID",user.getCompanyId())
.orderByAsc(" SORTNUM ");
List<Category> list = categoryMapper.selectList(wrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+// String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+// + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
+// for (Category c:list) {
+// c.setPrefixUrl(prefixUrl);
+// c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+// c.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+// c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+// }
+ return list;
+ }
+
+
+
+ @Override
+ public List<Category> findListSaaS(Category category) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!user.getType().equals(Constants.UserType.ZHUBO.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛绫诲埆閿欒锛岄潪涓绘挱鐢ㄦ埛!");
+ }
+ QueryWrapper<Category> wrapper = new QueryWrapper<>(category)
+ .eq("STATUS",Constants.ZERO)
+ .eq("ISDELETED",Constants.ZERO)
+ .eq("COMPANY_ID",user.getCompanyId())
+ .orderByAsc(" SORTNUM ");
+ List<Category> list = categoryMapper.selectList(wrapper);
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
for (Category c:list) {
c.setPrefixUrl(prefixUrl);
- c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
- c.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+// c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+// c.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+ this.getParamSelect(c);
}
return list;
}
+
+
+ public void getParamSelect(Category category){
+ List<CateParam> cateParamList = cateParamMapper.selectList(new QueryWrapper<CateParam>()
+ .eq("CATEGORY_ID",category.getId())
+ .eq("ISSELECT",Constants.ONE)
+ .eq("ISDELETED",Constants.ZERO)
+ .orderByAsc(" SORTNUM ")
+ .last(" limit 2 ")
+ );
+ if(!Objects.isNull(cateParamList)&&cateParamList.size()>Constants.ZERO){
+ for (int i = 0; i < cateParamList.size(); i++) {
+ CateParam cateParam = cateParamList.get(i);
+ List<CateParamSelect> cateParamSelectList = cateParamSelectMapper.selectList(new QueryWrapper<CateParamSelect>()
+ .eq("PARAM_ID",cateParam.getId())
+ .eq("ISDELETED",Constants.ZERO));
+ if(i==0){
+ category.setAttrFirst(cateParam.getName());
+ category.setCateParamFirstList(cateParamSelectList);
+ }else if(i==1){
+ category.setAttrSecond(cateParam.getName());
+ category.setCateParamSecondList(cateParamSelectList);
+ }
+
+ }
+ }
+ }
+
+
@Override
public List<Category> findListForGoods(Integer goodsId) {
@@ -434,8 +494,8 @@
.eq("ISDELETED",Constants.ZERO)
.orderByAsc(" SORTNUM ");
List<Category> list = categoryMapper.selectList(wrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
for (Category c:list) {
c.setPrefixUrl(prefixUrl);
c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
@@ -461,10 +521,13 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Category::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.lambda().eq(Category::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
queryWrapper.lambda().orderByAsc(Category::getSortnum);
IPage<Category> categoryIPage = categoryMapper.selectPage(page, queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
categoryIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
});
@@ -489,8 +552,8 @@
.eq("ISDELETED",Constants.ZERO)
.orderByAsc(" SORTNUM ");
List<Category> list = categoryMapper.selectList(wrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
for (Category c:list) {
c.setPrefixUrl(prefixUrl);
c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("STATUS",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
--
Gitblit v1.9.3