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

edu-common/src/main/java/com/keao/edu/common/service/impl/BaseServiceImpl.java

@@ -22,6 +22,7 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.ParameterizedType;
 import java.math.BigDecimal;
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -123,8 +124,9 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 		StringBuffer sql=new StringBuffer();
 		Map<Y,Z> result=new HashMap();
 		try {
+			Connection connection = sqlSessionFactory.openSession().getConnection();
 			sql.append("select ").append(columnKey).append(",").append(columnValue).append(" FROM ").append(tableName).append(" WHERE ").append(columnKey).append(" IN (").append(StringUtils.join(ids, ",")).append(")");
-			PreparedStatement ps = sqlSessionFactory.openSession().getConnection().prepareStatement(sql.toString());
+			PreparedStatement ps = connection.prepareStatement(sql.toString());
 			ResultSet resultSet = ps.executeQuery();
 			while (resultSet.next()){
 				Y key;
@@ -145,6 +147,15 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 				}
 				result.put(key, value);
 			}
+			if(resultSet!=null){
+				resultSet.close();
+			}
+			if(ps!=null){
+				ps.close();
+			}
+			if(connection!=null){
+				connection.close();
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -157,12 +168,22 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 		StringBuffer sql=new StringBuffer();
 		Map<String, String> result=new HashMap();
 		try {
-			sql.append("select ").append(columnKey).append(",").append(columnValue).append(" FROM ").append(tableName).append(" WHERE ").append(columnKey).append(" IN (").append(StringUtils.join(ids, ",")).append(")");
-			PreparedStatement ps = sqlSessionFactory.openSession().getConnection().prepareStatement(sql.toString());
+			Connection connection = sqlSessionFactory.openSession().getConnection();
+			sql.append("SELECT ").append(columnKey).append(",").append(columnValue).append(" FROM ").append(tableName).append(" WHERE ").append(columnKey).append(" IN (").append(StringUtils.join(ids, ",")).append(")");
+			PreparedStatement ps = connection.prepareStatement(sql.toString());
 			ResultSet resultSet = ps.executeQuery();
 			while (resultSet.next()){
 				result.put(resultSet.getString(1), resultSet.getString(2));
 			}
+			if(resultSet!=null){
+				resultSet.close();
+			}
+			if(ps!=null){
+				ps.close();
+			}
+			if(connection!=null){
+				connection.close();
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

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

@@ -1,64 +0,0 @@
-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.page.AgencyQueryInfo;
-import com.keao.edu.user.service.AgencyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 代理商服务
- */
-@RestController
-@Api(tags = "代理商服务")
-@RequestMapping(value = "agency")
-public class AgencyController extends BaseController {
-
-	@Autowired
-	private AgencyService agencyService;
-
-	@ApiOperation(value = "代理商列表")
-	@GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('agency/list')")
-	public HttpResponseResult<PageInfo<Agency>> configList(AgencyQueryInfo queryInfo) {
-		return succeed(agencyService.queryPage(queryInfo));
-	}
-
-	@ApiOperation(value = "修改代理商")
-	@PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('agency/update')")
-	public HttpResponseResult updateAgency(@RequestBody Agency agency) {
-		agencyService.updateAgency(agency);
-		return succeed();
-	}
-
-	@ApiOperation(value = "新增代理商")
-	@PostMapping(value = "add")
-    @PreAuthorize("@pcs.hasPermissions('agency/add')")
-	public HttpResponseResult addConfig(@RequestBody Agency agency) {
-		agencyService.add(agency);
-		return succeed();
-	}
-
-	@ApiOperation(value = "查询代理商")
-	@GetMapping(value = "get")
-    @PreAuthorize("@pcs.hasPermissions('agency/get')")
-	public HttpResponseResult<Agency> getConfig(Integer id) {
-		return succeed(agencyService.get(id));
-	}
-
-	@ApiOperation(value = "删除代理商")
-	@PostMapping(value = "del")
-    @PreAuthorize("@pcs.hasPermissions('agency/del')")
-	public HttpResponseResult del(Integer id) {
-		agencyService.delete(id);
-		return succeed();
-	}
-}

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

@@ -1,48 +0,0 @@
-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.ExamAgencyRelation;
-import com.keao.edu.user.page.ExamAgencyRelationQueryInfo;
-import com.keao.edu.user.service.ExamAgencyRelationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-@RestController
-@RequestMapping("examAgencyRelation")
-@Api(tags = "考级项目代理商服务")
-public class ExamAgencyRelationController extends BaseController {
-
-    @Autowired
-    private ExamAgencyRelationService examAgencyRelationService;
-
-    @ApiOperation("分页查询")
-    @GetMapping(value = "/list")
-    public HttpResponseResult<PageInfo<ExamAgencyRelation>> getList(ExamAgencyRelationQueryInfo queryInfo) {
-        return succeed(examAgencyRelationService.queryPage(queryInfo));
-    }
-
-    @ApiOperation("更新考级项目与代理商关联信息")
-    @PostMapping(value = "/updateExamAgencyRelation")
-    public HttpResponseResult updateExamAgencyRelation(@RequestBody ExamAgencyRelation examAgencyRelation){
-        examAgencyRelationService.updateExamAgencyRelation(examAgencyRelation);
-        return succeed();
-    }
-
-    @ApiOperation("发送考级报名链接")
-    @GetMapping(value = "/sendUrl")
-    public HttpResponseResult sendUrl(Integer examId, String agencyIds){
-        examAgencyRelationService.sendUrl(examId, agencyIds);
-        return succeed();
-    }
-
-}

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

@@ -0,0 +1,46 @@
+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.ExamOrganizationRelation;
+import com.keao.edu.user.page.ExamOrganizationRelationQueryInfo;
+import com.keao.edu.user.service.ExamOrganizationRelationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.18
+ */
+@RestController
+@RequestMapping("examOrganizationRelation")
+@Api(tags = "考级项目合作单位服务")
+public class ExamOrganizationRelationController extends BaseController {
+
+    @Autowired
+    private ExamOrganizationRelationService examOrganizationRelationService;
+
+    @ApiOperation("分页查询")
+    @GetMapping(value = "/list")
+    public HttpResponseResult<PageInfo<ExamOrganizationRelation>> getList(ExamOrganizationRelationQueryInfo queryInfo) {
+        return succeed(examOrganizationRelationService.queryPage(queryInfo));
+    }
+
+    @ApiOperation("更新考级项目与合作单位关联信息")
+    @PostMapping(value = "/updateExamOrganizationRelation")
+    public HttpResponseResult updateExamOrganizationRelation(@RequestBody ExamOrganizationRelation examOrganizationRelation){
+        examOrganizationRelationService.updateExamOrganizationRelation(examOrganizationRelation);
+        return succeed();
+    }
+
+    @ApiOperation("发送考级报名链接")
+    @GetMapping(value = "/sendUrl")
+    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

@@ -0,0 +1,64 @@
+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.Organization;
+import com.keao.edu.user.page.OrganizationQueryInfo;
+import com.keao.edu.user.service.OrganizationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 合作单位服务
+ */
+@RestController
+@Api(tags = "合作单位服务")
+@RequestMapping(value = "organization")
+public class OrganizationController extends BaseController {
+
+	@Autowired
+	private OrganizationService organizationService;
+
+	@ApiOperation(value = "合作单位列表")
+	@GetMapping(value = "list")
+    @PreAuthorize("@pcs.hasPermissions('organization/list')")
+	public HttpResponseResult<PageInfo<Organization>> configList(OrganizationQueryInfo queryInfo) {
+		return succeed(organizationService.queryPage(queryInfo));
+	}
+
+	@ApiOperation(value = "修改合作单位")
+	@PostMapping(value = "update")
+    @PreAuthorize("@pcs.hasPermissions('organization/update')")
+	public HttpResponseResult updateOrganization(@RequestBody Organization organization) {
+		organizationService.updateOrganization(organization);
+		return succeed();
+	}
+
+	@ApiOperation(value = "新增合作单位")
+	@PostMapping(value = "add")
+    @PreAuthorize("@pcs.hasPermissions('organization/add')")
+	public HttpResponseResult addConfig(@RequestBody Organization organization) {
+		organizationService.add(organization);
+		return succeed();
+	}
+
+	@ApiOperation(value = "查询合作单位")
+	@GetMapping(value = "get")
+    @PreAuthorize("@pcs.hasPermissions('organization/get')")
+	public HttpResponseResult<Organization> getConfig(Integer id) {
+		return succeed(organizationService.get(id));
+	}
+
+	@ApiOperation(value = "删除合作单位")
+	@PostMapping(value = "del")
+    @PreAuthorize("@pcs.hasPermissions('organization/del')")
+	public HttpResponseResult del(Integer id) {
+		organizationService.delete(id);
+		return succeed();
+	}
+}

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

@@ -1,22 +0,0 @@
-package com.keao.edu.user.dao;
-
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.Agency;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface AgencyDao extends BaseDAO<Integer, Agency> {
-
-    /**
-     * @describe 获取指定机构下的所有代理商
-     * @author Joburgess
-     * @date 2020.06.18
-     * @param tenantId:
-     * @return java.util.List<com.keao.edu.user.entity.Agency>
-     */
-    List<Agency> getByTenant(@Param("tenantId") String tenantId);
-
-}

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

@@ -1,35 +1,35 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.user.entity.ExamAgencyRelation;
+import com.keao.edu.user.entity.ExamOrganizationRelation;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Set;
 
-public interface ExamAgencyRelationDao extends BaseDAO<Long, ExamAgencyRelation> {
+public interface ExamOrganizationRelationDao extends BaseDAO<Long, ExamOrganizationRelation> {
 
     /**
      * @describe 批量插入考级项目与代理关联
      * @author Joburgess
      * @date 2020.06.18
-     * @param examAgencyRelations:
+     * @param examOrganizationRelations:
      * @return int
      */
-    int batchInsert(@Param("examAgencyRelations") List<ExamAgencyRelation> examAgencyRelations);
+    int batchInsert(@Param("examOrganizationRelations") List<ExamOrganizationRelation> examOrganizationRelations);
 
     /**
      * @describe 批量更新代理商的链接发送状态
      * @author Joburgess
      * @date 2020.06.18
      * @param examId: 考级项目编号
-     * @param agencyIds: 代理商编号列表
+     * @param organIds: 代理商编号列表
      * @param sendUrlFlag: 链接发送状态
      * @return int
      */
     int batchUpdateSendUrlFlag(@Param("examId") Integer examId,
-                               @Param("agencyIds") List<Integer> agencyIds,
+                               @Param("organIds") List<Integer> organIds,
                                @Param("sendUrlFlag")YesOrNoEnum sendUrlFlag);
 
     /**
@@ -37,9 +37,9 @@ public interface ExamAgencyRelationDao extends BaseDAO<Long, ExamAgencyRelation>
      * @author Joburgess
      * @date 2020.06.18
      * @param examId:
-     * @return com.keao.edu.user.entity.ExamAgencyRelation
+     * @return com.keao.edu.user.entity.ExamOrganizationRelation
      */
-    List<ExamAgencyRelation> getWithExam(@Param("examId") Integer examId);
+    List<ExamOrganizationRelation> getWithExam(@Param("examId") Integer examId);
 
     /**
      * @describe 获取考级项目关联的代理商编号
@@ -48,6 +48,6 @@ public interface ExamAgencyRelationDao extends BaseDAO<Long, ExamAgencyRelation>
      * @param examId:
      * @return java.util.Set<java.lang.Integer>
      */
-    Set<Integer> getAgencyIdsWithExam(@Param("examId") Integer examId);
+    Set<Integer> getOrganIdsWithExam(@Param("examId") Integer examId);
 	
 }

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

@@ -0,0 +1,21 @@
+package com.keao.edu.user.dao;
+
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.entity.Organization;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface OrganizationDao extends BaseDAO<Integer, Organization> {
+
+    /**
+     * @describe 获取指定机构下的所有合作单位
+     * @author Joburgess
+     * @date 2020.06.18
+     * @param tenantId:
+     * @return
+     */
+    List<Organization> getByTenant(@Param("tenantId") String tenantId);
+
+}

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

@@ -1,18 +0,0 @@
-package com.keao.edu.user.dto;
-
-/**
- * @Author Joburgess
- * @Date 2020.06.18
- */
-public class ExamAgencyRelationExtraDto {
-
-    private String agencyName;
-
-    public String getAgencyName() {
-        return agencyName;
-    }
-
-    public void setAgencyName(String agencyName) {
-        this.agencyName = agencyName;
-    }
-}

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

@@ -0,0 +1,18 @@
+package com.keao.edu.user.dto;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.18
+ */
+public class ExamOrganizationRelationExtraDto {
+
+    private String organizationName;
+
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamAgencyRelation.java → edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamOrganizationRelation.java

@@ -10,18 +10,18 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(exam_agency_relation):
  */
-public class ExamAgencyRelation {
+public class ExamOrganizationRelation {
 
 	private Long id;
 
-	@ApiModelProperty(value = "代理商基本信息")
-	private Agency agency;
+	@ApiModelProperty(value = "合作单位基本信息")
+	private Organization organization;
 
 	@ApiModelProperty(value = "考试编号")
 	private Integer examinationBasicId;
 
-	@ApiModelProperty(value = "代理人编号")
-	private Integer agencyId;
+	@ApiModelProperty(value = "合作单位编号")
+	private Integer organId;
 
 	@ApiModelProperty(value = "分润结算方式")
 	private SettlementTypeEnum settlementType;
@@ -55,12 +55,12 @@ public class ExamAgencyRelation {
 		return this.id;
 	}
 
-	public Agency getAgency() {
-		return agency;
+	public Organization getOrganization() {
+		return organization;
 	}
 
-	public void setAgency(Agency agency) {
-		this.agency = agency;
+	public void setOrganization(Organization organization) {
+		this.organization = organization;
 	}
 
 	public void setExaminationBasicId(Integer examinationBasicId){
@@ -87,12 +87,12 @@ public class ExamAgencyRelation {
 		this.totalPaymentAmount = totalPaymentAmount;
 	}
 
-	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 SettlementTypeEnum getSettlementType() {

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

@@ -22,10 +22,10 @@ public class ExamRegistration {
 	private SysUser sysUser;
 
 	@ApiModelProperty(value = "代理商编号")
-	private Integer agencyId;
+	private Integer organId;
 
-	@ApiModelProperty(value = "代理商信息")
-	private Agency agency;
+	@ApiModelProperty(value = "合作单位信息")
+	private Organization organization;
 	
 	@ApiModelProperty(value = "专业编号")
 	private Integer subjectId;
@@ -71,12 +71,12 @@ public class ExamRegistration {
 		return this.id;
 	}
 
-	public Agency getAgency() {
-		return agency;
+	public Organization getOrganization() {
+		return organization;
 	}
 
-	public void setAgency(Agency agency) {
-		this.agency = agency;
+	public void setOrganization(Organization organization) {
+		this.organization = organization;
 	}
 
 	public StudentRegistrationStatusEnum getStatus() {
@@ -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/entity/Agency.java → edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/Organization.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(agency):
  */
-public class Agency {
+public class Organization {
 
 	/**  */
 	private Integer id;

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

@@ -10,7 +10,7 @@ import javax.management.Query;
  * @Author Joburgess
  * @Date 2020.06.18
  */
-public class ExamAgencyRelationQueryInfo extends QueryInfo {
+public class ExamOrganizationRelationQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "考试项目编号")
     private Integer examId;

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/AgencyService.java

@@ -1,20 +0,0 @@
-package com.keao.edu.user.service;
-
-
-import com.keao.edu.common.service.BaseService;
-import com.keao.edu.user.entity.Agency;
-
-public interface AgencyService extends BaseService<Integer, Agency> {
-
-    /**
-     * 新增代理商
-     * @param agency
-     */
-    void add(Agency agency);
-
-    /**
-     * 修改代理商
-     * @param agency
-     */
-    void updateAgency(Agency agency);
-}

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

@@ -1,29 +0,0 @@
-package com.keao.edu.user.service;
-
-import com.keao.edu.common.service.BaseService;
-import com.keao.edu.user.entity.ExamAgencyRelation;
-
-public interface ExamAgencyRelationService extends BaseService<Long, ExamAgencyRelation> {
-
-    /**
-     * @describe 更新考级项目与代理商关联信息
-     * @author Joburgess
-     * @date 2020.06.18
-     * @param examAgencyRelation:
-     * @return void
-     */
-    void updateExamAgencyRelation(ExamAgencyRelation examAgencyRelation);
-
-    /**
-     * @describe 发送考级报名链接
-     * @author Joburgess
-     * @date 2020.06.18
-     * @param examId:
-     * @param agencyIds:
-     * @return void
-     */
-    void sendUrl(Integer examId, String agencyIds);
-
-
-
-}

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

@@ -0,0 +1,29 @@
+package com.keao.edu.user.service;
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.ExamOrganizationRelation;
+
+public interface ExamOrganizationRelationService extends BaseService<Long, ExamOrganizationRelation> {
+
+    /**
+     * @describe 更新考级项目与合作单位关联信息
+     * @author Joburgess
+     * @date 2020.06.18
+     * @param examOrganizationRelation:
+     * @return void
+     */
+    void updateExamOrganizationRelation(ExamOrganizationRelation examOrganizationRelation);
+
+    /**
+     * @describe 发送考级报名链接
+     * @author Joburgess
+     * @date 2020.06.18
+     * @param examId:
+     * @param agencyIds:
+     * @return void
+     */
+    void sendUrl(Integer examId, String organIds);
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.keao.edu.user.service;
+
+
+import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.entity.Organization;
+
+public interface OrganizationService extends BaseService<Integer, Organization> {
+
+    /**
+     * 新增合作单位
+     * @param organ
+     */
+    void add(Organization organ);
+
+    /**
+     * 修改合作单位
+     * @param organization
+     */
+    void updateOrganization(Organization organization);
+}

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

@@ -1,99 +0,0 @@
-package com.keao.edu.user.service.impl;
-
-import com.keao.edu.common.dal.BaseDAO;
-import com.keao.edu.common.exception.BizException;
-import com.keao.edu.common.service.impl.BaseServiceImpl;
-import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.dao.ExamAgencyRelationDao;
-import com.keao.edu.user.dao.ExaminationBasicDao;
-import com.keao.edu.user.entity.ExamAgencyRelation;
-import com.keao.edu.user.entity.ExaminationBasic;
-import com.keao.edu.user.enums.ExamStatusEnum;
-import com.keao.edu.user.enums.YesOrNoEnum;
-import com.keao.edu.user.service.ExamAgencyRelationService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-public class ExamAgencyRelationServiceImpl extends BaseServiceImpl<Long, ExamAgencyRelation> implements ExamAgencyRelationService {
-	
-	@Autowired
-	private ExamAgencyRelationDao examAgencyRelationDao;
-	@Autowired
-	private ExaminationBasicDao examinationBasicDao;
-
-	@Override
-	public BaseDAO<Long, ExamAgencyRelation> getDAO() {
-		return examAgencyRelationDao;
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-	public void updateExamAgencyRelation(ExamAgencyRelation examAgencyRelation) {
-		if(Objects.isNull(examAgencyRelation.getExaminationBasicId())){
-			throw new BizException("请指定考级项目");
-		}
-		if(Objects.isNull(examAgencyRelation.getAgencyId())){
-			throw new BizException("请指定代理商");
-		}
-		examAgencyRelation.setTenantId(TenantContextHolder.getTenantId().toString());
-		examAgencyRelation.setShareProfitAmount(BigDecimal.ZERO);
-		examAgencyRelation.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
-		examAgencyRelation.setTotalPaymentAmount(BigDecimal.ZERO);
-		Set<Integer> agencyIds = examAgencyRelationDao.getAgencyIdsWithExam(examAgencyRelation.getExaminationBasicId());
-		if(agencyIds.contains(examAgencyRelation.getAgencyId())){
-			examAgencyRelationDao.update(examAgencyRelation);
-		}else{
-			examAgencyRelationDao.insert(examAgencyRelation);
-		}
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void sendUrl(Integer examId, String agencyIdStrs) {
-		if(Objects.isNull(examId)){
-			throw new BizException("请指定考级项目");
-		}
-		if(StringUtils.isBlank(agencyIdStrs)){
-			throw new BizException("请指定代理商");
-		}
-		Set<Integer> existAgencyIds = examAgencyRelationDao.getAgencyIdsWithExam(examId);
-		List<Integer> agencyIds = Arrays.asList(agencyIdStrs.split(",")).stream().map(e -> Integer.valueOf(e)).collect(Collectors.toList());
-		List<Integer> updateSendFlagAgencyIds=new ArrayList<>();
-		List<ExamAgencyRelation> examAgencyRelations=new ArrayList<>();
-		for (Integer agencyId : agencyIds) {
-			if(existAgencyIds.contains(agencyId)){
-				updateSendFlagAgencyIds.add(agencyId);
-				continue;
-			}
-			ExamAgencyRelation examAgencyRelation=new ExamAgencyRelation();
-			examAgencyRelation.setExaminationBasicId(examId);
-			examAgencyRelation.setAgencyId(agencyId);
-			examAgencyRelation.setSendUrlFlag(YesOrNoEnum.YES);
-			examAgencyRelation.setTenantId(TenantContextHolder.getTenantId().toString());
-			examAgencyRelations.add(examAgencyRelation);
-		}
-		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());
-		if(Objects.isNull(examinationBasic)){
-			throw new BizException("考级项目不存在");
-		}
-		if(!CollectionUtils.isEmpty(updateSendFlagAgencyIds)){
-			examAgencyRelationDao.batchUpdateSendUrlFlag(examId, updateSendFlagAgencyIds, YesOrNoEnum.YES);
-		}
-		if(!CollectionUtils.isEmpty(examAgencyRelations)){
-			examAgencyRelationDao.batchInsert(examAgencyRelations);
-		}
-		if(examinationBasic.getStatus().equals(ExamStatusEnum.SETTING)){
-			examinationBasic.setStatus(ExamStatusEnum.NOT_START);
-			examinationBasicDao.update(examinationBasic);
-		}
-	}
-}

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

@@ -0,0 +1,99 @@
+package com.keao.edu.user.service.impl;
+
+import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.common.exception.BizException;
+import com.keao.edu.common.service.impl.BaseServiceImpl;
+import com.keao.edu.common.tenant.TenantContextHolder;
+import com.keao.edu.user.dao.ExamOrganizationRelationDao;
+import com.keao.edu.user.dao.ExaminationBasicDao;
+import com.keao.edu.user.entity.ExamOrganizationRelation;
+import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.enums.ExamStatusEnum;
+import com.keao.edu.user.enums.YesOrNoEnum;
+import com.keao.edu.user.service.ExamOrganizationRelationService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, ExamOrganizationRelation> implements ExamOrganizationRelationService {
+	
+	@Autowired
+	private ExamOrganizationRelationDao examOrganizationRelationDao;
+	@Autowired
+	private ExaminationBasicDao examinationBasicDao;
+
+	@Override
+	public BaseDAO<Long, ExamOrganizationRelation> getDAO() {
+		return examOrganizationRelationDao;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+	public void updateExamOrganizationRelation(ExamOrganizationRelation examOrganizationRelation) {
+		if(Objects.isNull(examOrganizationRelation.getExaminationBasicId())){
+			throw new BizException("请指定考级项目");
+		}
+		if(Objects.isNull(examOrganizationRelation.getOrganId())){
+			throw new BizException("请指定代理商");
+		}
+		examOrganizationRelation.setTenantId(TenantContextHolder.getTenantId().toString());
+		examOrganizationRelation.setShareProfitAmount(BigDecimal.ZERO);
+		examOrganizationRelation.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
+		examOrganizationRelation.setTotalPaymentAmount(BigDecimal.ZERO);
+		Set<Integer> organIds = examOrganizationRelationDao.getOrganIdsWithExam(examOrganizationRelation.getExaminationBasicId());
+		if(organIds.contains(examOrganizationRelation.getOrganId())){
+			examOrganizationRelationDao.update(examOrganizationRelation);
+		}else{
+			examOrganizationRelationDao.insert(examOrganizationRelation);
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void sendUrl(Integer examId, String organIdStrs) {
+		if(Objects.isNull(examId)){
+			throw new BizException("请指定考级项目");
+		}
+		if(StringUtils.isBlank(organIdStrs)){
+			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());
+		List<Integer> updateSendFlagOrganizationIds=new ArrayList<>();
+		List<ExamOrganizationRelation> examOrganizationRelations=new ArrayList<>();
+		for (Integer organId : organIds) {
+			if(existOrganizationIds.contains(organId)){
+				updateSendFlagOrganizationIds.add(organId);
+				continue;
+			}
+			ExamOrganizationRelation examOrganizationRelation=new ExamOrganizationRelation();
+			examOrganizationRelation.setExaminationBasicId(examId);
+			examOrganizationRelation.setOrganId(organId);
+			examOrganizationRelation.setSendUrlFlag(YesOrNoEnum.YES);
+			examOrganizationRelation.setTenantId(TenantContextHolder.getTenantId().toString());
+			examOrganizationRelations.add(examOrganizationRelation);
+		}
+		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());
+		if(Objects.isNull(examinationBasic)){
+			throw new BizException("考级项目不存在");
+		}
+		if(!CollectionUtils.isEmpty(updateSendFlagOrganizationIds)){
+			examOrganizationRelationDao.batchUpdateSendUrlFlag(examId, updateSendFlagOrganizationIds, YesOrNoEnum.YES);
+		}
+		if(!CollectionUtils.isEmpty(examOrganizationRelations)){
+			examOrganizationRelationDao.batchInsert(examOrganizationRelations);
+		}
+		if(examinationBasic.getStatus().equals(ExamStatusEnum.SETTING)){
+			examinationBasic.setStatus(ExamStatusEnum.NOT_START);
+			examinationBasicDao.update(examinationBasic);
+		}
+	}
+}

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

@@ -38,16 +38,17 @@ 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.getAgency().setName(agencyIdNameMap.get(examRegistration.getAgencyId()));
+				examRegistration.getOrganization().setName(organIdNameMap.get(examRegistration.getOrganId()));
 				examRegistration.getSubject().setName(subjectIdNameMap.get(examRegistration.getStudentId()));
 			}
 		}
 		pageInfo.setRows(dataList);
+
 		return pageInfo;
 	}
 }

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

@@ -2,12 +2,8 @@ package com.keao.edu.user.service.impl;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.exception.BizException;
-import com.keao.edu.common.page.PageInfo;
-import com.keao.edu.common.page.QueryInfo;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.common.tenant.TenantContextHolder;
-import com.keao.edu.user.dao.AgencyDao;
-import com.keao.edu.user.dao.ExamAgencyRelationDao;
 import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.entity.ExaminationBasic;
 import com.keao.edu.user.enums.ExamModeEnum;
@@ -24,11 +20,7 @@ import java.util.*;
 public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, ExaminationBasic> implements ExaminationBasicService{
 
 	@Autowired
-	private ExamAgencyRelationDao examAgencyRelationDao;
-	@Autowired
 	private ExaminationBasicDao examinationBasicDao;
-	@Autowired
-	private AgencyDao agencyDao;
 
 	@Override
 	public BaseDAO<Long, ExaminationBasic> getDAO() {

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

@@ -9,10 +9,10 @@ import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;
-import com.keao.edu.user.dao.AgencyDao;
+import com.keao.edu.user.dao.OrganizationDao;
 import com.keao.edu.user.dao.SysUserDao;
-import com.keao.edu.user.entity.Agency;
-import com.keao.edu.user.service.AgencyService;
+import com.keao.edu.user.entity.Organization;
+import com.keao.edu.user.service.OrganizationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -20,41 +20,41 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
-public class AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implements AgencyService {
+public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organization> implements OrganizationService {
 	
 	@Autowired
-	private AgencyDao agencyDao;
+	private OrganizationDao organDao;
 	@Autowired
 	private ImFeignService imFeignService;
 	@Autowired
 	private SysUserDao sysUserDao;
 
 	@Override
-	public BaseDAO<Integer, Agency> getDAO() {
-		return agencyDao;
+	public BaseDAO<Integer, Organization> getDAO() {
+		return organDao;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(Agency 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){
-			Agency agency1 = agencyDao.get(user.getId());
-			if(agency1 == null){
+			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 AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implemen
 		}
 		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){
@@ -81,21 +81,21 @@ public class AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implemen
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateAgency(Agency agency) {
-		SysUser sysUser = agency.getSysUser();
-		if(null == agencyDao.get(sysUser.getId())){
-			throw new BizException("代理商信息不存在");
+	public void updateOrganization(Organization organization) {
+		SysUser sysUser = organization.getSysUser();
+		if(null == organDao.get(sysUser.getId())){
+			throw new BizException("合作商信息不存在");
 		}
-		agency.setId(sysUser.getId());
+		organization.setId(sysUser.getId());
 		if(StringUtils.isNotEmpty(sysUser.getPhone())){
 			SysUser queryByPhone = sysUserDao.queryByPhone(sysUser.getPhone());
 			if(queryByPhone != null && !sysUser.getId().equals(queryByPhone.getId())){
 				throw new BizException("手机号已存在");
 			}
 		}
-		sysUser.setRealName(agency.getName());
-		sysUser.setPhone(agency.getContactPhone());
-		agencyDao.update(agency);
+		sysUser.setRealName(organization.getName());
+		sysUser.setPhone(organization.getContactPhone());
+		organDao.update(organization);
 		//删除当前用户角色
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		//新增用户角色
@@ -103,4 +103,4 @@ public class AgencyServiceImpl extends BaseServiceImpl<Integer, Agency> implemen
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 	}
-}
+}

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

@@ -4,13 +4,13 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.keao.edu.user.dao.ExamAgencyRelationDao">
+<mapper namespace="com.keao.edu.user.dao.ExamOrganizationRelationDao">
 	
-	<resultMap type="com.keao.edu.user.entity.ExamAgencyRelation" id="ExamAgencyRelation">
+	<resultMap type="com.keao.edu.user.entity.ExamOrganizationRelation" id="ExamOrganizationRelation">
 		<result column="id_" property="id" />
 
 		<result column="examination_basic_id_" property="examinationBasicId" />
-		<result column="agency_id_" property="agencyId" />
+		<result column="organ_id_" property="organId" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
 		<result column="share_profit_amount_" property="shareProfitAmount" />
 		<result column="total_registration_student_num_" property="totalRegistrationStudentNum"/>
@@ -22,37 +22,37 @@
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
-	<resultMap id="ExamAgencyRelationExtraDto" type="com.keao.edu.user.dto.ExamAgencyRelationExtraDto" extends="ExamAgencyRelation">
-		<result column="agency_name_" property="agencyName"/>
+	<resultMap id="ExamOrganizationRelationExtraDto" type="com.keao.edu.user.dto.ExamOrganizationRelationExtraDto" extends="ExamOrganizationRelation">
+		<result column="organ_name_" property="organizationName"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="ExamAgencyRelation" >
-		SELECT * FROM exam_agency_relation WHERE id_ = #{id} 
+	<select id="get" resultMap="ExamOrganizationRelation" >
+		SELECT * FROM exam_organization_relation WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="ExamAgencyRelation">
-		SELECT * FROM exam_agency_relation WHERE tenant_id_#{tenantId} ORDER BY id_
+	<select id="findAll" resultMap="ExamOrganizationRelation">
+		SELECT * FROM exam_organization_relation WHERE tenant_id_#{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamAgencyRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
-		VALUES(#{examinationBasicId},#{agencyId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
+		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
 	</insert>
 
-    <insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamAgencyRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_agency_relation (examination_basic_id_,agency_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
+    <insert id="batchInsert" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO exam_organization_relation (examination_basic_id_,organ_id_,settlement_type_,share_profit_amount_,total_registration_student_num_,total_payment_amount_,url_,send_url_flag_,create_time_,update_time_,tenant_id_)
 		VALUES
-		<foreach collection="examAgencyRelations" item="examAgencyRelation" separator=",">
-			(#{examAgencyRelation.examinationBasicId},#{examAgencyRelation.agencyId},#{examAgencyRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examAgencyRelation.shareProfitAmount},#{examAgencyRelation.totalRegistrationStudentNum},#{examAgencyRelation.totalPaymentAmount},#{examAgencyRelation.url},#{examAgencyRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{examAgencyRelation.tenantId})
+		<foreach collection="examOrganizationRelations" item="examOrganizationRelation" separator=",">
+			(#{examOrganizationRelation.examinationBasicId},#{examOrganizationRelation.organId},#{examOrganizationRelation.settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{examOrganizationRelation.shareProfitAmount},#{examOrganizationRelation.totalRegistrationStudentNum},#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{examOrganizationRelation.tenantId})
 		</foreach>
 	</insert>
 
     <!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.user.entity.ExamAgencyRelation">
-		UPDATE exam_agency_relation
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamOrganizationRelation">
+		UPDATE exam_organization_relation
 		<set>
 			<if test="examinationBasicId != null">
 			examination_basic_id_ = #{examinationBasicId},
@@ -81,8 +81,8 @@
 			<if test="totalPaymentAmount != null">
 				total_payment_amount_ = #{totalPaymentAmount},
 			</if>
-			<if test="agencyId != null">
-			agency_id_ = #{agencyId},
+			<if test="organId != null">
+			organ_id_ = #{organId},
 			</if>
 			<if test="settlementType != null">
 			settlement_type_ = #{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
@@ -93,16 +93,16 @@
 		</set> WHERE id_ = #{id}
 	</update>
 	<update id="batchUpdateSendUrlFlag">
-		UPDATE exam_agency_relation SET send_url_flag_=#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
-		WHERE examination_basic_id_=#{examId} AND agency_id_ IN
-		<foreach collection="agencyIds" item="agencyId" separator="," open="(" close=")">
-			#{agencyId}
+		UPDATE exam_organization_relation SET send_url_flag_=#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+		WHERE examination_basic_id_=#{examId} AND organ_id_ IN
+		<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+			#{organId}
 		</foreach>
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM exam_agency_relation WHERE id_ = #{id} 
+		DELETE FROM exam_organization_relation WHERE id_ = #{id} 
 	</delete>
 
 	<sql id="queryCondition">
@@ -112,18 +112,18 @@
 				AND ear.settlement_type_=#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
 			<if test="search!=null">
-				AND (ear.agency_id_=#{agencyId} OR a.name_ LIKE CONCAT(#{search}, '%'))
+				AND (ear.organ_id_=#{organId} OR a.name_ LIKE CONCAT(#{search}, '%'))
 			</if>
 		</where>
 	</sql>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="ExamAgencyRelationExtraDto" parameterType="map">
+	<select id="queryPage" resultMap="ExamOrganizationRelationExtraDto" parameterType="map">
 		SELECT
 			ear.*,
-			a.name_ agency_name_
-		FROM agency a
-		LEFT JOIN exam_agency_relation ear ON ear.agency_id_=a.id_
+			a.name_ organ_name_
+		FROM organization a
+		LEFT JOIN exam_organization_relation ear ON ear.organ_id_=a.id_
 		<if test="examId!=null">
 			AND ear.examination_basic_id_=#{examId}
 		</if>
@@ -133,17 +133,17 @@
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM agency a
-		LEFT JOIN exam_agency_relation ear ON ear.agency_id_=a.id_
+		SELECT COUNT(*) FROM organ a
+		LEFT JOIN exam_organization_relation ear ON ear.organ_id_=a.id_
 		<if test="examId!=null">
 			AND ear.examination_basic_id_=#{examId}
 		</if>
 		<include refid="queryCondition"/>
 	</select>
-	<select id="getWithExam" resultMap="ExamAgencyRelation">
-		SELECT * FROM exam_agency_relation WHERE examination_basic_id_=#{examId}
+	<select id="getWithExam" resultMap="ExamOrganizationRelation">
+		SELECT * FROM exam_organization_relation WHERE examination_basic_id_=#{examId}
 	</select>
-	<select id="getAgencyIdsWithExam" resultType="int">
-		SELECT agency_id_ FROM exam_agency_relation WHERE examination_basic_id_=#{examId} FOR UPDATE
+	<select id="getOrganIdsWithExam" resultType="int">
+		SELECT organ_id_ FROM exam_organization_relation WHERE examination_basic_id_=#{examId} FOR UPDATE
 	</select>
 </mapper>

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/AgencyMapper.xml → edu-user/edu-user-server/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -4,9 +4,9 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.keao.edu.user.dao.AgencyDao">
+<mapper namespace="com.keao.edu.user.dao.OrganizationDao">
 	
-	<resultMap type="com.keao.edu.user.entity.Agency" id="Agency">
+	<resultMap type="com.keao.edu.user.entity.Organization" id="Organization">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
 		<result column="contact_name_" property="contactName" />
@@ -20,25 +20,25 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="Agency" >
-		SELECT * FROM agency WHERE id_ = #{id} 
+	<select id="get" resultMap="Organization" >
+		SELECT * FROM organization WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="Agency">
-		SELECT * FROM agency WHERE tenant_id_ = #{tenantId} ORDER BY id_
+	<select id="findAll" resultMap="Organization">
+		SELECT * FROM organization WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.user.entity.Agency" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO agency (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
+	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO organization (id_,name_,contact_name_,contact_phone_,settlement_type_,share_profit_amount_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{shareProfitAmount},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.user.entity.Agency">
-		UPDATE agency <set>
+	<update id="update" parameterType="com.keao.edu.user.entity.Organization">
+		UPDATE organization <set>
 		<if test="updateTime != null">
 		update_time_ = #{updateTime},
 		</if>
@@ -65,10 +65,10 @@
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		UPDATE agency SET del_flag_ = 1,update_time_ = NOW() WHERE id_ = #{id}
+		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">
@@ -83,19 +83,19 @@
 	</sql>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="Agency" parameterType="map">
-		SELECT * FROM agency
-		<include refid="agencyQueryPage"/>
+	<select id="queryPage" resultMap="Organization" parameterType="map">
+		SELECT * FROM organization
+		<include refid="organQueryPage"/>
 		ORDER BY update_time_ DESC <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM agency
-		<include refid="agencyQueryPage"/>
+		SELECT COUNT(*) FROM organization
+		<include refid="organQueryPage"/>
 	</select>
 
-	<select id="getByTenant" resultMap="Agency">
-		SELECT * FROM agency WHERE tenant_id_ = #{tenantId} ORDER BY id_
+	<select id="getByTenant" resultMap="Organization">
+		SELECT * FROM organization WHERE tenant_id_ = #{tenantId} ORDER BY id_
 	</select>
 </mapper>