|
@@ -7,26 +7,24 @@ import com.beust.jcommander.internal.Lists;
|
|
|
import com.microsvc.toolkit.common.response.paging.QueryInfo;
|
|
|
import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
|
|
|
import com.ym.mec.biz.dal.dao.OrganizationDao;
|
|
|
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
|
|
|
-import com.ym.mec.biz.dal.entity.*;
|
|
|
+import com.ym.mec.biz.dal.entity.Degree;
|
|
|
+import com.ym.mec.biz.dal.entity.DegreeRegistration;
|
|
|
+import com.ym.mec.biz.dal.entity.Organization;
|
|
|
import com.ym.mec.biz.dal.enums.DegreeNewsTypeEnum;
|
|
|
import com.ym.mec.biz.dal.enums.EDegreeStatus;
|
|
|
-import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
|
+import com.ym.mec.biz.dal.mapper.DegreeMapper;
|
|
|
import com.ym.mec.biz.dal.vo.DegreeNewsVo;
|
|
|
import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
|
|
|
+import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
|
|
|
import com.ym.mec.biz.service.DegreeNewsService;
|
|
|
+import com.ym.mec.biz.service.DegreeService;
|
|
|
import com.ym.mec.biz.service.OrganizationService;
|
|
|
-import com.ym.mec.biz.service.StudentPaymentOrderService;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.tenant.TenantContextHolder;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.joda.time.DateTime;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
-import com.ym.mec.biz.dal.wrapper.DegreeWrapper;
|
|
|
-import com.ym.mec.biz.dal.mapper.DegreeMapper;
|
|
|
-import com.ym.mec.biz.service.DegreeService;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
@@ -48,12 +46,6 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
|
|
|
private DegreeRegistrationDao degreeRegistrationDao;
|
|
|
|
|
|
@Autowired
|
|
|
- private StudentPaymentOrderService studentPaymentOrderService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
|
|
|
-
|
|
|
- @Autowired
|
|
|
private OrganizationDao organizationDao;
|
|
|
|
|
|
@Autowired
|
|
@@ -307,6 +299,16 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
|
|
|
wrapper.setExaminationBriefId(records.get(0).getId());
|
|
|
}
|
|
|
|
|
|
+ // 考级须知ID
|
|
|
+ {
|
|
|
+ newsQuery.setType(DegreeNewsTypeEnum.GRADING_NOTICE.getCode());
|
|
|
+
|
|
|
+ records = degreeNewsService.selectPage(QueryInfo.getPage(newsQuery), newsQuery).getRecords();
|
|
|
+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
|
|
|
+ wrapper.setGradingNoticeId(records.get(0).getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return wrapper;
|
|
|
}
|
|
|
|