add 考级报名链接修改

mec-biz/src/main/java/com/ym/mec/biz/dal/page/RegistrationOrPreQueryInfo.java

@@ -12,6 +12,10 @@ public class RegistrationOrPreQueryInfo extends QueryInfo {
 
     private List<Integer> userIds;
 
+    private String orderByPerRegister;
+
+    private String orderByPayTime;
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -37,4 +41,20 @@ public class RegistrationOrPreQueryInfo extends QueryInfo {
     public void setUserIds(List<Integer> userIds) {
         this.userIds = userIds;
     }
+
+    public String getOrderByPayTime() {
+        return orderByPayTime;
+    }
+
+    public void setOrderByPayTime(String orderByPayTime) {
+        this.orderByPayTime = orderByPayTime;
+    }
+
+    public String getOrderByPerRegister() {
+        return orderByPerRegister;
+    }
+
+    public void setOrderByPerRegister(String orderByPerRegister) {
+        this.orderByPerRegister = orderByPerRegister;
+    }
 }

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

@@ -6,16 +6,7 @@ import static com.ym.mec.biz.dal.enums.PaymentStatusEnum.YES;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 
@@ -1847,7 +1838,27 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setTotal(count);
         params.put("offset", pageInfo.getOffset());
         if (queryInfo.getPage() <= pageInfo.getTotalPage()) {
+            Date firstPreTime = null;
+            Date firstPayTime = null;
             dataList = studentRegistrationDao.getRegisterOrPreList(params);
+            List<RegisterDto> collect = dataList.stream().filter(e -> e.getPerRegisterTime() != null).sorted(Comparator.comparing(RegisterDto::getPerRegisterTime)).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                firstPreTime = collect.get(0).getPerRegisterTime();
+            }
+            collect = dataList.stream().filter(e -> e.getPayTime() != null).sorted(Comparator.comparing(RegisterDto::getPayTime)).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                firstPayTime = collect.get(0).getPayTime();
+            }
+            for (RegisterDto registerDto : dataList) {
+                if (registerDto.getPerRegisterTime() != null) {
+                    registerDto.setPerRegInterval(DateUtil.secondsBetween(firstPreTime, registerDto.getPerRegisterTime()));
+                }
+
+                if (registerDto.getPayTime() != null) {
+                    registerDto.setPerRegInterval(DateUtil.secondsBetween(firstPayTime, registerDto.getPayTime()));
+                }
+            }
+
         }
         pageInfo.setRows(dataList);
         return pageInfo;

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -1,7 +1,12 @@
 package com.ym.mec.teacher.controller;
 
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.RegisterDto;
+import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -9,9 +14,13 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,10 +29,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.entity.Teacher;
-import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherMusicClassQueryInfo;
-import com.ym.mec.biz.dal.page.VipClassQueryInfo;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.common.controller.BaseController;
 
 @RequestMapping("teacher")
@@ -45,6 +50,10 @@ public class TeacherController extends BaseController {
 	private SubjectDao subjectDao;
 	@Autowired
     private EmployeeService employeeService;
+	@Autowired
+    private StudentPaymentOrderDao studentPaymentOrderDao;
+	@Autowired
+    private StudentRegistrationService studentRegistrationService;
 
     @ApiOperation(value = "修改教师个人中心信息")
     @PostMapping("/update")
@@ -195,4 +204,18 @@ public class TeacherController extends BaseController {
         }
         return succeed(employeeService.findByRole("4,5",organIds));
     }
+
+
+    @ApiOperation(value = "获取报名/预报名列表")
+    @GetMapping("/getRegisterOrPreList")
+    public HttpResponseResult<PageInfo<RegisterDto>> queryStudentApplyDetail(RegistrationOrPreQueryInfo queryInfo) {
+        if (StringUtils.isNotBlank(queryInfo.getSearch())) {
+            List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());
+            List<Integer> userIds = users.stream().map(BasicUserDto::getUserId).collect(Collectors.toList());
+            if (userIds.size() > 0) {
+                queryInfo.setUserIds(userIds);
+            }
+        }
+        return succeed(studentRegistrationService.getRegisterOrPreList(queryInfo));
+    }
 }