update

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

@@ -38,8 +38,8 @@ public class ExamOrganizationRelationController extends BaseController {
 
     @ApiOperation("发送考级报名链接")
     @GetMapping(value = "/sendUrl")
-    public HttpResponseResult sendUrl(Integer examId, String agencyIds){
-        examOrganizationRelationService.sendUrl(examId, agencyIds);
+    public HttpResponseResult sendUrl(Integer examId, String organIds){
+        examOrganizationRelationService.sendUrl(examId, organIds);
         return succeed();
     }
 

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

@@ -3,7 +3,6 @@ package com.keao.edu.user.controller;
 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.entity.Agency;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
 import com.keao.edu.user.service.ExamRegistrationService;
@@ -35,7 +34,7 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "修改学员报名信息")
     @PostMapping(value = "update")
     @PreAuthorize("@pcs.hasPermissions('examRegistration/update')")
-    public HttpResponseResult updateAgency(@RequestBody ExamRegistration examRegistration) {
+    public HttpResponseResult update(@RequestBody ExamRegistration examRegistration) {
         examRegistrationService.update(examRegistration);
         return succeed();
     }

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

@@ -5,7 +5,7 @@ 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.entity.Organization;
-import com.keao.edu.user.page.AgencyQueryInfo;
+import com.keao.edu.user.page.OrganizationQueryInfo;
 import com.keao.edu.user.service.OrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,14 +27,14 @@ public class OrganizationController extends BaseController {
 	@ApiOperation(value = "合作单位列表")
 	@GetMapping(value = "list")
     @PreAuthorize("@pcs.hasPermissions('organization/list')")
-	public HttpResponseResult<PageInfo<Organization>> configList(AgencyQueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<Organization>> configList(OrganizationQueryInfo queryInfo) {
 		return succeed(organizationService.queryPage(queryInfo));
 	}
 
 	@ApiOperation(value = "修改合作单位")
 	@PostMapping(value = "update")
     @PreAuthorize("@pcs.hasPermissions('organization/update')")
-	public HttpResponseResult updateAgency(@RequestBody Organization organization) {
+	public HttpResponseResult updateOrganization(@RequestBody Organization organization) {
 		organizationService.updateOrganization(organization);
 		return succeed();
 	}

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

@@ -10,11 +10,11 @@ import java.util.List;
 public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
     /**
-     * @describe 获取指定机构下的所有代理商
+     * @describe 获取指定机构下的所有合作单位
      * @author Joburgess
      * @date 2020.06.18
      * @param tenantId:
-     * @return java.util.List<com.keao.edu.user.entity.Agency>
+     * @return
      */
     List<Organization> getByTenant(@Param("tenantId") String tenantId);
 

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

@@ -22,7 +22,7 @@ public class ExamRegistration {
 	private SysUser sysUser;
 
 	@ApiModelProperty(value = "代理商编号")
-	private Integer agencyId;
+	private Integer organId;
 
 	@ApiModelProperty(value = "合作单位信息")
 	private Organization organization;
@@ -118,15 +118,15 @@ public class ExamRegistration {
 	public Integer getStudentId(){
 		return this.studentId;
 	}
-			
-	public void setAgencyId(Integer agencyId){
-		this.agencyId = agencyId;
+
+	public Integer getOrganId() {
+		return organId;
 	}
-	
-	public Integer getAgencyId(){
-		return this.agencyId;
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
 	}
-			
+
 	public void setSubjectId(Integer subjectId){
 		this.subjectId = subjectId;
 	}

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

@@ -13,8 +13,8 @@ public class ExamRegistrationQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考试项目编号")
     private Integer examId;
 
-    @ApiModelProperty(value = "机构编号")
-    private Integer agencyId;
+    @ApiModelProperty(value = "合作单位编号")
+    private Integer organizationId;
 
     @ApiModelProperty(value = "专业编号")
     private Integer subjectId;
@@ -33,12 +33,12 @@ public class ExamRegistrationQueryInfo extends QueryInfo {
         this.examId = examId;
     }
 
-    public Integer getAgencyId() {
-        return agencyId;
+    public Integer getOrganizationId() {
+        return organizationId;
     }
 
-    public void setAgencyId(Integer agencyId) {
-        this.agencyId = agencyId;
+    public void setOrganizationId(Integer organizationId) {
+        this.organizationId = organizationId;
     }
 
     public Integer getSubjectId() {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/AgencyQueryInfo.java → edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/OrganizationQueryInfo.java

@@ -2,7 +2,7 @@ package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
 
-public class AgencyQueryInfo extends QueryInfo {
+public class OrganizationQueryInfo extends QueryInfo {
 
     private String settlementType;
 

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

@@ -7,13 +7,13 @@ import com.keao.edu.user.entity.Organization;
 public interface OrganizationService extends BaseService<Integer, Organization> {
 
     /**
-     * 新增代理商
-     * @param agency
+     * 新增合作单位
+     * @param organ
      */
-    void add(Organization agency);
+    void add(Organization organ);
 
     /**
-     * 修改代理商
+     * 修改合作单位
      * @param organization
      */
     void updateOrganization(Organization organization);

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

@@ -48,8 +48,8 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		examOrganizationRelation.setShareProfitAmount(BigDecimal.ZERO);
 		examOrganizationRelation.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
 		examOrganizationRelation.setTotalPaymentAmount(BigDecimal.ZERO);
-		Set<Integer> agencyIds = examOrganizationRelationDao.getOrganIdsWithExam(examOrganizationRelation.getExaminationBasicId());
-		if(agencyIds.contains(examOrganizationRelation.getOrganId())){
+		Set<Integer> organIds = examOrganizationRelationDao.getOrganIdsWithExam(examOrganizationRelation.getExaminationBasicId());
+		if(organIds.contains(examOrganizationRelation.getOrganId())){
 			examOrganizationRelationDao.update(examOrganizationRelation);
 		}else{
 			examOrganizationRelationDao.insert(examOrganizationRelation);
@@ -58,25 +58,25 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void sendUrl(Integer examId, String agencyIdStrs) {
+	public void sendUrl(Integer examId, String organIdStrs) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
-		if(StringUtils.isBlank(agencyIdStrs)){
+		if(StringUtils.isBlank(organIdStrs)){
 			throw new BizException("请指定代理商");
 		}
 		Set<Integer> existOrganizationIds = examOrganizationRelationDao.getOrganIdsWithExam(examId);
-		List<Integer> agencyIds = Arrays.asList(agencyIdStrs.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());
+		List<Integer> organIds = Arrays.asList(organIdStrs.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());
 		List<Integer> updateSendFlagOrganizationIds=new ArrayList<>();
 		List<ExamOrganizationRelation> examOrganizationRelations=new ArrayList<>();
-		for (Integer agencyId : agencyIds) {
-			if(existOrganizationIds.contains(agencyId)){
-				updateSendFlagOrganizationIds.add(agencyId);
+		for (Integer organId : organIds) {
+			if(existOrganizationIds.contains(organId)){
+				updateSendFlagOrganizationIds.add(organId);
 				continue;
 			}
 			ExamOrganizationRelation examOrganizationRelation=new ExamOrganizationRelation();
 			examOrganizationRelation.setExaminationBasicId(examId);
-			examOrganizationRelation.setOrganId(agencyId);
+			examOrganizationRelation.setOrganId(organId);
 			examOrganizationRelation.setSendUrlFlag(YesOrNoEnum.YES);
 			examOrganizationRelation.setTenantId(TenantContextHolder.getTenantId().toString());
 			examOrganizationRelations.add(examOrganizationRelation);

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

@@ -38,12 +38,12 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = this.getDAO().queryPage(params);
-			List<Integer> agencyIds = dataList.stream().map(ExamRegistration::getAgencyId).collect(Collectors.toList());
-			Map<Integer, String> agencyIdNameMap = this.getMap("agency", "id_", "name_", agencyIds, Integer.class, String.class);
+			List<Integer> organIds = dataList.stream().map(ExamRegistration::getOrganId).collect(Collectors.toList());
+			Map<Integer, String> organIdNameMap = this.getMap("agency", "id_", "name_", organIds, Integer.class, String.class);
 			List<Integer> subjectIds = dataList.stream().map(ExamRegistration::getSubjectId).collect(Collectors.toList());
 			Map<Integer, String> subjectIdNameMap = this.getMap("subject", "id_", "name_", subjectIds, Integer.class, String.class);
 			for (ExamRegistration examRegistration : dataList) {
-				examRegistration.getOrganization().setName(agencyIdNameMap.get(examRegistration.getAgencyId()));
+				examRegistration.getOrganization().setName(organIdNameMap.get(examRegistration.getOrganId()));
 				examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getStudentId()));
 			}
 		}

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

@@ -23,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
 	
 	@Autowired
-	private OrganizationDao agencyDao;
+	private OrganizationDao organDao;
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
@@ -31,30 +31,30 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
 	@Override
 	public BaseDAO<Integer, Organization> getDAO() {
-		return agencyDao;
+		return organDao;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(Organization agency) {
-		SysUser sysUser = agency.getSysUser();
+	public void add(Organization organ) {
+		SysUser sysUser = organ.getSysUser();
 		String tenantId = TenantContextHolder.getTenantId().toString();
-		agency.setTenantId(tenantId);
+		organ.setTenantId(tenantId);
 		sysUser.setTenantId(tenantId);
 		SysUser user = sysUserDao.queryByPhone(sysUser.getPhone());
 		if(user != null && user.getId() != null){
-			Organization organization = agencyDao.get(user.getId());
+			Organization organization = organDao.get(user.getId());
 			if(organization == null){
 				if(StringUtils.isEmpty(user.getPassword())){
 					sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 				}
-				agency.setId(user.getId());
-				agencyDao.insert(agency);
+				organ.setId(user.getId());
+				organDao.insert(organ);
 				//新增用户角色
 				sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
 				user.setUserType(user.getUserType() + ",AGENCY");
-				user.setRealName(agency.getName());
-				user.setPhone(agency.getContactPhone());
+				user.setRealName(organ.getName());
+				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
 				return;
 			}else{
@@ -63,12 +63,12 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		sysUser.setUserType("AGENCY");
-		sysUser.setRealName(agency.getName());
-		sysUser.setPhone(agency.getContactPhone());
+		sysUser.setRealName(organ.getName());
+		sysUser.setPhone(organ.getContactPhone());
 		sysUserDao.insert(sysUser);
 
-		agency.setId(sysUser.getId());
-		agencyDao.insert(agency);
+		organ.setId(sysUser.getId());
+		organDao.insert(organ);
 		//新增用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		if(sysUser.getRoles() != null && sysUser.getRoles().size() > 0){
@@ -83,7 +83,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Transactional(rollbackFor = Exception.class)
 	public void updateOrganization(Organization organization) {
 		SysUser sysUser = organization.getSysUser();
-		if(null == agencyDao.get(sysUser.getId())){
+		if(null == organDao.get(sysUser.getId())){
 			throw new BizException("合作商信息不存在");
 		}
 		organization.setId(sysUser.getId());
@@ -95,7 +95,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		}
 		sysUser.setRealName(organization.getName());
 		sysUser.setPhone(organization.getContactPhone());
-		agencyDao.update(organization);
+		organDao.update(organization);
 		//删除当前用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		//新增用户角色

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

@@ -10,7 +10,7 @@
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="student_id_" property="studentId" />
-		<result column="agency_id_" property="agencyId" />
+		<result column="organ_id_" property="organId" />
 		<result column="subject_id_" property="subjectId" />
 		<result column="level_" property="level" />
 		<result column="song_json_" property="songJson" />
@@ -39,8 +39,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_registration (id_,examination_basic_id_,student_id_,agency_id_,subject_id_,level_,song_json_,last_exam_level_,last_exam_certificate_url_,adviser_name_,adviser_phone_,card_no_,status_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{studentId},#{agencyId},#{subjectId},#{level},#{songJson},#{lastExamLevel},#{lastExamCertificateUrl},#{adviserName},#{adviserPhone},#{cardNo},#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(), NOW(),#{tenantId})
+		INSERT INTO exam_registration (id_,examination_basic_id_,student_id_,organ_id_,subject_id_,level_,song_json_,last_exam_level_,last_exam_certificate_url_,adviser_name_,adviser_phone_,card_no_,status_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examinationBasicId},#{studentId},#{organId},#{subjectId},#{level},#{songJson},#{lastExamLevel},#{lastExamCertificateUrl},#{adviserName},#{adviserPhone},#{cardNo},#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(), NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -68,8 +68,8 @@
 			<if test="level != null">
 				level_ = #{level},
 			</if>
-			<if test="agencyId != null">
-				agency_id_ = #{agencyId},
+			<if test="organId != null">
+				organ_id_ = #{organId},
 			</if>
 			<if test="songJson != null">
 				song_json_ = #{songJson},
@@ -103,8 +103,8 @@
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
-			<if test="agencyId!=null">
-				AND er.agency_id_ = #{agencyId}
+			<if test="organId!=null">
+				AND er.organ_id_ = #{organId}
 			</if>
 			<if test="subjectId!=null">
 				AND er.subject_id_ = #{subjectId}
@@ -125,7 +125,7 @@
 			er.card_no_,
 			er.student_id_,
 			su.real_name_ sys_user_real_name_,
-			er.agency_id_,
+			er.organ_id_,
 			er.subject_id_,
 			er.level_,
 			erp.trans_amount_,

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

@@ -41,7 +41,7 @@
 		VALUES(#{id},#{name},#{examMode,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examLocationIdList},#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{enrollStartTime},#{enrollEndTime},#{expectExamStartTime},#{expectExamEndTime},#{posterTitle},#{posterProfile},#{posterBackgroundImg},NOW(),NOW(),#{tenantId},#{memo})
 	</insert>
 
-	<update id="update" parameterType="com.keao.edu.user.entity.ExamAgencyRelation">
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation">
 		UPDATE examination_basic
 		<set>
 			<if test="name != null">
@@ -87,7 +87,7 @@
 		</set> WHERE id_ = #{id}
 	</update>
 
-	<update id="batchUpdate" parameterType="com.keao.edu.user.entity.ExamAgencyRelation">
+	<update id="batchUpdate" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation">
 		<foreach collection="exams" item="exam" separator=";">
 			UPDATE examination_basic
 			<set>

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

@@ -68,7 +68,7 @@
 		UPDATE organization SET del_flag_ = 1,update_time_ = NOW() WHERE id_ = #{id}
 	</delete>
 
-	<sql id="agencyQueryPage">
+	<sql id="organQueryPage">
 		<where>
 			del_flag_ = 0 AND tenant_id_ = #{tenantId}
 			<if test="settlementType">
@@ -85,14 +85,14 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="Organization" parameterType="map">
 		SELECT * FROM organization
-		<include refid="agencyQueryPage"/>
+		<include refid="organQueryPage"/>
 		ORDER BY update_time_ DESC <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM organization
-		<include refid="agencyQueryPage"/>
+		<include refid="organQueryPage"/>
 	</select>
 
 	<select id="getByTenant" resultMap="Organization">