Merge remote-tracking branch 'origin/master'

config/application-spbt.yml

@@ -119,8 +119,8 @@ global:
   path:
 #    base_upload_location: C:\software\nginx-1.26.2\html\upload
 #    base_discovery: 'http://192.168.1.112:8023/upload/'
-    base_upload_location: D:\tool\nginx-1.26.2\html\upload
-    base_discovery: 'http://192.168.0.173/upload/'
+    base_upload_location: D:\Work\nginx-1.24.0\html\upload
+    base_discovery: 'http://192.168.1.45/upload/'
     zsp_location: /zsp
     code_generate_location: /code
     video_location: /video

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

@@ -141,6 +141,14 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
     @Excel(name = "报名人数")
     private String applicationCount;
 
+    /**
+     * @desc 报名人数上限
+     * @column maximum_application
+     * @default
+     */
+    @Excel(name = "报名人数上限")
+    private String maxNumApplication;
+
     /**
      * @desc 报名所需费用
      * @column application_fee
@@ -202,20 +210,27 @@ public class CmsActivity extends CyIdIncreEntity<CmsActivity> {
     @Excel(name = "是否需要实名认证")
     private Integer isAuthentication;
 
+    /**
+     * @desc 是否会员
+     * @column s_need_member
+     * @default
+     */
+    @Excel(name = "是否会员")
+    private Integer isNeedMember;
     /**
      * 开始时间
      * start_time
      */
-    @JsonIgnore
-    @TableField(exist = false)
+    @Excel(name = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date startTime;
 
     /**
      * 结束时间
      * end_time
      */
-    @JsonIgnore
-    @TableField(exist = false)
+    @Excel(name = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date endTime;
 /*
     *//**

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

@@ -24,6 +24,7 @@
         <result column="is_recommended" jdbcType="INTEGER" property="isRecommended"/>
         <result column="is_application" jdbcType="INTEGER" property="isApplication"/>
         <result column="is_authentication" jdbcType="INTEGER" property="isAuthentication"/>
+        <result column="is_need_member" jdbcType="INTEGER" property="isNeedMember"/>
         <result column="start_time" jdbcType="DATE" property="startTime"/>
         <result column="end_time" jdbcType="DATE" property="endTime"/>
     </resultMap>
@@ -77,6 +78,12 @@
         <if test="entity.pictureId !=null and entity.pictureId != '' ">
             and picture_id = #{entity.pictureId}
         </if>
+        <if test="entity.startTime !=null and entity.startTime != '' ">
+            and start_time = #{entity.startTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and end_time = #{entity.endTime}
+        </if>
         ORDER BY business_id DESC
     </select>
 
@@ -150,12 +157,21 @@
         <if test="entity.isAuthentication !=null and entity.isAuthentication != '' ">
             and is_authentication = #{entity.isAuthentication}
         </if>
+        <if test="entity.isNeedMember !=null and entity.isNeedMember != '' ">
+            and is_need_member = #{entity.isNeedMember}
+        </if>
         <if test="entity.isRecommended !=null and entity.isRecommended != '' ">
             and is_recommended = #{entity.isRecommended}
         </if>
         <if test="entity.isTop !=null and entity.isTop != '' ">
             and is_top = #{entity.isTop}
         </if>
+        <if test="entity.startTime !=null and entity.startTime != '' ">
+            and start_time = #{entity.startTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and end_time = #{entity.endTime}
+        </if>
         ORDER BY ca.publish_date DESC
     </select>
     <update id="deleteCmsActivity" parameterType="java.lang.Integer">