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

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

@@ -63,6 +63,8 @@ public class VipGroupActivity {
 	private String salarySettlementJson;
 
 	private String vipGroupCategoryNames;
+	
+	private Boolean delFlag = false;
 
 	private Integer enable;
 
@@ -226,6 +228,14 @@ public class VipGroupActivity {
 		return this.salarySettlementJson;
 	}
 			
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -27,6 +27,7 @@
 		<result column="salary_settlement_json_" property="salarySettlementJson" />
 		<result column="vip_group_category_names_" property="vipGroupCategoryNames"/>
 		<result property="enable" column="enable"/>
+		<result property="del_flag_" column="delFlag"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -46,7 +47,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_) VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson})
+		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_) VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -106,6 +107,9 @@
 			<if test="type != null">
 			type_ = #{type},
 			</if>
+			<if test="delFlag != null">
+			del_flag_ = #{delFlag},
+			</if>
 			</set> WHERE id_ = #{id}
 	</update>
 	
@@ -117,7 +121,9 @@
 	<sql id="queryCondition">
 		<where>
 			vga.del_flag_=0
+			<if test="organId != null">
 			AND INTE_ARRAY(organ_id_,#{organId})
+			</if>
 		</where>
 	</sql>