修改 活动后台修改查看签到列表和查看报名列表

src/main/java/platform/modules/api/web/ActivityOpenController.java

@@ -186,6 +186,16 @@ public class ActivityOpenController extends BaseController {
         return ResponseMessage.success("操作成功！");
     }
 
+    @OperationLog(value = "删除报名")
+    @DeleteMapping(value = "/delete_regist")
+    public ResponseMessage deleteRegist(@RequestParam("regist_id") String registId) {
+        ActivityRegistration activityRegistration = new ActivityRegistration();
+        activityRegistration.setId(Integer.parseInt(registId));
+        activityRegistration.setDel_flag(true);
+        activityRegistrationService.updateSelective(activityRegistration);
+        return ResponseMessage.success("操作成功！");
+    }
+
     /**
      * @Author: huZhiHao
      * @Description: 获取已报名
@@ -290,7 +300,7 @@ public class ActivityOpenController extends BaseController {
             activityRegistrationService.updateState(activityRegistration_n);
             return ResponseMessage.success("签到成功!");
         }
-        return ResponseMessage.success("签到失败!");
+        return ResponseMessage.error("签到失败!");
     }
 
     //根据手机号获取用户信息和企业信息

src/main/java/platform/modules/home/HomeController.java

@@ -1082,7 +1082,7 @@ public class HomeController extends BaseController {
     /**
      * 微信小程序登录
      */
-    @GetMapping("wxapp/login")
+    @GetMapping("/wxapp/login")
     @ResponseBody
     public ResponseMessage wxAppLogin(
             @RequestParam String code
@@ -1093,7 +1093,7 @@ public class HomeController extends BaseController {
     /**
      * 微信小程序获取用户信息
      */
-    @GetMapping("wxapp/phone")
+    @GetMapping("/wxapp/phone")
     @ResponseBody
     public ResponseMessage wxAppUserinfo(
             @RequestParam String code,

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

@@ -71,6 +71,14 @@
                 '5' type
             FROM
                 z_user u
+            UNION
+            SELECT
+                z.id id,
+                a.company_name name,
+                '6' type
+            FROM
+                ac_activity_registration a
+            JOIN z_user z ON z.id = a.user_id
         ) zuser ON reg.user_id = zuser.id
         AND reg.user_type = zuser.type
         WHERE
@@ -127,10 +135,20 @@
             FROM
                 sys_department s
             JOIN z_user z ON z.department_id = s.id
+            UNION
+            SELECT
+                z.id id,
+                a.company_name name,
+                '6' type
+            FROM
+                ac_activity_registration a
+            JOIN z_user z ON z.id = a.user_id
         ) zuser ON reg.user_id = zuser.id
         AND reg.user_type = zuser.type
         WHERE
-            reg.activity_id = #{activityId}
+            reg.del_flag = 0
+            AND reg.activity_id = #{activityId}
+            AND reg.review_state != 3
     </select>
 
     <select id="findMyActivityPage" parameterType="platform.modules.sys.entity.ActivityRegistration"

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

@@ -213,7 +213,10 @@
                     <td th:text="${m.phone}"></td>
                     <td th:text="${m.mail}"></td>
                     <td th:text="${m.position}"></td>
-                    <td>门户</td>
+                    <!--报名途径-->
+                    <td th:if="${m.registration_way=='0'}">门户</td>
+                    <td th:if="${m.registration_way=='1'}">微信</td>
+                    <!--报名途径-->
                     <td th:if="${m.review_state=='0'}">待审核</td>
                     <td th:if="${m.review_state=='1'}">通过</td>
                     <td th:if="${m.review_state=='2'}">驳回</td>
@@ -255,8 +258,8 @@
                 </tr>
                 </tbody>
             </table>
-            <div class="row cl" style="text-align: center">
-                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+            <div class="row cl" style="padding-top: 10px">
+                <div style="text-align: center">
                     <a onclick="removeIframe();" class="btn btn-default radius" type="button">返回</a>
                 </div>
             </div>
@@ -274,8 +277,8 @@
                     </ul>
                 </div>
             </div>
-            <div class="row cl" style="text-align: center">
-                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+            <div class="row cl" style="padding-top: 10px">
+                <div style="text-align: center">
                     <a onclick="removeIframe();" class="btn btn-default radius" type="button">返回</a>
                 </div>
             </div>