调查问卷

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

@@ -1,9 +1,12 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.List;
 
+import static com.ym.mec.biz.dal.enums.YesOrNoEnum.YES;
+
 /**
  * 对应数据库表(questionnaire_question):
  */
@@ -25,9 +28,9 @@ public class QuestionnaireQuestion {
 	private Integer sort = 0;
 	
 	/** 是否必填 */
-	private boolean isRequire = true;
+	private YesOrNoEnum isRequire = YES;
 
-	private boolean delFlag = false;
+	private YesOrNoEnum delFlag = YES;
 
 	/** 问题描述 */
 	private String desc;
@@ -44,13 +47,6 @@ public class QuestionnaireQuestion {
 	//题目答案选项
 	private List<QuestionnaireQuestionItem> questionnaireQuestionItemList;
 
-	public boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(boolean delFlag) {
-		this.delFlag = delFlag;
-	}
 
 	public List<Long> getDelQuestionnaireQuestionItemIdList() {
 		return delQuestionnaireQuestionItemIdList;
@@ -107,15 +103,23 @@ public class QuestionnaireQuestion {
 	public Integer getSort(){
 		return this.sort;
 	}
-			
-	public void setIsRequire(boolean isRequire){
+
+	public YesOrNoEnum getIsRequire() {
+		return isRequire;
+	}
+
+	public void setIsRequire(YesOrNoEnum isRequire) {
 		this.isRequire = isRequire;
 	}
-	
-	public boolean getIsIsRequire(){
-		return this.isRequire;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-			
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setDesc(String desc){
 		this.desc = desc;
 	}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -22,9 +23,9 @@ public class QuestionnaireQuestionItem {
 	/** 排序 */
 	private Integer sort = 0;
 
-	private Boolean isOver = false;
+	private YesOrNoEnum isOver = YesOrNoEnum.NO;
 
-	private Boolean delFlag = false;
+	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
 
 	/**  */
 	private java.util.Date createTime;
@@ -32,20 +33,20 @@ public class QuestionnaireQuestionItem {
 	/**  */
 	private java.util.Date updateTime;
 
-	public Boolean getDelFlag() {
-		return delFlag;
+	public YesOrNoEnum getIsOver() {
+		return isOver;
 	}
 
-	public void setDelFlag(Boolean delFlag) {
-		this.delFlag = delFlag;
+	public void setIsOver(YesOrNoEnum isOver) {
+		this.isOver = isOver;
 	}
 
-	public Boolean getIsOver() {
-		return isOver;
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
 
-	public void setIsOver(Boolean over) {
-		isOver = over;
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
 	}
 
 	public void setId(Long id){

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.List;
@@ -16,9 +17,9 @@ public class QuestionnaireTopic {
 	private String title;
 	
 	/** 发布状态（1-可见  0-不可见） */
-	private boolean status = false;
+	private YesOrNoEnum status = YesOrNoEnum.NO;
 
-	private boolean delFlag = false;
+	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
 
 	/** 创建人编号 */
 	private Integer creatorId;
@@ -35,14 +36,6 @@ public class QuestionnaireTopic {
 	//问卷题目
 	private List<QuestionnaireQuestion> questionnaireQuestionList;
 
-	public boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(boolean delFlag) {
-		this.delFlag = delFlag;
-	}
-
 	public List<QuestionnaireQuestion> getQuestionnaireQuestionList() {
 		return questionnaireQuestionList;
 	}
@@ -74,15 +67,23 @@ public class QuestionnaireTopic {
 	public String getTitle(){
 		return this.title;
 	}
-			
-	public void setStatus(boolean status){
+
+	public YesOrNoEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(YesOrNoEnum status) {
 		this.status = status;
 	}
-	
-	public boolean isStatus(){
-		return this.status;
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
 	}
-			
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public void setCreatorId(Integer creatorId){
 		this.creatorId = creatorId;
 	}

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

@@ -12,10 +12,10 @@
 		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
 		<result column="answer_value_" property="answerValue" />
 		<result column="sort_" property="sort" />
-		<result column="is_over_" property="isOver" />
+		<result column="is_over_" property="isOver" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -30,15 +30,15 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},NOW(),NOW())
+		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
+		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
 	</insert>
 
     <insert id="batchInsert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_question_item (questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,is_over_,create_time_,update_time_)
 		VALUES
 		<foreach collection="questionItemList" item="item" separator=",">
-			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW())
+			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
 		</foreach>
 	</insert>
 
@@ -52,7 +52,7 @@
 			sort_ = #{sort},
 		</if>
 		<if test="isOver != null">
-			is_over_ = #{isOver},
+			is_over_ = #{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="answerValue != null">
 			answer_value_ = #{answerValue},
@@ -78,7 +78,7 @@
 					sort_ = #{item.sort},
 				</if>
 				<if test="item.isOver != null">
-					is_over_ = #{item.isOver},
+					is_over_ = #{item.isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 				</if>
 				<if test="item.answerValue != null">
 					answer_value_ = #{item.answerValue},

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

@@ -12,21 +12,21 @@
 		<result column="content_" property="content" />
 		<result column="type_" property="type" />
 		<result column="sort_" property="sort" />
-		<result column="is_require_" property="isRequire" />
+		<result column="is_require_" property="isRequire" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="desc_" property="desc" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<collection property="questionnaireQuestionItemList" ofType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem">
 			<result column="item_id_" property="id" />
 			<result column="item_questionnaire_topic_id_" property="questionnaireTopicId" />
 			<result column="item_questionnaire_question_id_" property="questionnaireQuestionId" />
 			<result column="item_answer_value_" property="answerValue" />
 			<result column="item_sort_" property="sort" />
-			<result column="item_is_over_" property="isOver" />
+			<result column="item_is_over_" property="isOver" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 			<result column="item_create_time_" property="createTime" />
 			<result column="item_update_time_" property="updateTime" />
-			<result column="item_del_flag_" property="delFlag" />
+			<result column="item_del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		</collection>
 	</resultMap>
 	
@@ -43,7 +43,7 @@
 		FROM questionnaire_question qq
 		LEFT JOIN questionnaire_question_item qqi ON qq.id_ = qqi.questionnaire_question_id_
 		<where>
-			qq.del_flag_ = 0 AND qqi.del_flag_ = 0
+			qq.del_flag_ != 1 AND qqi.del_flag_ != 1
 			<if test="topicId != null">
 				AND qq.questionnaire_topic_id_ = #{topicId}
 			</if>
@@ -54,7 +54,7 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_question (questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW())
+		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,7 +73,7 @@
 			type_ = #{type},
 		</if>
 		<if test="isRequire != null">
-			is_require_ = #{isRequire},
+			is_require_ = #{isRequire,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="desc != null">
 			desc_ = #{desc},

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

@@ -9,11 +9,11 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireTopic" id="QuestionnaireTopic">
 		<result column="id_" property="id" />
 		<result column="title_" property="title" />
-		<result column="status_" property="status" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="creator_id_" property="creatorId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -29,14 +29,14 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO questionnaire_topic (title_,status_,creator_id_,create_time_,update_time_)
-		VALUES(#{title},#{status},#{creatorId},NOW(),NOW())
+		VALUES(#{title},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{creatorId},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic">
 		UPDATE questionnaire_topic <set>
 		<if test="status != null">
-			status_ = #{status},
+			status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		</if>
 		<if test="title != null">
 			title_ = #{title},
@@ -59,7 +59,7 @@
 				AND (id_ = #{search} OR title_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="status != null">
-				AND status_ = #{status}
+				AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</sql>