牌子

ims-service/ims-eval/src/main/java/com/ims/eval/controller/MultipleBrandController.java

@@ -1,6 +1,7 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.MultipleBrand;
 import com.ims.eval.entity.dto.result.R;
@@ -70,7 +71,7 @@ public class MultipleBrandController {
 				  @RequestParam(value = "year", required = false) String year,
 				  @RequestParam(value = "month", required = false) String month) {
 
-		List<MultipleBrand> list  =multipleBrandService.getMultipleBranTree(pageNum,pageSize,id,parentId,binSection,checkCycle,year,month);
+		IPage<MultipleBrand> list  =multipleBrandService.getMultipleBranTree(pageNum,pageSize,id,parentId,binSection,checkCycle,year,month);
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/MultipleBrandMapper.java

@@ -1,5 +1,6 @@
 package com.ims.eval.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.MultipleBrand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,12 +18,12 @@ import java.util.List;
  */
 public interface MultipleBrandMapper extends BaseMapper<MultipleBrand> {
 
-	List<MultipleBrand> selectMultipleBranTree(Page page, @Param("id")String id ,
-											   @Param("parentId") String parentId,
-											   @Param("binSection") String  binSection,
-											   @Param("checkCycle") String  checkCycle,
-											   @Param("year") String year,
-											   @Param("month") String month);
+	IPage<MultipleBrand> selectMultipleBranTree(Page page, @Param("id")String id ,
+												@Param("parentId") String parentId,
+												@Param("binSection") String  binSection,
+												@Param("checkCycle") String  checkCycle,
+												@Param("year") String year,
+												@Param("month") String month);
 
 	List<MultipleBrand> selectMultipleBranList(@Param("id")String id ,
 											   @Param("parentId") String parentId,

ims-service/ims-eval/src/main/java/com/ims/eval/service/IMultipleBrandService.java

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.MultipleBrand;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface IMultipleBrandService extends IService<MultipleBrand> {
 
-	List<MultipleBrand> getMultipleBranTree(Integer pageNum, Integer pageSize,String id , String parentId,String  binSection,String  checkCycle,String year,String month);
+	IPage<MultipleBrand> getMultipleBranTree(Integer pageNum, Integer pageSize, String id , String parentId, String  binSection, String  checkCycle, String year, String month);
 
 	List<MultipleBrand> getMultipleBranList(String id , String parentId,String  binSection,String  checkCycle,String year,String month);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/MultipleBrandServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.MultipleBrand;
@@ -11,7 +12,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -25,11 +25,14 @@ import java.util.stream.Collectors;
 public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, MultipleBrand> implements IMultipleBrandService {
 
 	@Override
-	public List<MultipleBrand> getMultipleBranTree(Integer pageNum, Integer pageSize,String id, String parentId,String  binSection,String  checkCycle,String year,String month) {
+	public IPage<MultipleBrand> getMultipleBranTree(Integer pageNum, Integer pageSize,String id, String parentId,String  binSection,String  checkCycle,String year,String month) {
 		Page<Indicator> page = new Page<>(pageNum, pageSize);
-		List<MultipleBrand> list  =  baseMapper.selectMultipleBranTree(page,id,parentId,binSection,checkCycle,year,month);
-		List<MultipleBrand> tree = convert(list);
-		return tree;
+		IPage<MultipleBrand> list  =  baseMapper.selectMultipleBranTree(page,id,"0",binSection,checkCycle,year,month);
+		List<MultipleBrand> list2  =  baseMapper.selectMultipleBranList(id,parentId,binSection,checkCycle,year,month);
+
+		List<MultipleBrand> tree = convert(list.getRecords(),list2);
+		list.setRecords(tree);
+		return list;
 	}
 
 	@Override
@@ -48,19 +51,11 @@ public class MultipleBrandServiceImpl extends ServiceImpl<MultipleBrandMapper, M
 	 * @param brands 源数据所有数据
 	 * @return
 	 */
-	public List<MultipleBrand> convert(List<MultipleBrand> brands) {
+	public List<MultipleBrand> convert(List<MultipleBrand> result,List<MultipleBrand> brands) {
 		if (CollectionUtil.isEmpty(brands)) {
 			return new ArrayList<>();
 		}
-		List<MultipleBrand> result = new ArrayList<>();
-		List<String> idList = brands.stream().map(MultipleBrand::getOrganizationId).collect(Collectors.toList());
-		// 设置最外层顶级
-		for (MultipleBrand brandsVO : brands) {
-			// 判断所有列表里面父级未在集合中放置到一级
-			if (!idList.contains(brandsVO.getParentId())) {
-				result.add(brandsVO);
-			}
-		}
+
 		for (MultipleBrand brandsVO : result) {
 			// 循环一级之后子级
 			getChildren(brands, brandsVO);

ims-service/ims-eval/src/main/resources/mappers/MultipleBrandMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ims.eval.dao.MultipleBrandMapper">
 
 
-    <select id="selectMultipleBranTree" resultType="com.ims.eval.entity.MultipleBrand">
+        <select id="selectMultipleBranTree" resultType="com.ims.eval.entity.MultipleBrand">
 
         select
             *,

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationRuleMapper.xml

@@ -134,9 +134,12 @@
                 <foreach item="item" collection="ids" separator="," open="(" close=")" index="">'${item}'</foreach>
             </if>
 
-            order by order_num asc
+--             and r.del_flag = false
+--             and r.is_check = true
+
 
         </where>
+        order by order_num asc
     </select>