|
@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
|
|
import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
|
|
import com.zhongzheng.modules.base.service.IConsoleService;
|
|
import com.zhongzheng.modules.base.service.IConsoleService;
|
|
|
|
+import com.zhongzheng.modules.base.service.IUserProfileService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeService;
|
|
import com.zhongzheng.modules.grade.service.IClassGradeService;
|
|
|
|
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeVo;
|
|
import com.zhongzheng.modules.grade.vo.ClassGradeVo;
|
|
import com.zhongzheng.modules.order.service.IOrderService;
|
|
import com.zhongzheng.modules.order.service.IOrderService;
|
|
import com.zhongzheng.modules.order.vo.OrderListVo;
|
|
import com.zhongzheng.modules.order.vo.OrderListVo;
|
|
@@ -42,6 +44,12 @@ public class ConsoleServiceImpl implements IConsoleService {
|
|
@Autowired
|
|
@Autowired
|
|
private IUserMockRecordService iUserMockRecordService;
|
|
private IUserMockRecordService iUserMockRecordService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IUserProfileService iUserProfileService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private IClassGradeUserService iClassGradeUserService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
|
|
public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
|
|
Integer allNum = iOrderService.getConsoleStudentNum(bo); //总人数
|
|
Integer allNum = iOrderService.getConsoleStudentNum(bo); //总人数
|
|
@@ -369,6 +377,22 @@ public class ConsoleServiceImpl implements IConsoleService {
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public Map<String, Object> getProfileData(ConsoleQueryBo bo) {
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ bo.setPeriodStatus(2);
|
|
|
|
+ Integer pendingTrialNum = iUserProfileService.getProfileStatusNum(bo);
|
|
|
|
+ bo.setPeriodStatus(3);
|
|
|
|
+ Integer unPassNum = iUserProfileService.getProfileStatusNum(bo);
|
|
|
|
+ bo.setPeriodStatus(1);
|
|
|
|
+ Integer passNum = iUserProfileService.getProfileStatusNum(bo);
|
|
|
|
+
|
|
|
|
+ map.put("pendingTrialNum", pendingTrialNum);
|
|
|
|
+ map.put("unPassNum", unPassNum);
|
|
|
|
+ map.put("passNum", passNum);
|
|
|
|
+ return map;
|
|
|
|
+ }
|
|
|
|
+
|
|
private void countNum(Map<String, Object> map,String tag,List<OrderListVo> allList){
|
|
private void countNum(Map<String, Object> map,String tag,List<OrderListVo> allList){
|
|
Integer allNum = allList.size();
|
|
Integer allNum = allList.size();
|
|
map.put(tag+"Num",allNum);
|
|
map.put(tag+"Num",allNum);
|