feat:管理页面把状态改为选择器
parent
110a5e7394
commit
d1860dcb54
|
@ -37,6 +37,7 @@ public class RuleInfoResp extends BaseEntity {
|
|||
*/
|
||||
private List<RuleAttrAddModel> ruleAttrList;
|
||||
|
||||
private boolean flag;
|
||||
public static RuleInfoResp infoBuild (RuleInfo ruleInfo, Function<Long, List<RuleAttrAddModel>> ruleAttrList) {
|
||||
return RuleInfoResp.builder()
|
||||
.id(ruleInfo.getId())
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.muyu.product.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Supplier;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
|
@ -54,6 +55,14 @@ public class CategoryInfoController extends BaseController {
|
|||
@GetMapping("/list")
|
||||
public Result<List<CategoryInfo>> list(CategoryInfo categoryInfo) {
|
||||
List<CategoryInfo> list = categoryInfoService.list(categoryInfo);
|
||||
List<CategoryInfo> infos = list.stream().filter(cateryInfoParent -> cateryInfoParent.getParentId() != 0).toList();
|
||||
for (CategoryInfo info : infos) {
|
||||
for (CategoryInfo categoryInfo1 : list) {
|
||||
if(Objects.equals(info.getParentId(),categoryInfo1.getId())){
|
||||
info.setParentName(categoryInfo1.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
return Result.success(list);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ import com.muyu.common.core.text.Convert;
|
|||
import com.muyu.common.core.utils.ObjUtils;
|
||||
import com.muyu.common.core.web.page.TableDataInfo;
|
||||
import com.muyu.common.security.utils.SecurityUtils;
|
||||
import com.muyu.product.domain.ProjectInfo;
|
||||
import com.muyu.product.domain.RuleAttrInfo;
|
||||
import com.muyu.product.domain.model.RuleAttrAddModel;
|
||||
import com.muyu.product.domain.model.RuleInfoAddModel;
|
||||
|
@ -21,6 +22,7 @@ import com.muyu.product.domain.req.RuleInfoQueryReq;
|
|||
import com.muyu.product.domain.resp.RuleAttributeResp;
|
||||
import com.muyu.product.domain.resp.RuleInfoResp;
|
||||
import com.muyu.product.domain.resp.RuleInfoUpdResp;
|
||||
import com.muyu.product.service.ProjectInfoService;
|
||||
import com.muyu.product.service.RuleAttrInfoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
@ -43,7 +45,8 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
|
|||
|
||||
@Autowired
|
||||
private RuleAttrInfoService ruleAttrInfoService;
|
||||
|
||||
@Autowired
|
||||
private ProjectInfoService projectInfoService;
|
||||
/**
|
||||
* 查询商品规格列表
|
||||
*
|
||||
|
@ -105,6 +108,14 @@ public class RuleInfoServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo>
|
|||
}))
|
||||
.toList();
|
||||
boolean isPage = ruleInfoQueryReq.getParams().get("isPage") == null || Convert.toBool(ruleInfoQueryReq.getParams().get("isPage"), true);
|
||||
ruleInfoRespList.forEach(item->{
|
||||
LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(ProjectInfo::getRuleId,item.getId());
|
||||
List<ProjectInfo> infos = projectInfoService.list(queryWrapper);
|
||||
if(infos.size()>0 && infos !=null){
|
||||
item.setFlag(true);
|
||||
}
|
||||
});
|
||||
|
||||
return TableDataInfo.<RuleInfoResp>builder()
|
||||
.rows(ruleInfoRespList)
|
||||
|
|
Loading…
Reference in New Issue