问卷优化

cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/MyItemConfigVO.java

@@ -31,8 +31,8 @@ public class MyItemConfigVO {
 
     @ApiModelProperty(value = "栏目code")
     private String weixinCode;
-    @ApiModelProperty(value = "栏目类型 1-我的培训" + "2-我的课程" + "3-我的作业" + "4-我的考试" + "5-我的调研" +
-            "6-我的积分" + "7-我的做课" + "8-我的投票" + "9-我的分享" + "10-我的消息" + "11-收藏" + "12-我的证书"+"签到"+"我的收藏  等等")
+    @ApiModelProperty(value = "栏目类型 1-我的培训（我的活动）" + "2-我的课程" + "3-我的作业" + "4-我的考试" + "5-我的调研（我参与的问卷）" +
+            "6-我的积分" + "7-我的做课" + "8-我的投票" + "9-我的分享" + "10-我的消息" + "11-收藏" + "12-我的证书"+"签到"+"我的收藏 ;13-我的培训;14-我的评论;15-我的投稿 等等")
     private Integer itemType;
 
     @ApiModelProperty(value = "是否显示:0不显示,1显示（默认为0）")
@@ -50,6 +50,8 @@ public class MyItemConfigVO {
     @ApiModelProperty(value = "接口数据")
     private String interfaceData;
 
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
 
 
 

cloud-site-service/src/main/java/com/yizhi/site/application/domain/MyItemConfig.java

@@ -94,6 +94,8 @@ public class MyItemConfig extends Model<MyItemConfig> {
     @TableField(value = "update_by_name", fill = FieldFill.INSERT)
     private String updateByName;
 
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
 
     @Override
     protected Serializable pkVal() {

cloud-site-service/src/main/java/com/yizhi/site/application/domain/MyItemConfigDefault.java

@@ -93,7 +93,9 @@ public class MyItemConfigDefault extends Model<MyItemConfigDefault> {
     @TableField(value = "update_by_name", fill = FieldFill.INSERT)
     private String updateByName;
 
-
+    @ApiModelProperty(value = "logo图标地址")
+    private String logoImg;
+    
     @Override
     protected Serializable pkVal() {
         return this.id;

cloud-site-service/src/main/resources/mapper/MyItemConfigDefaultMapper.xml

@@ -21,6 +21,7 @@
         <result column="updateTime" property="updateTime"/>
         <result column="updateById" property="updateById"/>
         <result column="updateByName" property="updateByName"/>
+        <result column="logo_img" property="logoImg"/>
     </resultMap>
 
     <!--&lt;!&ndash; 通用查询结果列 &ndash;&gt;-->
@@ -28,12 +29,12 @@
             my.id AS id, my.name AS name,my.itemType AS itemType , my.deleted AS deleted, my.showable AS showable,
         my.sort AS sort, my.terminal_type AS terminalType, my.pc_add_url AS pcAddUrl,my.pc_code AS pcCode,my.weixin_code AS weixinCode, my.site_id AS siteId,
         my.create_time AS createTime, my.create_by_id AS createById, my.create_by_name AS createByName,
-        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName
+        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName,my.logo_img
     </sql>
 
     <select id="queryByAuthority" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType,my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config_default my
         <where>
             my.deleted = 0 and my.showable = 1
@@ -49,7 +50,7 @@
 
     <select id="queryMyitemConfigByCondition" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType , my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config_default my
         <where>
             my.deleted = 0

cloud-site-service/src/main/resources/mapper/MyItemConfigMapper.xml

@@ -21,6 +21,7 @@
         <result column="updateTime" property="updateTime"/>
         <result column="updateById" property="updateById"/>
         <result column="updateByName" property="updateByName"/>
+        <result column="logo_img" property="logoImg"/>
     </resultMap>
 
     <!--&lt;!&ndash; 通用查询结果列 &ndash;&gt;-->
@@ -28,12 +29,12 @@
         my.id AS id, my.name AS name,my.itemType AS itemType , my.deleted AS deleted, my.showable AS showable,
         my.sort AS sort, my.terminal_type AS terminalType, my.pc_add_url AS pcAddUrl,my.pc_code AS pcCode,my.weixin_code AS weixinCode, my.site_id AS siteId,
         my.create_time AS createTime, my.create_by_id AS createById, my.create_by_name AS createByName,
-        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName
+        my.update_time AS updateTime, my.update_by_id AS updateById, my.update_by_name AS updateByName,my.logo_img
     </sql>
 
     <select id="queryMyitemConfigByCondition" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType , my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId
+        my.sort AS sort, my.terminal_type AS terminalType, my.site_id AS siteId,my.logo_img
         from my_item_config my
         <where>
             my.deleted = 0
@@ -55,7 +56,7 @@
 
     <select id="queryByAuthoity" resultMap="BaseResultMap">
         select my.id AS id, my.name AS name,my.item_type AS itemType,my.deleted AS deleted, my.showable AS showable,
-        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode
+        my.sort AS sort, my.terminal_type AS terminalType,my.site_id AS siteId,my.pc_code AS pcCode,my.pc_add_url AS pcAddUrl,my.weixin_code AS weixinCode,my.logo_img
         from my_item_config my
         <where>
             my.deleted = 0