Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/OrganizationCourseUnitPriceSettings.java

@@ -20,7 +20,7 @@ public class OrganizationCourseUnitPriceSettings {
 	/** 课程类型 */
 	private CourseScheduleType courseType;
 
-	private Integer chargeType;
+	private Integer chargeTypeId;
 	
 	private BigDecimal unitPrice = new BigDecimal(0);
 	
@@ -30,6 +30,10 @@ public class OrganizationCourseUnitPriceSettings {
 	/**  */
 	private java.util.Date updateTime;
 	
+	private Organization organ = new Organization();
+	
+	private ChargeType chargeType = new ChargeType();
+	
 	public void setId(Integer id){
 		this.id = id;
 	}
@@ -54,14 +58,6 @@ public class OrganizationCourseUnitPriceSettings {
 		this.courseType = courseType;
 	}
 			
-	public Integer getChargeType() {
-		return chargeType;
-	}
-
-	public void setChargeType(Integer chargeType) {
-		this.chargeType = chargeType;
-	}
-
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
 	}
@@ -86,6 +82,30 @@ public class OrganizationCourseUnitPriceSettings {
 		return this.updateTime;
 	}
 			
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
+
+	public Organization getOrgan() {
+		return organ;
+	}
+
+	public void setOrgan(Organization organ) {
+		this.organ = organ;
+	}
+
+	public ChargeType getChargeType() {
+		return chargeType;
+	}
+
+	public void setChargeType(ChargeType chargeType) {
+		this.chargeType = chargeType;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/resources/config/mybatis/OrganizationCourseUnitPriceSettingsMapper.xml

@@ -7,10 +7,12 @@
 		<result column="id_" property="id" />
 		<result column="organ_id_" property="organId" />
 		<result column="course_type_" property="courseType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="charge_type_" property="chargeType" />
+		<result column="charge_type_id_" property="chargeTypeId" />
 		<result column="unit_price_" property="unitPrice" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="organ_name_" property="organ.name" />
+		<result column="charge_type_name_" property="chargeType.name" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -28,16 +30,16 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_,unit_price_,create_time_,update_time_)
-		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeType},#{unitPrice},#{createTime},#{updateTime})
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
+		VALUES(#{id},#{organId},#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{chargeTypeId},#{unitPrice},now(),now())
 	</insert>
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO organization_course_unit_price_settings
-		(id_,organ_id_,course_type_,charge_type_,unit_price_,create_time_,update_time_)
+		(id_,organ_id_,course_type_,charge_type_id_,unit_price_,create_time_,update_time_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
-		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeType},#{item.unitPrice},#{item.createTime},#{item.updateTime})
+		(#{item.id},#{item.organId},#{item.courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.chargeTypeId},#{item.unitPrice},now(),now())
 		</foreach>
 	</insert>
 
@@ -57,8 +59,8 @@
 			<if test="courseType != null">
 				course_type_ = #{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="chargeType != null">
-				charge_type_ = #{chargeType},
+			<if test="chargeTypeId != null">
+				charge_type_id_ = #{chargeTypeId},
 			</if>
 			<if test="unitPrice != null">
 				unit_price_ = #{unitPrice},
@@ -77,28 +79,29 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="OrganizationCourseUnitPriceSettings" parameterType="map">
-		SELECT * FROM organization_course_unit_price_settings 
+		SELECT ups.*,o.name_ organ_name_ ,ct.name_ charge_type_name_ FROM organization_course_unit_price_settings ups left join organization o on ups.organ_id_ = o.id_
+		left join charge_type ct on ct.id_ = ups.charge_type_id_
 		<where>
 			<if test="organId != null">
-				and organ_id_ = #{organId}
+				and ups.organ_id_ = #{organId}
 			</if>
 			<if test="courseScheduleType != null">
-				and course_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				and ups.course_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
-		ORDER BY id_
+		ORDER BY ups.id_ desc
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM organization_course_unit_price_settings
+		SELECT COUNT(ups.*) FROM organization_course_unit_price_settings ups
 		<where>
 			<if test="organId != null">
-				and organ_id_ = #{organId}
+				and ups.organ_id_ = #{organId}
 			</if>
 			<if test="courseScheduleType != null">
-				and course_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				and ups.course_type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</select>

mec-web/src/main/java/com/ym/mec/web/controller/OrganizationCourseUnitPriceSettingsController.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,7 @@ public class OrganizationCourseUnitPriceSettingsController extends BaseControlle
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('organizationCourseUnitPriceSettings/update')")
 	public Object update(@RequestBody OrganizationCourseUnitPriceSettings organizationCourseUnitPriceSettings) {
+		organizationCourseUnitPriceSettings.setUpdateTime(new Date());
 		organizationCourseUnitPriceSettingsService.update(organizationCourseUnitPriceSettings);
 		return succeed();
 	}