Merge remote-tracking branch 'origin/dev' into dev

sql/20200415.sql

@@ -1,2 +1,11 @@
+# wangjiang
+
+-- 是否显示二维码
+
+
+ALTER TABLE `service_platform`.`ac_activity_detail`
+ADD COLUMN `is_qrcode_show` varchar(2) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '是否显示二维码（1是，0否）,默认显示' AFTER `is_review`,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`) USING BTREE;
 
 ALTER TABLE project_application ADD pass varchar(20)  COLLATE utf8_bin COMMENT '通过状态 用于统计首页数量';

src/main/java/platform/modules/sys/entity/ActivityDetail.java

@@ -41,6 +41,8 @@ public class ActivityDetail extends BaseEntity {
 
     private String is_public;
 
+    private String is_qrcode_show;
+
     private String is_push;
 
     private String push_level;

src/main/resources/mapper/sys/ActivityDetailDao.xml

@@ -13,6 +13,7 @@
         detail.activity_title,
         detail.activity_location,
         detail.is_review,
+        detail.is_qrcode_show,
         detail.reading_number,
         detail.activity_publishtime,
         detail.activity_starttime,
@@ -135,6 +136,7 @@
 			detail.activity_deadline activity_deadline,
 			detail.activity_publishtime activity_publishtime,
 			detail.is_review is_review,
+			detail.is_qrcode_show is_qrcode_show,
 			detail.is_public is_public,
 			detail.push_level push_level,
 			detail.content content,
@@ -186,6 +188,7 @@
         <result column="activity_deadline" property="activity_deadline"/>
         <result column="activity_publishtime" property="activity_publishtime"/>
         <result column="is_review" property="is_review"/>
+        <result column="is_qrcode_show" property="is_qrcode_show"/>
         <result column="is_public" property="is_public"/>
         <result column="push_level" property="push_level"/>
         <result column="content" property="content"/>

src/main/resources/templates/admin/government/activity_add.html

@@ -168,6 +168,13 @@
                 <label><input name="is_public" type="radio" value="1"> 不公开，内部活动</label>
             </div>
         </div>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>是否显示小程序二维码：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <label style="margin-right: 10px;"><input name="is_qrcode_show" checked type="radio" value="1">显示</label>
+                <label><input name="is_qrcode_show" type="radio" value="0">不显示</label>
+            </div>
+        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">推送对象：</label>
             <div class="formControls col-xs-8 col-sm-9">

src/main/resources/templates/admin/government/activity_edit.html

@@ -163,6 +163,17 @@
                 <label><input name="is_public" type="radio" value="1" th:checked="${activity.is_public=='1'}"> 不公开，内部活动</label>
             </div>
         </div>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>是否显示小程序二维码：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <label style="margin-right: 10px;"><input name="is_qrcode_show" checked type="radio" value="1"
+                                                          th:checked="${activity.is_qrcode_show=='1'}"
+                >显示</label>
+                <label><input name="is_qrcode_show" type="radio" value="0"
+                              th:checked="${activity.is_qrcode_show=='0'}"
+                >不显示</label>
+            </div>
+        </div>
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-2">推送对象：</label>
             <div class="formControls col-xs-8 col-sm-9">

src/main/resources/templates/admin/government/activity_list.html

@@ -107,6 +107,7 @@
                 <th>审核人数</th>
                 <th>签到数</th>
                 <th>反馈数</th>
+                <th>二维码显示</th>
                 <th width="120">发布时间</th>
                 <th width="120">活动时间</th>
                 <th width="180">操作</th>
@@ -131,6 +132,8 @@
                 <td th:text="${m.registration_pass_number}"></td>
                 <td th:text="${m.sgin_number}"></td>
                 <td th:text="${m.feedback_number}"></td>
+                <td th:if="${m.is_qrcode_show=='1'}">是</td>
+                <td th:if="${m.is_qrcode_show=='0'}">否</td>
                 <!--<td th:text="${#dates.format(m.activity_publishtime,'yyyy-MM-dd HH:mm')}"></td>-->
                 <td th:text="${#strings.substring(m.activity_publishtime,0,16)}"></td>
                 <td th:text="${#strings.substring(m.activity_starttime,0,16)}"></td>