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

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

@@ -125,7 +125,7 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 		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(")");
+			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()){

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

@@ -29,6 +29,11 @@ public class Organization {
 	@ApiModelProperty(value = "分润金额",required = false)
 	private java.math.BigDecimal shareProfitAmount;
 
+	@ApiModelProperty(value = "上级合作单位编号")
+	private Integer parentOrganId;
+
+	private Integer parentOrganIdTag;
+
 	@ApiModelProperty(value = "是否允许排考")
 	private Integer isAllowArrangeExam;
 	
@@ -61,6 +66,22 @@ public class Organization {
 		this.sysUser = sysUser;
 	}
 
+	public Integer getParentOrganId() {
+		return parentOrganId;
+	}
+
+	public void setParentOrganId(Integer parentOrganId) {
+		this.parentOrganId = parentOrganId;
+	}
+
+	public Integer getParentOrganIdTag() {
+		return parentOrganIdTag;
+	}
+
+	public void setParentOrganIdTag(Integer parentOrganIdTag) {
+		this.parentOrganIdTag = parentOrganIdTag;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}

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

@@ -11,6 +11,8 @@
 		<result column="name_" property="name" />
 		<result column="contact_name_" property="contactName" />
 		<result column="contact_phone_" property="contactPhone" />
+		<result column="parent_organ_id_" property="parentOrganId" />
+		<result column="parent_organ_id_tag_" property="parentOrganIdTag" />
 		<result column="settlement_type_" property="settlementType" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="share_profit_amount_" property="shareProfitAmount" />
 		<result column="is_allow_arrange_exam_" property="isAllowArrangeExam" />
@@ -32,38 +34,45 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+		INSERT INTO organization (id_,name_,contact_name_,contact_phone_,parent_organ_id_,parent_organ_id_tag_,settlement_type_,share_profit_amount_,is_allow_arrange_exam_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{name},#{contactName},#{contactPhone},#{parentOrganId},#{parentOrganIdTag},#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
 		#{shareProfitAmount},#{isAllowArrangeExam},NOW(),NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.keao.edu.user.entity.Organization">
-		UPDATE organization <set>
-		<if test="updateTime != null">
-		update_time_ = #{updateTime},
-		</if>
-		<if test="contactPhone != null">
-		contact_phone_ = #{contactPhone},
-		</if>
-		<if test="settlementType != null">
-		settlement_type_ = #{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
-		</if>
-		<if test="contactName != null">
-		contact_name_ = #{contactName},
-		</if>
-		<if test="shareProfitAmount != null">
-		share_profit_amount_ = #{shareProfitAmount},
-		</if>
-		<if test="name != null">
-		name_ = #{name},
-		</if>
-		<if test="isAllowArrangeExam != null">
-			is_allow_arrange_exam_ = #{isAllowArrangeExam},
-		</if>
-		<if test="tenantId != null">
-			tenant_id_ = #{tenantId},
-		</if>
+		UPDATE organization
+		<set>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="contactPhone != null">
+				contact_phone_ = #{contactPhone},
+			</if>
+			<if test="parentOrganId != null">
+				parent_organ_id_ = #{parentOrganId},
+			</if>
+			<if test="parentOrganIdTag != null">
+				parent_organ_id_tag_ = #{parentOrganIdTag},
+			</if>
+			<if test="settlementType != null">
+				settlement_type_ = #{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="contactName != null">
+				contact_name_ = #{contactName},
+			</if>
+			<if test="shareProfitAmount != null">
+				share_profit_amount_ = #{shareProfitAmount},
+			</if>
+			<if test="name != null">
+				name_ = #{name},
+			</if>
+			<if test="isAllowArrangeExam != null">
+				is_allow_arrange_exam_ = #{isAllowArrangeExam},
+			</if>
+			<if test="tenantId != null">
+				tenant_id_ = #{tenantId},
+			</if>
 		</set> WHERE id_ = #{id}
 	</update>