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

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

@@ -1,7 +1,6 @@
 package com.keao.edu.user.entity;
 
 import com.keao.edu.user.enums.SettlementTypeEnum;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -48,10 +47,10 @@ public class ExamOrganizationRelation {
 	private String url;
 
 	@ApiModelProperty(value = "是否已发送链接")
-	private YesOrNoEnum sendUrlFlag;
+	private Integer sendUrlFlag;
 
 	@ApiModelProperty(value = "是否允许排考")
-	private YesOrNoEnum isAllowArrangeExam;
+	private Integer isAllowArrangeExam;
 
 	private java.util.Date createTime;
 
@@ -155,19 +154,19 @@ public class ExamOrganizationRelation {
 		return this.url;
 	}
 
-	public YesOrNoEnum getSendUrlFlag() {
+	public Integer getSendUrlFlag() {
 		return sendUrlFlag;
 	}
 
-	public void setSendUrlFlag(YesOrNoEnum sendUrlFlag) {
+	public void setSendUrlFlag(Integer sendUrlFlag) {
 		this.sendUrlFlag = sendUrlFlag;
 	}
 
-	public YesOrNoEnum getIsAllowArrangeExam() {
+	public Integer getIsAllowArrangeExam() {
 		return isAllowArrangeExam;
 	}
 
-	public void setIsAllowArrangeExam(YesOrNoEnum isAllowArrangeExam) {
+	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
 		this.isAllowArrangeExam = isAllowArrangeExam;
 	}
 

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

@@ -42,7 +42,7 @@ public class Organization {
 	private String parentOrganIdTag;
 
 	@ApiModelProperty(value = "是否允许排考")
-	private YesOrNoEnum isAllowArrangeExam;
+	private Integer isAllowArrangeExam;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -73,14 +73,6 @@ public class Organization {
 		this.userId = userId;
 	}
 
-	public YesOrNoEnum getIsAllowArrangeExam() {
-		return isAllowArrangeExam;
-	}
-
-	public void setIsAllowArrangeExam(YesOrNoEnum isAllowArrangeExam) {
-		this.isAllowArrangeExam = isAllowArrangeExam;
-	}
-
 	public SysUser getSysUser() {
 		return sysUser;
 	}
@@ -89,6 +81,14 @@ public class Organization {
 		this.sysUser = sysUser;
 	}
 
+	public Integer getIsAllowArrangeExam() {
+		return isAllowArrangeExam;
+	}
+
+	public void setIsAllowArrangeExam(Integer isAllowArrangeExam) {
+		this.isAllowArrangeExam = isAllowArrangeExam;
+	}
+
 	public Integer getLevel() {
 		return level;
 	}

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

@@ -149,7 +149,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			if(Objects.isNull(organization)){
 				throw new BizException("合作单位信息错误");
 			}
-			og.setSendUrlFlag(YesOrNoEnum.NO);
+			og.setSendUrlFlag(0);
 			og.setIsAllowArrangeExam(organization.getIsAllowArrangeExam());
 			og.setSettlementType(organization.getSettlementType());
 			og.setShareProfitAmount(organization.getShareProfitAmount());
@@ -207,7 +207,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 			}
 			needUpdate.add(examOrgan);
 
-			examOrgan.setSendUrlFlag(YesOrNoEnum.YES);
+			examOrgan.setSendUrlFlag(1);
 
 			SysUser student = sysUserFeignService.queryUserById(examOrgan.getOrganId());
 			Map<Integer, String> userPhoneMap = new HashMap<>();

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

@@ -27,7 +27,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -58,8 +57,8 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
 		Organization currentOrganization = organDao.get(queryUserInfo.getId());
 		//获取父级的organ
-		if(organ.getIsAllowArrangeExam() == YesOrNoEnum.YES){
-			if(currentOrganization.getIsAllowArrangeExam() == YesOrNoEnum.NO){
+		if(organ.getIsAllowArrangeExam() == 1){
+			if(currentOrganization.getIsAllowArrangeExam() == 0){
 				throw new BizException("无权创建可排考的合作单位");
 			}
 		}

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

@@ -17,7 +17,6 @@ import com.keao.edu.user.dto.TenantInfoDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.Organization;
 import com.keao.edu.user.entity.TenantInfo;
-import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.service.TenantInfoService;
 import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo> implements TenantInfoService {
@@ -84,7 +82,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setName(sysUser.getRealName());
 		organ.setContactName(tenantInfo.getContactName());
 		organ.setContactPhone(tenantInfo.getContactPhone());
-		organ.setIsAllowArrangeExam(YesOrNoEnum.YES);
+		organ.setIsAllowArrangeExam(1);
 		organizationDao.insert(organ);
 
 		Employee employee = new Employee();

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

@@ -18,8 +18,8 @@
 		<result column="total_payment_amount_" property="totalPaymentAmount"/>
 		<result column="total_trans_amount_" property="totalTransAmount" />
 		<result column="url_" property="url" />
-		<result column="send_url_flag_" property="sendUrlFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
-		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler" />
+		<result column="send_url_flag_" property="sendUrlFlag" />
+		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -47,8 +47,7 @@
 		create_time_,update_time_,tenant_id_)
 		VALUES(#{examinationBasicId},#{organId},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},#{shareProfitAmount},
 		#{selfRegistrationStudentNum},#{selfPaymentAmount},#{totalRegistrationStudentNum},#{totalPaymentAmount},
-		#{url},#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},totalTransAmount,
+		#{url},#{sendUrlFlag},#{isAllowArrangeExam},#{totalTransAmount},
 		NOW(),NOW(),#{tenantId})
 	</insert>
 
@@ -66,8 +65,8 @@
 			#{examOrganizationRelation.selfPaymentAmount},
 			#{examOrganizationRelation.totalRegistrationStudentNum},
 			#{examOrganizationRelation.totalPaymentAmount},#{examOrganizationRelation.url},
-			#{examOrganizationRelation.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-			#{examOrganizationRelation.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			#{examOrganizationRelation.sendUrlFlag},
+			#{examOrganizationRelation.isAllowArrangeExam},
 			#{examOrganizationRelation.totalTransAmount},
 			NOW(),NOW(),#{examOrganizationRelation.tenantId})
 		</foreach>
@@ -81,10 +80,10 @@
 				examination_basic_id_ = #{examinationBasicId},
 			</if>
 			<if test="sendUrlFlag != null">
-				send_url_flag_ = #{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				send_url_flag_ = #{sendUrlFlag},
 			</if>
 			<if test="isAllowArrangeExam != null">
-				is_allow_arrange_exam_ = #{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				is_allow_arrange_exam_ = #{isAllowArrangeExam},
 			</if>
 			<if test="url != null">
 				url_ = #{url},
@@ -128,10 +127,10 @@
 					examination_basic_id_ = #{eo.examinationBasicId},
 				</if>
 				<if test="eo.sendUrlFlag != null">
-					send_url_flag_ = #{eo.sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+					send_url_flag_ = #{eo.sendUrlFlag},
 				</if>
 				<if test="eo.isAllowArrangeExam != null">
-					is_allow_arrange_exam_ = #{eo.isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+					is_allow_arrange_exam_ = #{eo.isAllowArrangeExam},
 				</if>
 				<if test="eo.url != null">
 					url_ = #{eo.url},

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

@@ -18,7 +18,7 @@
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="del_flag_" property="delFlag" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="share_profit_amount_" property="shareProfitAmount" />
-		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -48,7 +48,7 @@
 	<insert id="insert" parameterType="com.keao.edu.user.entity.Organization" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization (id_,user_id_,name_,contact_name_,contact_phone_,level_,parent_organ_id_,parent_organ_id_tag_,settlement_type_,share_profit_amount_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
 		VALUES(#{id},#{userId},#{name},#{contactName},#{contactPhone},#{level},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		#{shareProfitAmount},#{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(),NOW(),#{tenantId})
+		#{shareProfitAmount},#{isAllowArrangeExam},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -80,7 +80,7 @@
 				name_ = #{name},
 			</if>
 			<if test="isAllowArrangeExam != null">
-				is_allow_arrange_exam_ = #{isAllowArrangeExam,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+				is_allow_arrange_exam_ = #{isAllowArrangeExam},
 			</if>
 			<if test="delFlag != null">
 				del_flag_ = #{delFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},