问卷调查

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

@@ -1,12 +1,8 @@
 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):
  */
@@ -28,9 +24,9 @@ public class QuestionnaireQuestion {
 	private Integer sort = 0;
 	
 	/** 是否必填 */
-	private YesOrNoEnum isRequire = YES;
+	private int isRequire = 1;
 
-	private YesOrNoEnum delFlag = YES;
+	private int delFlag = 0;
 
 	/** 问题描述 */
 	private String desc;
@@ -104,19 +100,19 @@ public class QuestionnaireQuestion {
 		return this.sort;
 	}
 
-	public YesOrNoEnum getIsRequire() {
+	public int getIsRequire() {
 		return isRequire;
 	}
 
-	public void setIsRequire(YesOrNoEnum isRequire) {
+	public void setIsRequire(int isRequire) {
 		this.isRequire = isRequire;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public int getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(int delFlag) {
 		this.delFlag = delFlag;
 	}
 

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

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

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

@@ -1,8 +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;
 
 /**
@@ -17,9 +15,9 @@ public class QuestionnaireTopic {
 	private String title;
 	
 	/** 发布状态（1-可见  0-不可见） */
-	private YesOrNoEnum status = YesOrNoEnum.NO;
+	private int status = 0;
 
-	private YesOrNoEnum delFlag = YesOrNoEnum.NO;
+	private int delFlag = 0;
 
 	/** 创建人编号 */
 	private Integer creatorId;
@@ -68,19 +66,19 @@ public class QuestionnaireTopic {
 		return this.title;
 	}
 
-	public YesOrNoEnum getStatus() {
+	public int getStatus() {
 		return status;
 	}
 
-	public void setStatus(YesOrNoEnum status) {
+	public void setStatus(int status) {
 		this.status = status;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public int getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(int delFlag) {
 		this.delFlag = delFlag;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/page/QuestionnaireTopicQueryInfo.java

@@ -1,17 +1,16 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.page.QueryInfo;
 
 public class QuestionnaireTopicQueryInfo extends QueryInfo {
 
-    private YesOrNoEnum status;
+    private Integer status;
 
-    public YesOrNoEnum getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(YesOrNoEnum status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 }

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" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="is_over_" property="isOver"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="del_flag_" property="delFlag"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -31,14 +31,14 @@
 	<!-- 向数据库增加一条记录 -->
 	<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_,is_over_,create_time_,update_time_)
-		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
+		VALUES(#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{isOver},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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},NOW(),NOW())
+			(#{topicId},#{questionId},#{item.answerValue},#{item.sort},#{item.isOver},NOW(),NOW())
 		</foreach>
 	</insert>
 
@@ -52,7 +52,7 @@
 			sort_ = #{sort},
 		</if>
 		<if test="isOver != null">
-			is_over_ = #{isOver,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			is_over_ = #{isOver},
 		</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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+					is_over_ = #{item.isOver},
 				</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" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="is_require_" property="isRequire"/>
 		<result column="desc_" property="desc" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="del_flag_" property="delFlag"/>
 		<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" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+			<result column="item_is_over_" property="isOver"/>
 			<result column="item_create_time_" property="createTime" />
 			<result column="item_update_time_" property="updateTime" />
-			<result column="item_del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+			<result column="item_del_flag_" property="delFlag"/>
 		</collection>
 	</resultMap>
 	
@@ -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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{desc},NOW(),NOW())
+		VALUES(#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,7 +73,7 @@
 			type_ = #{type},
 		</if>
 		<if test="isRequire != null">
-			is_require_ = #{isRequire,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			is_require_ = #{isRequire},
 		</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" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="status_" property="status"/>
 		<result column="creator_id_" property="creatorId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="del_flag_" property="delFlag"/>
 	</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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{creatorId},NOW(),NOW())
+		VALUES(#{title},#{status},#{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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			status_ = #{status},
 		</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,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				AND status_ = #{status}
 			</if>
 		</where>
 	</sql>

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

@@ -47,18 +47,21 @@ public class QuestionnaireTopicController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/update')")
     @AuditLogAnnotation(operateName = "修改")
-    public Object upSet(@RequestBody QuestionnaireTopic questionnaireTopic) {
+    public Object update(@RequestBody QuestionnaireTopic questionnaireTopic) {
         questionnaireTopicService.modify(questionnaireTopic);
         return succeed();
     }
 
-//    @ApiOperation(value = "删除")
-//    @PostMapping("/del")
-//    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/del')")
-//    public Object del(Integer id) {
-//        questionnaireTopicService.delete(id);
-//        return succeed();
-//    }
+    @ApiOperation(value = "启用/停用")
+    @PostMapping("/updateStatus")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/updateStatus')")
+    @AuditLogAnnotation(operateName = "启用/停用")
+    public Object updateStatus(Integer topicId,Integer status) {
+        QuestionnaireTopic questionnaireTopic = questionnaireTopicService.get(topicId);
+        questionnaireTopic.setStatus(status);
+        questionnaireTopicService.update(questionnaireTopic);
+        return succeed();
+    }
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")