调查问卷功能

codegen/src/main/resources/generateConfigration.xml

@@ -8,7 +8,7 @@
 		<catalog>mec_dev</catalog>
 		<schema>mec_dev</schema>
 	</dbConfiguration>
-	<srcBase>/Users/zouxuan/Documents/javabean</srcBase>
+	<srcBase>/Users/chenxiaoyu/Documents/javabean</srcBase>
 	<pojoPackageName>com.ym.mec.biz.dal.entity</pojoPackageName>
 	<daoPackageName>com.ym.mec.biz.dal.dao</daoPackageName>
 	<servicePackageName>com.ym.mec.biz.service</servicePackageName>

codegen/src/main/resources/template/dao.ftl

@@ -1,7 +1,7 @@
 [#ftl]
 package ${daoPackageName};
 
-import ${daoPackageName}.base.BaseDAO;
+import com.ym.mec.common.dal.BaseDAO;
 import ${pojoFullClassName};
 
 public interface ${className}Dao [#if paramType??]extends BaseDAO<${paramType}, ${className}>[/#if] {

codegen/src/main/resources/template/service.ftl

@@ -1,8 +1,8 @@
 [#ftl]
 package ${servicePackageName};
 
-import java.util.List;
 import ${pojoFullClassName};
+import com.ym.mec.common.service.BaseService;
 
 public interface ${className}Service extends BaseService<${paramType}, ${className}> {
 

codegen/src/main/resources/template/service_impl.ftl

@@ -1,8 +1,8 @@
 [#ftl]
 package ${servicePackageName}.impl;
 
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
 import ${pojoFullClassName};
 import ${servicePackageName}.${className}Service;
 import ${daoPackageName}.${className}Dao;

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireQuestionDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestion;
+
+public interface QuestionnaireQuestionDao extends BaseDAO<Long, QuestionnaireQuestion> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireQuestionItemDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem;
+
+public interface QuestionnaireQuestionItemDao extends BaseDAO<Long, QuestionnaireQuestionItem> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireTopicDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+
+public interface QuestionnaireTopicDao extends BaseDAO<Integer, QuestionnaireTopic> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireUserResultDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+
+public interface QuestionnaireUserResultDao extends BaseDAO<Long, QuestionnaireUserResult> {
+
+	
+}

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

@@ -0,0 +1,114 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(questionnaire_question):
+ */
+public class QuestionnaireQuestion {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer questionnaireTopicId;
+	
+	/** 题目内容 */
+	private String content;
+	
+	/** 题目类型（单选/多选/填空） */
+	private String type;
+	
+	/** 排序 */
+	private Integer sort;
+	
+	/** 是否必填 */
+	private boolean isRequire;
+	
+	/** 问题描述 */
+	private String desc;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setQuestionnaireTopicId(Integer questionnaireTopicId){
+		this.questionnaireTopicId = questionnaireTopicId;
+	}
+	
+	public Integer getQuestionnaireTopicId(){
+		return this.questionnaireTopicId;
+	}
+			
+	public void setContent(String content){
+		this.content = content;
+	}
+	
+	public String getContent(){
+		return this.content;
+	}
+			
+	public void setType(String type){
+		this.type = type;
+	}
+	
+	public String getType(){
+		return this.type;
+	}
+			
+	public void setSort(Integer sort){
+		this.sort = sort;
+	}
+	
+	public Integer getSort(){
+		return this.sort;
+	}
+			
+	public void setIsRequire(boolean isRequire){
+		this.isRequire = isRequire;
+	}
+	
+	public boolean isIsRequire(){
+		return this.isRequire;
+	}
+			
+	public void setDesc(String desc){
+		this.desc = desc;
+	}
+	
+	public String getDesc(){
+		return this.desc;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,92 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(questionnaire_question_item):
+ */
+public class QuestionnaireQuestionItem {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer questionnaireTopicId;
+	
+	/**  */
+	private Long questionnaireQuestionId;
+	
+	/** 答案项 */
+	private String answerValue;
+	
+	/** 排序 */
+	private Integer sort;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setQuestionnaireTopicId(Integer questionnaireTopicId){
+		this.questionnaireTopicId = questionnaireTopicId;
+	}
+	
+	public Integer getQuestionnaireTopicId(){
+		return this.questionnaireTopicId;
+	}
+			
+	public void setQuestionnaireQuestionId(Long questionnaireQuestionId){
+		this.questionnaireQuestionId = questionnaireQuestionId;
+	}
+	
+	public Long getQuestionnaireQuestionId(){
+		return this.questionnaireQuestionId;
+	}
+			
+	public void setAnswerValue(String answerValue){
+		this.answerValue = answerValue;
+	}
+	
+	public String getAnswerValue(){
+		return this.answerValue;
+	}
+			
+	public void setSort(Integer sort){
+		this.sort = sort;
+	}
+	
+	public Integer getSort(){
+		return this.sort;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,81 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(questionnaire_topic):
+ */
+public class QuestionnaireTopic {
+
+	/**  */
+	private Integer id;
+	
+	/** 标题 */
+	private String title;
+	
+	/** 发布状态（1-可见  0-不可见） */
+	private boolean status;
+	
+	/** 创建人编号 */
+	private Integer creatorId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setTitle(String title){
+		this.title = title;
+	}
+	
+	public String getTitle(){
+		return this.title;
+	}
+			
+	public void setStatus(boolean status){
+		this.status = status;
+	}
+	
+	public boolean isStatus(){
+		return this.status;
+	}
+			
+	public void setCreatorId(Integer creatorId){
+		this.creatorId = creatorId;
+	}
+	
+	public Integer getCreatorId(){
+		return this.creatorId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,103 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(questionnaire_user_result):
+ */
+public class QuestionnaireUserResult {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer userId;
+	
+	/**  */
+	private Integer questionnaireTopicId;
+	
+	/**  */
+	private Long questionnaireQuestionId;
+	
+	/**  */
+	private String questionnaireQuestionItemIdList;
+	
+	/** 附加答案 */
+	private String additionalValue;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setUserId(Integer userId){
+		this.userId = userId;
+	}
+	
+	public Integer getUserId(){
+		return this.userId;
+	}
+			
+	public void setQuestionnaireTopicId(Integer questionnaireTopicId){
+		this.questionnaireTopicId = questionnaireTopicId;
+	}
+	
+	public Integer getQuestionnaireTopicId(){
+		return this.questionnaireTopicId;
+	}
+			
+	public void setQuestionnaireQuestionId(Long questionnaireQuestionId){
+		this.questionnaireQuestionId = questionnaireQuestionId;
+	}
+	
+	public Long getQuestionnaireQuestionId(){
+		return this.questionnaireQuestionId;
+	}
+			
+	public void setQuestionnaireQuestionItemIdList(String questionnaireQuestionItemIdList){
+		this.questionnaireQuestionItemIdList = questionnaireQuestionItemIdList;
+	}
+	
+	public String getQuestionnaireQuestionItemIdList(){
+		return this.questionnaireQuestionItemIdList;
+	}
+			
+	public void setAdditionalValue(String additionalValue){
+		this.additionalValue = additionalValue;
+	}
+	
+	public String getAdditionalValue(){
+		return this.additionalValue;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/QuestionnaireQuestionItemService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem;
+import com.ym.mec.common.service.BaseService;
+
+public interface QuestionnaireQuestionItemService extends BaseService<Long, QuestionnaireQuestionItem> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/QuestionnaireQuestionService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestion;
+import com.ym.mec.common.service.BaseService;
+
+public interface QuestionnaireQuestionService extends BaseService<Long, QuestionnaireQuestion> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/QuestionnaireTopicService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+import com.ym.mec.common.service.BaseService;
+
+public interface QuestionnaireTopicService extends BaseService<Integer, QuestionnaireTopic> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/QuestionnaireUserResultService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+import com.ym.mec.common.service.BaseService;
+
+public interface QuestionnaireUserResultService extends BaseService<Long, QuestionnaireUserResult> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireQuestionItemServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem;
+import com.ym.mec.biz.service.QuestionnaireQuestionItemService;
+import com.ym.mec.biz.dal.dao.QuestionnaireQuestionItemDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuestionnaireQuestionItemServiceImpl extends BaseServiceImpl<Long, QuestionnaireQuestionItem>  implements QuestionnaireQuestionItemService {
+	
+	@Autowired
+	private QuestionnaireQuestionItemDao questionnaireQuestionItemDao;
+
+	@Override
+	public BaseDAO<Long, QuestionnaireQuestionItem> getDAO() {
+		return questionnaireQuestionItemDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireQuestionServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.biz.dal.entity.QuestionnaireQuestion;
+import com.ym.mec.biz.service.QuestionnaireQuestionService;
+import com.ym.mec.biz.dal.dao.QuestionnaireQuestionDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuestionnaireQuestionServiceImpl extends BaseServiceImpl<Long, QuestionnaireQuestion>  implements QuestionnaireQuestionService {
+	
+	@Autowired
+	private QuestionnaireQuestionDao questionnaireQuestionDao;
+
+	@Override
+	public BaseDAO<Long, QuestionnaireQuestion> getDAO() {
+		return questionnaireQuestionDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireTopicServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+import com.ym.mec.biz.service.QuestionnaireTopicService;
+import com.ym.mec.biz.dal.dao.QuestionnaireTopicDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, QuestionnaireTopic>  implements QuestionnaireTopicService {
+	
+	@Autowired
+	private QuestionnaireTopicDao questionnaireTopicDao;
+
+	@Override
+	public BaseDAO<Integer, QuestionnaireTopic> getDAO() {
+		return questionnaireTopicDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/QuestionnaireUserResultServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+import com.ym.mec.biz.service.QuestionnaireUserResultService;
+import com.ym.mec.biz.dal.dao.QuestionnaireUserResultDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, QuestionnaireUserResult>  implements QuestionnaireUserResultService {
+	
+	@Autowired
+	private QuestionnaireUserResultDao questionnaireUserResultDao;
+
+	@Override
+	public BaseDAO<Long, QuestionnaireUserResult> getDAO() {
+		return questionnaireUserResultDao;
+	}
+	
+}

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.QuestionnaireQuestionItemDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" id="QuestionnaireQuestionItem">
+		<result column="id_" property="id" />
+		<result column="questionnaire_topic_id_" property="questionnaireTopicId" />
+		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+		<result column="answer_value_" property="answerValue" />
+		<result column="sort_" property="sort" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="QuestionnaireQuestionItem" >
+		SELECT * FROM questionnaire_question_item WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="QuestionnaireQuestionItem">
+		SELECT * FROM questionnaire_question_item ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO questionnaire_question_item (id_,questionnaire_topic_id_,questionnaire_question_id_,answer_value_,sort_,create_time_,update_time_) VALUES(#{id},#{questionnaireTopicId},#{questionnaireQuestionId},#{answerValue},#{sort},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestionItem">
+		UPDATE questionnaire_question_item <set>
+<if test="questionnaireQuestionId != null">
+questionnaire_question_id_ = #{questionnaireQuestionId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="questionnaireTopicId != null">
+questionnaire_topic_id_ = #{questionnaireTopicId},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="sort != null">
+sort_ = #{sort},
+</if>
+<if test="answerValue != null">
+answer_value_ = #{answerValue},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM questionnaire_question_item WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="QuestionnaireQuestionItem" parameterType="map">
+		SELECT * FROM questionnaire_question_item ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM questionnaire_question_item
+	</select>
+</mapper>

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

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.QuestionnaireQuestionDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" id="QuestionnaireQuestion">
+		<result column="id_" property="id" />
+		<result column="questionnaire_topic_id_" property="questionnaireTopicId" />
+		<result column="content_" property="content" />
+		<result column="type_" property="type" />
+		<result column="sort_" property="sort" />
+		<result column="is_require_" property="isRequire" />
+		<result column="desc_" property="desc" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="QuestionnaireQuestion" >
+		SELECT * FROM questionnaire_question WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="QuestionnaireQuestion">
+		SELECT * FROM questionnaire_question ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO questionnaire_question (id_,questionnaire_topic_id_,content_,type_,sort_,is_require_,desc_,create_time_,update_time_) VALUES(#{id},#{questionnaireTopicId},#{content},#{type},#{sort},#{isRequire},#{desc},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireQuestion">
+		UPDATE questionnaire_question <set>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="questionnaireTopicId != null">
+questionnaire_topic_id_ = #{questionnaireTopicId},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="content != null">
+content_ = #{content},
+</if>
+<if test="sort != null">
+sort_ = #{sort},
+</if>
+<if test="type != null">
+type_ = #{type},
+</if>
+<if test="isRequire != null">
+is_require_ = #{isRequire},
+</if>
+<if test="desc != null">
+desc_ = #{desc},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM questionnaire_question WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="QuestionnaireQuestion" parameterType="map">
+		SELECT * FROM questionnaire_question ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM questionnaire_question
+	</select>
+</mapper>

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

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.QuestionnaireTopicDao">
+	
+	<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="creator_id_" property="creatorId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="QuestionnaireTopic" >
+		SELECT * FROM questionnaire_topic WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="QuestionnaireTopic">
+		SELECT * FROM questionnaire_topic ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO questionnaire_topic (id_,title_,status_,creator_id_,create_time_,update_time_) VALUES(#{id},#{title},#{status},#{creatorId},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireTopic">
+		UPDATE questionnaire_topic <set>
+<if test="status != null">
+status_ = #{status},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="creatorId != null">
+creator_id_ = #{creatorId},
+</if>
+<if test="title != null">
+title_ = #{title},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM questionnaire_topic WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="QuestionnaireTopic" parameterType="map">
+		SELECT * FROM questionnaire_topic ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM questionnaire_topic
+	</select>
+</mapper>

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

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.QuestionnaireUserResultDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.QuestionnaireUserResult" id="QuestionnaireUserResult">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="questionnaire_topic_id_" property="questionnaireTopicId" />
+		<result column="questionnaire_question_id_" property="questionnaireQuestionId" />
+		<result column="questionnaire_question_item_id_list_" property="questionnaireQuestionItemIdList" />
+		<result column="additional_value_" property="additionalValue" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="QuestionnaireUserResult" >
+		SELECT * FROM questionnaire_user_result WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="QuestionnaireUserResult">
+		SELECT * FROM questionnaire_user_result ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireUserResult" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO questionnaire_user_result (id_,user_id_,questionnaire_topic_id_,questionnaire_question_id_,questionnaire_question_item_id_list_,additional_value_,create_time_,update_time_) VALUES(#{id},#{userId},#{questionnaireTopicId},#{questionnaireQuestionId},#{questionnaireQuestionItemIdList},#{additionalValue},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.QuestionnaireUserResult">
+		UPDATE questionnaire_user_result <set>
+<if test="userId != null">
+user_id_ = #{userId},
+</if>
+<if test="questionnaireQuestionId != null">
+questionnaire_question_id_ = #{questionnaireQuestionId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="questionnaireTopicId != null">
+questionnaire_topic_id_ = #{questionnaireTopicId},
+</if>
+<if test="updateTime != null">
+update_time_ = #{updateTime},
+</if>
+<if test="questionnaireQuestionItemIdList != null">
+questionnaire_question_item_id_list_ = #{questionnaireQuestionItemIdList},
+</if>
+<if test="additionalValue != null">
+additional_value_ = #{additionalValue},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM questionnaire_user_result WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="QuestionnaireUserResult" parameterType="map">
+		SELECT * FROM questionnaire_user_result ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM questionnaire_user_result
+	</select>
+</mapper>

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

@@ -0,0 +1,70 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.ChargeType;
+import com.ym.mec.biz.dal.entity.QuestionnaireTopic;
+import com.ym.mec.biz.service.ChargeTypeService;
+import com.ym.mec.biz.service.QuestionnaireTopicService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.QueryInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+@RequestMapping("questionnaireTopic")
+@Api(tags = "收费类型服务")
+@RestController
+public class QuestionnaireTopicController extends BaseController {
+
+    @Autowired
+    private QuestionnaireTopicService questionnaireTopicService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/add')")
+    @AuditLogAnnotation(operateName = "新增")
+    public Object add(@RequestBody QuestionnaireTopic questionnaireTopic) {
+        questionnaireTopicService.insert(questionnaireTopic);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/update')")
+    @AuditLogAnnotation(operateName = "修改")
+    public Object upSet(@RequestBody QuestionnaireTopic questionnaireTopic) {
+        questionnaireTopicService.update(questionnaireTopic);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/del')")
+    public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
+        questionnaireTopicService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/queryPage')")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(questionnaireTopicService.queryPage(queryInfo));
+    }
+
+
+    @ApiOperation(value = "全查询")
+    @GetMapping("/findAll")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireTopic/findAll')")
+    public HttpResponseResult<List<QuestionnaireTopic>> findAll() {
+        return succeed(questionnaireTopicService.findAll(new HashMap<>()));
+    }
+
+}