Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment")
+                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/executePayment","/examOrder/pageList")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -9,6 +9,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.thirdparty.adapay.ConfigInit;
 import com.keao.edu.thirdparty.adapay.Payment;
 import com.keao.edu.thirdparty.yqpay.Msg;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
@@ -46,7 +47,7 @@ public class ExamOrderController extends BaseController {
     @ApiOperation(value = "缴费列表")
     @GetMapping(value = "pageList")
     @PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
-    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ExamRegistrationPaymentDto>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
             Employee employee = employeeService.get(sysUser.getId());
@@ -148,8 +149,8 @@ public class ExamOrderController extends BaseController {
     @GetMapping(value = "/paymentResult")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderNo", value = "订单编号", required = true, dataType = "String")})
-    public HttpResponseResult<StudentExamPaymentDto> getExamOrderInfo(String orderNo) {
-        return succeed(examRegistrationPaymentService.getExamOrderInfo(orderNo));
+    public HttpResponseResult<ExamRegistrationPayment> getExamOrderInfo(String orderNo) {
+        return succeed(examRegistrationPaymentService.getByOrderNo(orderNo));
     }
 
     @PostMapping("/notify")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrganizationRelationController.java

@@ -5,6 +5,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.Organization;
@@ -36,7 +37,7 @@ public class ExamOrganizationRelationController extends BaseController {
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamOrganizationRelation>> getList(ExamOrganizationRelationQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ExamOrganizationRelationExtraDto>> getList(ExamOrganizationRelationQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){
             return failed("请重新登录");
@@ -67,8 +68,8 @@ public class ExamOrganizationRelationController extends BaseController {
 
     @ApiOperation("发送考级报名链接")
     @PostMapping(value = "/sendUrl")
-    public HttpResponseResult sendUrl(Integer examId, String organIds){
-        examOrganizationRelationService.sendUrl(examId, organIds);
+    public HttpResponseResult sendUrl(Integer examId){
+        examOrganizationRelationService.sendUrl(examId);
         return succeed();
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamOrganizationRelationDao.java

@@ -1,7 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.dto.ExamOrganRegistDto;
+import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.enums.YesOrNoEnum;
@@ -13,6 +13,9 @@ import java.util.Set;
 
 public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizationRelation> {
 
+    List<ExamOrganizationRelationExtraDto> queryExamOrgans(Map<String, Object> params);
+    int countExamOrgans(Map<String, Object> params);
+
     /**
      * @param examOrganizationRelations:
      * @return int

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.TransStatusEnum;
@@ -9,6 +10,7 @@ import org.apache.poi.ss.formula.functions.T;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrationPayment> {
 
@@ -57,5 +59,17 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
      */
     List<ExamRegistrationPayment> findOrdersOverTime(@Param("orderNoList") List<String> orderNoList, @Param("transStatus") TransStatusEnum transStatus, @Param("beforeTime") Date beforeTime);
 
-    List<ExamRegistrationPayment> getOrderPageList();
+    /**
+     * 获取支付列表
+     *
+     * @return
+     */
+    List<ExamRegistrationPaymentDto> getOrderPageList(Map<String, Object> params);
+
+    /**
+     * 获取订单总条数
+     * @param params
+     * @return
+     */
+    Integer getOrderListCount(Map<String, Object> params);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamTeacherSalaryDao.java

@@ -3,9 +3,9 @@ package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.dto.BaseUserInfoDto;
+import com.keao.edu.user.dto.ExamTeacherSalaryDto;
 import com.keao.edu.user.dto.TeacherDto;
 import com.keao.edu.user.entity.ExamTeacherSalary;
-import com.keao.edu.user.entity.Teacher;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +17,9 @@ public interface ExamTeacherSalaryDao extends BaseDAO<Long, ExamTeacherSalary> {
 
     int batchUpdate(@Param("teacherSalaries") List<ExamTeacherSalary> teacherSalaries);
 
+    List<ExamTeacherSalaryDto> queryExamTeacherSalary(Map<String, Object> params);
+    int countExamTeacherSalary(Map<String, Object> params);
+
     /**
      * @describe 获取指定考级项目下的老师分润设置
      * @author Joburgess

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExaminationBasicDao.java

@@ -24,5 +24,7 @@ public interface ExaminationBasicDao extends BaseDAO<Long, ExaminationBasic> {
      * @return java.util.List<com.keao.edu.user.entity.ExaminationBasic>
      */
     List<ExaminationBasic> getNeedUpdateStatusExams();
+
+    List<ExaminationBasicDto> getExams(@Param("examIds") List<Integer> examIds);
 	
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamOrganizationRelationExtraDto.java

@@ -10,6 +10,16 @@ public class ExamOrganizationRelationExtraDto extends ExamOrganizationRelation {
 
     private String organizationName;
 
+    private int selfOrgan;
+
+    public int getSelfOrgan() {
+        return selfOrgan;
+    }
+
+    public void setSelfOrgan(int selfOrgan) {
+        this.selfOrgan = selfOrgan;
+    }
+
     public String getOrganizationName() {
         return organizationName;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamRegistrationPaymentDto.java

@@ -0,0 +1,21 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamLocation;
+import com.keao.edu.user.entity.ExamRegistrationPayment;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class ExamRegistrationPaymentDto extends ExamRegistrationPayment {
+
+    @ApiModelProperty(value = "考试地点")
+    private List<ExamLocation> examLocations;
+
+    public List<ExamLocation> getExamLocations() {
+        return examLocations;
+    }
+
+    public void setExamLocations(List<ExamLocation> examLocations) {
+        this.examLocations = examLocations;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExamTeacherSalaryDto.java

@@ -0,0 +1,20 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.entity.ExamTeacherSalary;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.07.08
+ */
+public class ExamTeacherSalaryDto extends ExamTeacherSalary {
+
+    private ExaminationBasicDto examinationBasic;
+
+    public ExaminationBasicDto getExaminationBasic() {
+        return examinationBasic;
+    }
+
+    public void setExaminationBasic(ExaminationBasicDto examinationBasic) {
+        this.examinationBasic = examinationBasic;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dto/ExaminationBasicDto.java

@@ -11,6 +11,9 @@ import java.math.BigDecimal;
  */
 public class ExaminationBasicDto extends ExaminationBasic {
 
+    @ApiModelProperty(value = "考点名称")
+    private String examLocationNames;
+
     @ApiModelProperty(value = "创建人名称")
     private String creatorName;
 
@@ -23,6 +26,14 @@ public class ExaminationBasicDto extends ExaminationBasic {
     @ApiModelProperty(value = "总缴费金额")
     private BigDecimal totalPaymentAmount;
 
+    public String getExamLocationNames() {
+        return examLocationNames;
+    }
+
+    public void setExamLocationNames(String examLocationNames) {
+        this.examLocationNames = examLocationNames;
+    }
+
     public String getCreatorName() {
         return creatorName;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamOrganizationRelationQueryInfo.java

@@ -4,8 +4,6 @@ import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.user.enums.SettlementTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.management.Query;
-
 /**
  * @Author Joburgess
  * @Date 2020.06.18
@@ -18,9 +16,20 @@ public class ExamOrganizationRelationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考试项目编号")
     private Integer examId;
 
+    @ApiModelProperty(value = "是否允许排课")
+    private Integer isAllowArrangeExam;
+
     @ApiModelProperty(value = "分润结算方式")
     private SettlementTypeEnum settlementType;
 
+    public Integer getIsAllowArrangeExam() {
+        return isAllowArrangeExam;
+    }
+
+    public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+        this.isAllowArrangeExam = isAllowArrangeExam;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationPaymentQueryInfo.java

@@ -10,6 +10,12 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "合作单位编号")
     private Integer organId;
 
+    @ApiModelProperty(value = "准考证号")
+    private String cardNo;
+
+    @ApiModelProperty(value = "考级名称")
+    private String ExamName;
+
     @ApiModelProperty(value = "考试报名编号")
     private Integer examRegistrationId;
 
@@ -51,4 +57,20 @@ public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
     public void setExaminationBasicId(Integer examinationBasicId) {
         this.examinationBasicId = examinationBasicId;
     }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getExamName() {
+        return ExamName;
+    }
+
+    public void setExamName(String examName) {
+        ExamName = examName;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamTeacherSalaryQueryInfo.java

@@ -12,6 +12,9 @@ public class ExamTeacherSalaryQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考级编号")
     private Integer examId;
 
+    @ApiModelProperty(value = "教师编号")
+    private Integer teacherId;
+
     public Integer getExamId() {
         return examId;
     }
@@ -19,4 +22,12 @@ public class ExamTeacherSalaryQueryInfo extends QueryInfo {
     public void setExamId(Integer examId) {
         this.examId = examId;
     }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamOrganizationRelationService.java

@@ -2,11 +2,10 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Page;
 
 public interface ExamOrganizationRelationService extends BaseService<Long, ExamOrganizationRelation> {
 
@@ -17,7 +16,7 @@ public interface ExamOrganizationRelationService extends BaseService<Long, ExamO
      * @param queryInfo:
      * @return com.keao.edu.common.page.PageInfo<com.keao.edu.user.entity.ExamOrganizationRelation>
      */
-    PageInfo<ExamOrganizationRelation> queryExamOrgans(ExamOrganizationRelationQueryInfo queryInfo);
+    PageInfo<ExamOrganizationRelationExtraDto> queryExamOrgans(ExamOrganizationRelationQueryInfo queryInfo);
 
     /**
      * @describe 添加单位
@@ -46,7 +45,7 @@ public interface ExamOrganizationRelationService extends BaseService<Long, ExamO
      * @param organIds:
      * @return void
      */
-    void sendUrl(Integer examId, String organIds);
+    void sendUrl(Integer examId);
 
     /**
      * @describe 获取未关联到考级项目的合作单位

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -2,6 +2,7 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
@@ -52,7 +53,7 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      * @param queryInfo
      * @return
      */
-    PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo);
+    PageInfo<ExamRegistrationPaymentDto> pageList(ExamRegistrationPaymentQueryInfo queryInfo);
 
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamTeacherSalaryService.java

@@ -3,11 +3,10 @@ package com.keao.edu.user.service;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.BaseUserInfoDto;
+import com.keao.edu.user.dto.ExamTeacherSalaryDto;
 import com.keao.edu.user.dto.TeacherDto;
 import com.keao.edu.user.entity.ExamTeacherSalary;
-import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.ExamTeacherSalaryQueryInfo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,6 +22,15 @@ public interface ExamTeacherSalaryService extends BaseService<Long, ExamTeacherS
     void teacherSalarySettlementWithExam(Integer examId);
 
     /**
+     * @describe
+     * @author Joburgess
+     * @date 2020.07.08
+     * @param queryInfo:
+     * @return com.keao.edu.common.page.PageInfo<ExamTeacherSalaryDto>
+     */
+    PageInfo<ExamTeacherSalaryDto> queryExamTeacherSalary(ExamTeacherSalaryQueryInfo queryInfo);
+
+    /**
      * @describe 删除考级教室分润设置
      * @author Joburgess
      * @date 2020.07.02

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -17,6 +17,7 @@ import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.dao.OrganizationDao;
 import com.keao.edu.user.dao.TeacherDao;
+import com.keao.edu.user.dto.ExamOrganizationRelationExtraDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.entity.Organization;
@@ -69,29 +70,32 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 	}
 
 	@Override
-	public PageInfo<ExamOrganizationRelation> queryExamOrgans(ExamOrganizationRelationQueryInfo queryInfo) {
-		PageInfo<ExamOrganizationRelation> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public PageInfo<ExamOrganizationRelationExtraDto> queryExamOrgans(ExamOrganizationRelationQueryInfo queryInfo) {
+		PageInfo<ExamOrganizationRelationExtraDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
 		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
 		params.put("organIds", nextLevelOrganIds);
 
-		List<ExamOrganizationRelation> dataList = new ArrayList<>();
-		int count = this.findCount(params);
+		List<ExamOrganizationRelationExtraDto> dataList = new ArrayList<>();
+		int count = examOrganizationRelationDao.countExamOrgans(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
-			dataList = this.getDAO().queryPage(params);
+			dataList = examOrganizationRelationDao.queryExamOrgans(params);
 			List<Integer> organIds = dataList.stream().map(ExamOrganizationRelation::getOrganId).collect(Collectors.toList());
 			List<ExamOrganizationRelation> countInfos = examOrganizationRelationDao.countExamOrganStudentAndPayment(queryInfo.getExamId(), organIds);
 			Map<Integer, ExamOrganizationRelation> organCountInfoMap = countInfos.stream().collect(Collectors.toMap(ExamOrganizationRelation::getOrganId, e -> e));
-			for (ExamOrganizationRelation examOrganizationRelation : dataList) {
+			for (ExamOrganizationRelationExtraDto examOrganizationRelation : dataList) {
 				ExamOrganizationRelation countInfo = organCountInfoMap.get(examOrganizationRelation.getOrganId());
 				if(Objects.nonNull(countInfo)){
 					examOrganizationRelation.setTotalRegistrationStudentNum(countInfo.getTotalRegistrationStudentNum());
 					examOrganizationRelation.setTotalPaymentAmount(countInfo.getTotalPaymentAmount());
 				}
+				if(examOrganizationRelation.getOrganId().equals(queryInfo.getOrganId())){
+					examOrganizationRelation.setSelfOrgan(1);
+				}
 			}
 		}
 		pageInfo.setRows(dataList);
@@ -158,21 +162,12 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void sendUrl(Integer examId, String organIdStrs) {
+	public void sendUrl(Integer examId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
-		if(StringUtils.isBlank(organIdStrs)){
-			throw new BizException("请指定合作单位");
-		}
 		List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getWithExam(examId);
 		Set<Integer> existOrganizationIds = examOrgans.stream().map(ExamOrganizationRelation::getOrganId).collect(Collectors.toSet());
-		List<Integer> organIds = Arrays.asList(organIdStrs.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());
-		for (Integer organId : organIds) {
-			if(!existOrganizationIds.contains(organId)){
-				throw new BizException("存在未关联到考级项目的合作单位");
-			}
-		}
 
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());
 		if(Objects.isNull(examinationBasic)){
@@ -186,10 +181,12 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		}
 		baseUrl = baseUrl+"/#/signUp?";
 
+		List<ExamOrganizationRelation> needUpdate=new ArrayList<>();
 		for (ExamOrganizationRelation examOrgan : examOrgans) {
 			if(YesOrNoEnum.YES.equals(examOrgan.getSendUrlFlag())){
 				continue;
 			}
+			needUpdate.add(examOrgan);
 			String registrationUrl = baseUrl + "examId=" + examOrgan.getExaminationBasicId() + "&organId=" + examOrgan.getOrganId();
 			String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
 
@@ -205,7 +202,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			sysMessageFeignService.batchSendMessage(sysMessageParams);
 		}
 
-		examOrganizationRelationDao.batchUpdate(examOrgans);
+		if(!CollectionUtils.isEmpty(needUpdate)){
+			examOrganizationRelationDao.batchUpdate(needUpdate);
+		}
 
 		if(examinationBasic.getStatus().equals(ExamStatusEnum.SETTING)){
 			examinationBasic.setStatus(ExamStatusEnum.NOT_START);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -12,6 +12,7 @@ import com.keao.edu.thirdparty.yqpay.YqPayFeignService;
 import com.keao.edu.thirdparty.yqpay.YqPayUtil;
 import com.keao.edu.user.dao.ExamOrganizationRelationDao;
 import com.keao.edu.user.dao.ExamRegistrationPaymentDao;
+import com.keao.edu.user.dto.ExamRegistrationPaymentDto;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.entity.ExamRegistration;
@@ -113,8 +114,8 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
-        PageInfo<ExamRegistrationPayment> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+    public PageInfo<ExamRegistrationPaymentDto> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+        PageInfo<ExamRegistrationPaymentDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -122,12 +123,12 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
         params.put("organIds", nextLevelOrganIds);
 
-        List<ExamRegistrationPayment> dataList = Collections.EMPTY_LIST;
-        int count = this.findCount(params);
+        List<ExamRegistrationPaymentDto> dataList = Collections.EMPTY_LIST;
+        int count = examRegistrationPaymentDao.getOrderListCount(params);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = this.getDAO().queryPage(params);
+            dataList = examRegistrationPaymentDao.getOrderPageList(params);
         }
         pageInfo.setRows(dataList);
         return pageInfo;

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -74,11 +74,11 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             throw new BizException("请选择专业级别");
         }
 
-        if(examRegistration.getOrganId() == null){
+        if (examRegistration.getOrganId() == null) {
             throw new BizException("机构id不能为空");
         }
         Organization organization = organizationDao.get(examRegistration.getOrganId());
-        if(organization == null){
+        if (organization == null) {
             throw new BizException("机构不存在");
         }
         Date nowDate = new Date();
@@ -104,7 +104,6 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         examRegistration.setTheoryLevelFee(theoryLevelFee);
         examRegistration.setCreateTime(nowDate);
         examRegistration.setUpdateTime(nowDate);
-        examRegistrationDao.insert(examRegistration);
 
         ExamRegistrationPayment examIngOrder = examRegistrationPaymentService.getExamIngOrder(examinationBasic.getId(), examRegistration.getStudentId());
         if (examIngOrder != null) {
@@ -113,6 +112,11 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             if (examRegistrationPaymentService.update(examIngOrder) <= 0) {
                 throw new BizException("未支付订单关闭失败");
             }
+            ExamRegistration examReg = examRegistrationDao.get(examIngOrder.getExamRegistrationId());
+            examRegistration.setId(examReg.getId());
+            examRegistrationDao.update(examRegistration);
+        } else {
+            examRegistrationDao.insert(examRegistration);
         }
 
         ExamRegistrationPayment examRegistrationPayment = new ExamRegistrationPayment();
@@ -161,10 +165,10 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = this.getDAO().queryPage(params);
-            List<Integer> examIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
+            List<Integer> examIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getExaminationBasicId).collect(Collectors.toList());
             Map<Integer, String> examIdNameMap = this.getMap("examination_basic", "id_", "name_", examIds, Integer.class, String.class);
 
-            List<Integer> organIds = dataList.stream().filter(e->Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
+            List<Integer> organIds = dataList.stream().filter(e -> Objects.nonNull(e.getOrganId())).map(ExamRegistration::getOrganId).collect(Collectors.toList());
             Map<Integer, String> organIdNameMap = this.getMap("organization", "id_", "name_", organIds, Integer.class, String.class);
 
             List<Integer> subjectIds = dataList.stream().map(ExamRegistration::getSubjectId).collect(Collectors.toList());
@@ -252,18 +256,18 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 
     @Override
     public void updateExamRegistration(ExamRegistration examRegistration) {
-        if(Objects.isNull(examRegistration.getId())){
+        if (Objects.isNull(examRegistration.getId())) {
             throw new BizException("请指定学员报名信息");
         }
         ExamRegistration er = examRegistrationDao.get(examRegistration.getId().longValue());
-        if(Objects.isNull(er)) {
+        if (Objects.isNull(er)) {
             throw new BizException("学员报名信息不存在");
         }
-        if(!StudentRegistrationStatusEnum.AUDIT_WAIT.equals(er.getStatus())){
+        if (!StudentRegistrationStatusEnum.AUDIT_WAIT.equals(er.getStatus())) {
             throw new BizException("审核状态错误");
         }
-        if(!StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())
-            &&!StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())){
+        if (!StudentRegistrationStatusEnum.AUDIT_PASS.equals(examRegistration.getStatus())
+                && !StudentRegistrationStatusEnum.AUDIT_REJECT.equals(examRegistration.getStatus())) {
             throw new BizException("审核状态错误");
         }
         examRegistrationDao.update(examRegistration);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamTeacherSalaryServiceImpl.java

@@ -9,17 +9,15 @@ import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.dao.*;
 import com.keao.edu.user.dto.BaseUserInfoDto;
+import com.keao.edu.user.dto.ExamTeacherSalaryDto;
+import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.dto.TeacherDto;
 import com.keao.edu.user.entity.ExamTeacherSalary;
 import com.keao.edu.user.entity.Teacher;
-import com.keao.edu.user.enums.SettlementTypeEnum;
-import com.keao.edu.user.enums.TeacherSettlementTypeEnum;
 import com.keao.edu.user.page.ExamTeacherSalaryQueryInfo;
 import com.keao.edu.user.service.ExamTeacherSalaryService;
-import com.keao.edu.user.service.ExaminationBasicService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -27,7 +25,6 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeacherSalary> implements ExamTeacherSalaryService {
@@ -40,6 +37,8 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 	private ExamTeacherSalaryDao examTeacherSalaryDao;
 	@Autowired
 	private TeacherDao teacherDao;
+	@Autowired
+	private ExaminationBasicDao examinationBasicDao;
 
 	@Override
 	public BaseDAO<Long, ExamTeacherSalary> getDAO() {
@@ -91,6 +90,26 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 	}
 
 	@Override
+	public PageInfo<ExamTeacherSalaryDto> queryExamTeacherSalary(ExamTeacherSalaryQueryInfo queryInfo) {
+		PageInfo<ExamTeacherSalaryDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<ExamTeacherSalaryDto> dataList = new ArrayList<>();
+		int count = examTeacherSalaryDao.countExamTeacherSalary(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = examTeacherSalaryDao.queryExamTeacherSalary(params);
+			List<Integer> examIds = dataList.stream().map(ExamTeacherSalaryDto::getExaminationBasicId).collect(Collectors.toList());
+			List<ExaminationBasicDto> exams = examinationBasicDao.getExams(examIds);
+
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
 	public void deleteExamTeacherSalary(Long examTeacherSalaryId) {
 		ExamTeacherSalary examTeacherSalary = examTeacherSalaryDao.get(examTeacherSalaryId);
 		if(Objects.isNull(examTeacherSalary)){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -162,6 +162,13 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             SysUser sysUser = sysUserDao.get(examinationBasic.getCreatorId());
             examinationBasic.setCreatorName(sysUser.getRealName());
         }
+        if(Objects.nonNull(examinationBasic.getExamLocationIdList())){
+            List<ExamLocation> examLocations = examLocationDao.getExamLocationByIds(examinationBasic.getExamLocationIdList());
+            if(!CollectionUtils.isEmpty(examLocations)){
+                String locationNames = examLocations.stream().map(ExamLocation::getName).collect(Collectors.joining(","));
+                examinationBasic.setExamLocationNames(locationNames);
+            }
+        }
         return examinationBasic;
     }
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamOrganizationRelationMapper.xml

@@ -159,8 +159,11 @@
 			<if test="settlementType!=null">
 				AND ear.settlement_type_=#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
+			<if test="isAllowArrangeExam!=null">
+				AND ear.is_allow_arrange_exam_ = #{isAllowArrangeExam}
+			</if>
 			<if test="search!=null">
-				AND (ear.organ_id_=#{organId} OR a.name_ LIKE CONCAT(#{search}, '%'))
+				AND (ear.organ_id_=#{search} OR a.name_ LIKE CONCAT(#{search}, '%'))
 			</if>
 		</where>
 	</sql>
@@ -183,6 +186,22 @@
 		<include refid="queryCondition"/>
 	</select>
 
+	<select id="queryExamOrgans" resultMap="ExamOrganizationRelationExtraDto" parameterType="map">
+		SELECT
+		ear.*,
+		a.name_ organ_name_
+		FROM exam_organization_relation ear
+		LEFT JOIN organization a ON ear.organ_id_=a.id_
+		<include refid="queryCondition"/>
+		ORDER BY id_ <include refid="global.limit"/>
+	</select>
+
+	<select id="countExamOrgans" resultType="int">
+		SELECT COUNT(*) FROM exam_organization_relation ear
+		LEFT JOIN organization a ON ear.organ_id_=a.id_
+		<include refid="queryCondition"/>
+	</select>
+
 	<select id="getWithExam" resultMap="ExamOrganizationRelation">
 		SELECT * FROM exam_organization_relation WHERE examination_basic_id_=#{examId}
 	</select>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -122,6 +122,12 @@
             <if test="examRegistrationId!=null">
                 AND erp.exam_registration_id_=#{examRegistrationId}
             </if>
+            <if test="cardNo!=null">
+                AND ec.card_no_=#{cardNo}
+            </if>
+            <if test="examName!=null">
+                AND ec.card_no_=#{cardNo}
+            </if>
             <if test="organIds!=null">
                 AND erp.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -135,17 +141,28 @@
     </sql>
 
     <!-- 分页查询 -->
-    <select id="queryPage" resultMap="pageList" parameterType="map">
-        SELECT erp.* FROM exam_registration_payment erp
+    <select id="queryPage" resultMap="ExamRegistrationPayment" parameterType="map">
+        SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
+        LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
+        <include refid="queryCondition" />
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 分页查询 -->
+    <select id="getOrderPageList" resultMap="ExamRegistrationPaymentDto" parameterType="map">
+        SELECT erp.*,eb.exam_location_id_list_ FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
         <include refid="queryCondition" />
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
+    <select id="getOrderListCount" resultType="int">
         SELECT COUNT(*) FROM exam_registration_payment erp
         LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        LEFT JOIN examination_basic eb ON erp.examination_basic_id_ = eb.id_
         <include refid="queryCondition" />
     </select>
 
@@ -185,7 +202,8 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
 
-    <resultMap id="pageList" type="com.keao.edu.user.entity.ExamRegistrationPayment" extends="ExamRegistrationPayment">
+    <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto" extends="ExamRegistrationPayment">
         <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
+        <association property="examLocations"  select="com.keao.edu.user.dao.ExamLocationDao.getExamLocationByIds" column="{ids=exam_location_id_list_}"/>
     </resultMap>
 </mapper>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamTeacherSalaryMapper.xml

@@ -21,6 +21,10 @@
 		<result column="tenant_id_" property="tenantId" />
 		<association property="teacher" columnPrefix="teacher_" resultMap="com.keao.edu.user.dao.SysUserDao.SysUser"/>
  	</resultMap>
+
+	<resultMap id="ExamTeacherSalaryDto" type="com.keao.edu.user.dto.ExamTeacherSalaryDto" extends="ExamTeacherSalary">
+
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ExamTeacherSalary" >
@@ -147,6 +151,30 @@
 		<include refid="queryPageCondition"/>
 	</select>
 
+	<sql id="queryExamTeacherSalaryCondition">
+		<where>
+			<if test="examId!=null">
+				ets.examination_basic_id_ = #{examId}
+			</if>
+			<if test="teacherId!=null">
+				ets.teacher_id_=#{teacherId}
+			</if>
+		</where>
+	</sql>
+
+	<select id="queryExamTeacherSalary" resultMap="ExamTeacherSalary" parameterType="map">
+		SELECT ets.*,su.real_name_ teacher_real_name_
+		FROM exam_teacher_salary ets
+		LEFT JOIN sys_user su ON ets.teacher_id_=su.id_
+		<include refid="queryExamTeacherSalaryCondition"/>
+		ORDER BY id_ <include refid="global.limit"/>
+	</select>
+
+	<select id="countExamTeacherSalary" resultType="int">
+		SELECT COUNT(*) FROM exam_teacher_salary ets
+		<include refid="queryExamTeacherSalaryCondition"/>
+	</select>
+
     <select id="queryWithExam" resultMap="ExamTeacherSalary">
 		SELECT * FROM exam_teacher_salary WHERE examination_basic_id_=#{examId}
 	</select>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExaminationBasicMapper.xml

@@ -195,4 +195,13 @@
     <select id="getNeedUpdateStatusExams" resultMap="ExaminationBasic">
 		SELECT * FROM examination_basic WHERE status_ IN ('NOT_START', 'APPLYING', 'APPLIED')
 	</select>
+
+	<select id="getExams" resultMap="ExaminationBasicDto">
+		SELECT * FROM examination_basic
+		WHERE status_ IN ('EXAM_END')
+		AND id_ IN
+		<foreach collection="examIds" item="examId" separator="," open="(" close=")">
+			#{examId}
+		</foreach>
+	</select>
 </mapper>