Joburgess %!s(int64=5) %!d(string=hai) anos
pai
achega
3b7946ad76

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

@@ -11,7 +11,7 @@ import java.util.Set;
 public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizationRelation> {
 
     /**
-     * @describe 批量插入考级项目与代理关联
+     * @describe 批量插入考级项目与合作单位关联
      * @author Joburgess
      * @date 2020.06.18
      * @param examOrganizationRelations:
@@ -20,11 +20,11 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
     int batchInsert(@Param("examOrganizationRelations") List<ExamOrganizationRelation> examOrganizationRelations);
 
     /**
-     * @describe 批量更新代理商的链接发送状态
+     * @describe 批量更新合作单位的链接发送状态
      * @author Joburgess
      * @date 2020.06.18
      * @param examId: 考级项目编号
-     * @param organIds: 代理商编号列表
+     * @param organIds: 合作单位编号列表
      * @param sendUrlFlag: 链接发送状态
      * @return int
      */
@@ -33,7 +33,7 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
                                @Param("sendUrlFlag")YesOrNoEnum sendUrlFlag);
 
     /**
-     * @describe 获取考级项目关联的代理商
+     * @describe 获取考级项目关联的合作单位
      * @author Joburgess
      * @date 2020.06.18
      * @param examId:
@@ -42,7 +42,7 @@ public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizat
     List<ExamOrganizationRelation> getWithExam(@Param("examId") Integer examId);
 
     /**
-     * @describe 获取考级项目关联的代理商编号
+     * @describe 获取考级项目关联的合作单位编号
      * @author Joburgess
      * @date 2020.06.18
      * @param examId:

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -21,7 +21,7 @@ public class ExamRegistration {
 	@ApiModelProperty(value = "学员基本信息")
 	private SysUser sysUser;
 
-	@ApiModelProperty(value = "代理商编号")
+	@ApiModelProperty(value = "合作单位编号")
 	private Integer organId;
 
 	@ApiModelProperty(value = "合作单位信息")

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Organization.java

@@ -13,7 +13,7 @@ public class Organization {
 	/**  */
 	private Integer id;
 
-	@ApiModelProperty(value = "代理商名字",required = false)
+	@ApiModelProperty(value = "合作单位名字",required = false)
 	private String name;
 
 	@ApiModelProperty(value = "联系人名字",required = false)

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

@@ -42,7 +42,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			throw new BizException("请指定考级项目");
 		}
 		if(Objects.isNull(examOrganizationRelation.getOrganId())){
-			throw new BizException("请指定代理商");
+			throw new BizException("请指定合作单位");
 		}
 		examOrganizationRelation.setTenantId(TenantContextHolder.getTenantId().toString());
 		examOrganizationRelation.setShareProfitAmount(BigDecimal.ZERO);
@@ -63,7 +63,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			throw new BizException("请指定考级项目");
 		}
 		if(StringUtils.isBlank(organIdStrs)){
-			throw new BizException("请指定代理商");
+			throw new BizException("请指定合作单位");
 		}
 		Set<Integer> existOrganizationIds = examOrganizationRelationDao.getOrganIdsWithExam(examId);
 		List<Integer> organIds = Arrays.asList(organIdStrs.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());