merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -79,8 +78,8 @@ import com.zhongzheng.modules.top.financial.service.ITopCostTpItemService;
 import com.zhongzheng.modules.top.financial.service.ITopCostTpService;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpItemVo;
 import com.zhongzheng.modules.top.financial.vo.TopCostTpVo;
-import com.zhongzheng.modules.top.goods.bo.TopOldOrderGoodsAddBo;
-import com.zhongzheng.modules.top.goods.domain.*;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckService;
 import com.zhongzheng.modules.user.domain.User;
@@ -2312,7 +2311,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             map.forEach((k, v) -> {
                 ClassGradeSortBo sortBo = new ClassGradeSortBo();
                 sortBo.setKey(k);
-                Map<String, List<ClassGrade>> collect = v.stream().collect(Collectors.groupingBy(ClassGrade::getOfficialName));
+                Map<String, List<ClassGrade>> collect = v.stream().filter(x -> StringUtils.isNotBlank(x.getOfficialName())).collect(Collectors.groupingBy(ClassGrade::getOfficialName));
                 sortBo.setSize(collect.keySet().size());
                 sortList.add(sortBo);
             });

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -943,6 +943,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             if (CollectionUtils.isNotEmpty(list)) {
                 list.forEach(item -> {
                     item.setUserCount(1);
+                    item.setCheckStatusStr(item.getCheckStr(item.getCheckStatus()));
                     //专业
                     if (StringUtils.isNotBlank(item.getSubjectIds())) {
                         List<CourseSubject> subjectList = courseSubjectService.listByIds(Arrays.asList(item.getSubjectIds().split(",")));
@@ -1026,10 +1027,12 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         //数据处理
         for (TopOldOrderGoodsListVo item : list) {
             item.setUserCount(userCount);
+            item.setCheckStatusStr(item.getCheckStr(item.getCheckStatus()));
         }
         return list;
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean checkOrder(TopOldOrderCheckBo bo) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderGoodsListVo.java

@@ -78,12 +78,15 @@ public class TopOldOrderGoodsListVo {
 
 	private Long signId;
 
-	public String getCheckStatusStr() {
+	@Excel(name = "开通状态")
+	private String checkStatusStr;
+
+	public String getCheckStr(Integer checkStatus) {
 		String str = "";
-		if (ObjectUtil.isNull(this.checkStatus)){
+		if (ObjectUtil.isNull(checkStatus)){
 			return str;
 		}
-		switch (this.checkStatus){
+		switch (checkStatus){
 			case 0:
 				str = "待审核";
 				break;
@@ -105,7 +108,4 @@ public class TopOldOrderGoodsListVo {
 		return str;
 	}
 
-	@Excel(name = "开通状态")
-	private String checkStatusStr;
-
 }