公告管理、banner管理：修改数据库字段

src/main/java/org/rcisoft/business/cmsActivity/entity/CmsActivity.java

@@ -78,11 +78,11 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
 
     /**
      * @desc 是否需要实名认证
-     * @column is_real_name_authentication
+     * @column is_authentication
      * @default
      */
     @Excel(name = "是否需要实名认证")
-    private Integer isRealNameAuthentication;
+    private Integer isAuthentication;
 
     /**
      * @desc 报名所需费用
@@ -102,13 +102,13 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
 
     /**
      * @desc 发布日期
-     * @column release_date
+     * @column publish_date
      * @default
      */
     @Excel(name = "发布日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date releaseDate;
+    private Date publishDate;
 
 
     /**
@@ -119,8 +119,21 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
     @Excel(name = "内容", orderNum = "11", width = 20)
     private String details;
 
+    /**
+     * @desc 发布状态（1启用、0禁用）
+     * @column publish_status
+     * @default
+     */
+    @Excel(name = "发布状态（1启用、0禁用）", orderNum = "11", width = 20)
+    private String publishStatus;
 
-
+    /**
+     * @desc 备注
+     * @column remarks
+     * @default
+     */
+    @Excel(name = "备注", orderNum = "11", width = 20)
+    private String remarks;
     /**
      * 开始时间
      */

src/main/java/org/rcisoft/business/cmsNotice/entity/CmsNotice.java

@@ -71,13 +71,13 @@ public class CmsNotice extends CyIdIncreEntity<CmsNotice> {
 
     /**
      * @desc 发布日期
-     * @column release_date
+     * @column publish_date
      * @default
      */
     @Excel(name = "发布日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date releaseDate;
+    private Date publishDate;
 
 
     /**

src/main/resources/mapper/business/cmsActivity.mapper/CmsActivityMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="org.rcisoft.business.cmsActivity.entity.CmsActivity">
         <id column="business_id" jdbcType="INTEGER" property="businessId"/>
         <result column="summary" jdbcType="VARCHAR" property="summary"/>
-        <result column="release_date" jdbcType="DATE" property="releaseDate"/>
+        <result column="publish_date" jdbcType="DATE" property="publishDate"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
         <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
@@ -20,7 +20,7 @@
 
         <result column="participant_count" jdbcType="VARCHAR" property="participantCount"/>
         <result column="is_registration" jdbcType="INTEGER" property="isRegistration"/>
-        <result column="is_real_name_authentication" jdbcType="INTEGER" property="isRealNameAuthentication"/>
+        <result column="is_authentication" jdbcType="INTEGER" property="isAuthentication"/>
         <result column="registration_fee" jdbcType="FLOAT" property="registrationFee"/>
     </resultMap>
 
@@ -29,10 +29,10 @@
         select * from cms_activity
         where 1=1
             <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and release_date &gt;=  #{entity.beginTime}
+                and publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null and entity.endTime != '' ">
-                and release_date &lt;=  #{entity.endTime}
+                and publish_date &lt;=  #{entity.endTime}
             </if>
             <if test="entity.createBy !=null and entity.createBy != '' ">
                 and create_by like concat('%',#{entity.createBy},'%')
@@ -72,7 +72,7 @@
 
     <select id="queryCmsActivityPaged" resultMap="BaseResultMap">
         SELECT ca.business_id,
-        ca.release_date,
+        ca.publish_date,
         ca.create_by,
         ca.create_date,
         ca.update_by,
@@ -86,7 +86,7 @@
         applicationList.participant_count,
         ca.is_top,
         ca.is_registration,
-        ca.is_real_name_authentication,
+        ca.is_authentication,
         ca.registration_fee,
         su.nick_name as nickName,
         oi.path
@@ -100,10 +100,10 @@
         LEFT JOIN sys_user su on su.business_id = ca.create_by
         where ca.del_flag='0'
             <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and release_date &gt;=  #{entity.beginTime}
+                and publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null and entity.endTime != '' ">
-                and release_date &lt;=  #{entity.endTime}
+                and publish_date &lt;=  #{entity.endTime}
             </if>
           <if test="entity.flag!=null and entity.flag != '' ">
                 and ca.flag = #{entity.flag}
@@ -113,10 +113,10 @@
                 and create_by like concat('%',#{entity.createBy},'%')
             </if>
             <if test="entity.beginTime !=null ">
-                and ca.release_date &gt;=  #{entity.beginTime}
+                and ca.publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null ">
-                and ca.release_date &lt;=  #{entity.endTime}
+                and ca.publish_date &lt;=  #{entity.endTime}
             </if>
             <if test="entity.updateBy !=null and entity.updateBy != '' ">
                 and update_by like concat('%',#{entity.updateBy},'%')
@@ -133,8 +133,8 @@
         <if test="entity.isRegistration !=null and entity.isRegistration != '' ">
             and is_registration = #{entity.isRegistration}
         </if>
-        <if test="entity.isRealNameAuthentication !=null and entity.isRealNameAuthentication != '' ">
-            and is_real_name_authentication = #{entity.isRealNameAuthentication}
+        <if test="entity.isAuthentication !=null and entity.isAuthentication != '' ">
+            and is_authentication = #{entity.isAuthentication}
         </if>
         <if test="entity.isRecommended !=null and entity.isRecommended != '' ">
             and is_recommended = #{entity.isRecommended}
@@ -142,7 +142,7 @@
         <if test="entity.isTop !=null and entity.isTop != '' ">
             and is_top = #{entity.isTop}
         </if>
-        ORDER BY ca.release_date DESC
+        ORDER BY ca.publish_date DESC
     </select>
     <update id="deleteCmsActivity" parameterType="java.lang.Integer">
         update cms_activity

src/main/resources/mapper/business/cmsNotice.mapper/CmsNoticeMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="org.rcisoft.business.cmsNotice.entity.CmsNotice">
         <id column="business_id" jdbcType="INTEGER" property="businessId"/>
         <result column="summary" jdbcType="VARCHAR" property="summary"/>
-        <result column="release_date" jdbcType="DATE" property="releaseDate"/>
+        <result column="publish_date" jdbcType="DATE" property="publishDate"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
         <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
@@ -25,10 +25,10 @@
         select * from cms_notice
         where 1=1
             <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and release_date &gt;=  #{entity.beginTime}
+                and publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null and entity.endTime != '' ">
-                and release_date &lt;=  #{entity.endTime}
+                and publish_date &lt;=  #{entity.endTime}
             </if>
             <if test="entity.createBy !=null and entity.createBy != '' ">
                 and create_by like concat('%',#{entity.createBy},'%')
@@ -66,7 +66,7 @@
 
     <select id="queryCmsNoticePaged" resultMap="BaseResultMap">
         SELECT cn.business_id,
-        cn.release_date,
+        cn.publish_date,
         cn.create_by,
         cn.create_date,
         cn.update_by,
@@ -85,10 +85,10 @@
         LEFT JOIN sys_user su on su.business_id = cn.create_by
         where cn.del_flag='0'
             <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and release_date &gt;=  #{entity.beginTime}
+                and publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null and entity.endTime != '' ">
-                and release_date &lt;=  #{entity.endTime}
+                and publish_date &lt;=  #{entity.endTime}
             </if>
           <if test="entity.flag!=null and entity.flag != '' ">
                 and cn.flag = #{entity.flag}
@@ -97,10 +97,10 @@
                 and create_by like concat('%',#{entity.createBy},'%')
             </if>
             <if test="entity.beginTime !=null ">
-                and cn.release_date &gt;=  #{entity.beginTime}
+                and cn.publish_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null ">
-                and cn.release_date &lt;=  #{entity.endTime}
+                and cn.publish_date &lt;=  #{entity.endTime}
             </if>
             <if test="entity.updateBy !=null and entity.updateBy != '' ">
                 and update_by like concat('%',#{entity.updateBy},'%')
@@ -117,7 +117,7 @@
         <if test="entity.isTop !=null and entity.isTop != '' ">
             and is_top = #{entity.isTop}
         </if>
-        ORDER BY cn.release_date DESC
+        ORDER BY cn.publish_date DESC
     </select>
     <update id="deleteCmsNotice" parameterType="java.lang.Integer">
         update cms_notice