考级列表

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeRegistration.java

@@ -83,6 +83,8 @@ public class DegreeRegistration {
 
     private Integer organId;
 
+    private String organName;
+
     private String vipTeacherName;
 
     private String normalTeacherName;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -17,6 +17,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -58,6 +59,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     @Autowired
     private SubjectService subjectService;
 
+    @Autowired
+    private OrganizationService organizationService;
+
     @Override
     public BaseDAO<Integer, DegreeRegistration> getDAO() {
         return degreeRegistrationDao;
@@ -253,6 +257,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+
         List<DegreeRegistration> dataList = new ArrayList<>();
         int count = degreeRegistrationDao.queryCount(params);
 
@@ -284,6 +289,20 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 }
             }
 
+            // 设置分部
+            List<Integer> organIdSet = dataList.stream().map(o -> o.getOrganId()).filter(Objects::nonNull).collect(Collectors.toList());
+            Integer tenantId = TenantContextHolder.getTenantId();
+
+
+            List<Organization> organs = organizationService.findOrgans(organIdSet, tenantId);
+
+            if (!CollectionUtils.isEmpty(organs)) {
+                // id 分组
+                Map<Integer, String> organMap = organs.stream().collect(Collectors.toMap(Organization::getId, o -> o.getName(), (k1, k2) -> k1));
+                dataList.forEach(o -> o.setOrganName(organMap.get(o.getOrganId())));
+            }
+
+
 
             DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
             pageInfo.setApplyNum(degreeRegistrationDao.countApplyNum(params));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeServiceImpl.java

@@ -29,10 +29,7 @@ import com.ym.mec.biz.service.DegreeService;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -221,6 +218,14 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
             return statistical;
         }
 
+        // 用户ID集合
+        List<Integer> userIds = registrations.stream().map(DegreeRegistration::getUserId).collect(Collectors.toList());
+        statistical.setRegisterTotal(userIds.size());
+
+        statistical.setRegisterNum(new HashSet<>(userIds).size());
+
+
+
         // 订单号集合
         List<String> orderNos = registrations.stream().map(DegreeRegistration::getOrderNo).collect(Collectors.toList());