活动模块添加活动结束后删除功能和编辑功能

src/main/java/platform/modules/government/web/ActivityController.java

@@ -21,6 +21,7 @@ import platform.common.base.model.Dict;
 import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.DictService;
 import platform.common.base.service.DictionaryItemService;
+import platform.common.exception.BaseException;
 import platform.common.util.AlibabaSMSUtil;
 import platform.common.util.ExportExcel;
 import platform.common.util.ShiroUtils;
@@ -782,6 +783,25 @@ public class ActivityController extends BaseController {
         return ResponseMessage.success("保存成功!");
     }
 
+    /**
+     * 删除项目
+     */
+    @OperationLog(value = "删除活动")
+    @ResponseBody
+    @DeleteMapping(value = "/delete/{id}")
+    public ResponseMessage delete(@PathVariable("id") String id) throws Exception {
+
+        try {
+            activityService.deleteProject(id);
+            return ResponseMessage.success("删除成功！");
+        }catch(BaseException e) {
+            return ResponseMessage.success(e.getMessage());
+        }catch(Exception e) {
+            e.printStackTrace();
+        }
+        return ResponseMessage.error("删除失败！");
+    }
+
     /**
      * 跳转到添加推送页面
      *

src/main/java/platform/modules/sys/service/ActivityFeedbackService.java

@@ -230,5 +230,4 @@ public class ActivityFeedbackService extends BaseService<ActivityFeedback> {
         map.put("score_all", feedbacks.size());
         return map;
     }
-
 }

src/main/java/platform/modules/sys/service/ActivityService.java

@@ -16,6 +16,7 @@ import platform.common.Constant;
 import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.BaseService;
 import platform.common.base.service.DictionaryItemService;
+import platform.common.exception.BaseException;
 import platform.common.util.*;
 import platform.modules.build.entity.BuildInfo;
 import platform.modules.government.dao.AttachmentDao;
@@ -234,6 +235,25 @@ public class ActivityService extends BaseService<ActivityDetail> {
         return false;
     }
 
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    public void deleteProject(String id) {
+        if (StringUtils.isBlank(id)) {
+            throw new BaseException("活动不存在！");
+        }
+        ActivityDetail activity = this.findById(Integer.valueOf(id));
+        if (null == activity) {
+            throw new BaseException("活动不存在！");
+        } else {
+            activity.setDel_flag(true);
+            this.updateSelective(activity);
+        }
+    }
+
     /**
      * 装配推送实体
      *
@@ -584,7 +604,7 @@ public class ActivityService extends BaseService<ActivityDetail> {
 
         PageHelper.startPage(pageNum, 5);
         List<ActivityRegistration> registrations =
-                activityRegistrationService.getActivityRegistration(id+"", ShiroUtils.getUserId()+"");
+                activityRegistrationService.getActivityRegistration(id + "", ShiroUtils.getUserId() + "");
         ActivityOrderDetail orderDetail = new ActivityOrderDetail();
         orderDetail.setActivityDetail(detail);
         orderDetail.setActivityRegistration(new PageInfo<>(registrations));

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

@@ -80,6 +80,7 @@
         ac_activity_detail detail
         WHERE
         1=1
+        AND detail.del_flag = 0
         <if test="activity.title != null and activity.title != '' ">
             AND detail.activity_title LIKE CONCAT('%',#{activity.title},'%')
         </if>

src/main/resources/static/js/government/activity/activity_list.js

@@ -50,4 +50,30 @@ function activityReject(title, url, w, h) {
 /*活动二维码*/
 function activityQRcode(title, url, w, h) {
     var index = layer_show(title, pagePath + url, w, h);
+}
+
+function activityDelete(url){
+    layer.confirm('确认要删除吗？',function(index){
+        //此处请求后台程序，下方是成功后的前台处理……
+        $.ajax({
+            type:"DELETE",
+            dataType:"json",
+            url: pagePath+url,
+            data:{
+                "timestamp":new Date().getTime()
+            },
+            success: function (result) {
+                if (result.success) {
+                    smileMessage(result.message)
+                    setTime();
+
+                } else {
+                    errorMessage(result.message);
+                }
+            },
+            error: function () {
+                errorMessage('系统错误!');
+            }
+        });
+    });
 }

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

@@ -140,8 +140,8 @@
                 <td class="td-manage">
                     <a class="ml-5"
                        th:onclick="'javascript:activityDetail(\'查看活动详情\',\'/government/activity/get/'+${m.id}+'\');'">详情</a>
-                    <!--未发布和报名中编辑-->
-                    <a th:if="${m.state_code=='0'||m.state_code=='1'}" class="ml-5"
+                    <!--未发布和报名中编辑--> <!--20200507追加 已结束的可以编辑state_code=4-->
+                    <a th:if="${m.state_code=='0'||m.state_code=='1'||m.state_code=='4'}" class="ml-5"
                        th:onclick="'javascript:editActivity(\'编辑活动\',\'/government/activity/edit/'+${m.id}+'\');'">编辑</a>
                     <!--报名中和进行中的可以审核-->
                     <a th:if="${(m.state_code=='1'||m.state_code=='3')&& m.is_review=='0'}" class="ml-5"
@@ -152,8 +152,12 @@
                     <!--进行中和结束的可以签到-->
                     <a th:if="${m.state_code=='3'||m.state_code=='4'}" class="ml-5"
                        th:onclick="'javascript:activitySign(\'活动签到\',\'/government/activity/sign/'+${m.id}+'\');'">签到确认</a>
+                    <!--报名中和进行中的可以生成二维码-->
                     <a th:if="${m.state_code=='1'||m.state_code=='3'}" class="ml-5"
                        th:onclick="'javascript:activityQRcode(\'活动二维码\',\'/government/activity/qrcode/'+${m.id}+'\',\'800\',\'500\');'">二维码</a>
+                    <!--20200507追加 已结束的可以删除state_code=4-->
+                    <a th:if="${m.state_code=='4'}" class="ml-5"
+                       th:onclick="'javascript:activityDelete(\'/government/activity/delete/'+${m.id}+'\');'">删除</a>
                 </td>
             </tr>
             </tbody>