修改 活动反馈修改

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

@@ -105,7 +105,7 @@ public class ActivityOpenController extends BaseController {
     @GetMapping(value = "/is_regist")
     public ResponseMessage getActivityDetail(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
 
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, null);
         if (!CollectionUtils.isEmpty(activityRegistrationList)) {
             for (ActivityRegistration activityRegistration : activityRegistrationList) {
                 if (!Objects.equals("3", activityRegistration.getReview_state())) {
@@ -124,7 +124,7 @@ public class ActivityOpenController extends BaseController {
     @GetMapping(value = "/getRegUsers")
     public ResponseMessage getRegUsers(String activity_id, String user_id) {
         log.info("获取已报名的用户！");
-        return ResponseMessage.success("查询成功!", activityRegistrationService.getCurrRegUsers(activity_id, user_id));
+        return ResponseMessage.success("查询成功!", activityRegistrationService.getCurrRegUsers(activity_id, null, user_id));
     }
 
     /**
@@ -194,7 +194,7 @@ public class ActivityOpenController extends BaseController {
     @DeleteMapping(value = "/cancel_regist")
     public ResponseMessage cancelRegist(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
 
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, null);
         if (!CollectionUtils.isEmpty(activityRegistrationList)) {
             List<String> ids = new ArrayList<>();
             for (ActivityRegistration activityRegistration : activityRegistrationList) {
@@ -225,7 +225,7 @@ public class ActivityOpenController extends BaseController {
     @GetMapping(value = "/regist_user/list")
     public ResponseMessage getCurrRegUsers(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
 
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, null);
         return ResponseMessage.success("查询成功!", activityRegistrationList);
     }
 

src/main/java/platform/modules/government/service/LandStatisticsService.java

@@ -36,15 +36,15 @@ public class LandStatisticsService {
 
         for (StockLand stockLand : stockLandList) {
 
-            if(Objects.equals(Constant.UserType.STREET,stockLand.getApplyUserType())){
+            if (Objects.equals(Constant.UserType.STREET, stockLand.getApplyUserType())) {
                 pendingStreet++;
-            }else if(Objects.equals(Constant.UserType.COMPANY,stockLand.getApplyUserType())){
+            } else if (Objects.equals(Constant.UserType.COMPANY, stockLand.getApplyUserType())) {
                 pendingCompany++;
             }
         }
 
         //装配待处理具体
-        Map<String,Object> temp = new HashMap<>();
+        Map<String, Object> temp = new HashMap<>();
         temp.put("name", "企业申请");
         temp.put("value", pendingCompany);
         pending.add(temp);
@@ -53,6 +53,10 @@ public class LandStatisticsService {
         temp.put("value", pendingStreet);
         pending.add(temp);
 
+        //装配处理中具体
+
+        //装配已处理具体
+
         //最后装配一起返回
         Map<String, List> map = new HashMap<>();
         map.put("pending", pending);

src/main/java/platform/modules/sys/dao/ActivityRegistrationDao.java

@@ -27,15 +27,15 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 
     List<ActivityRegistration> findByRelationIdAndType(@Param("type") String type, @Param("rel") String id, @Param("activity_id") String activity_id);
 
-    List<ActivityRegistration> findByActivityAndPhone(@Param("activity_id") String activity_id, @Param("phone") String phone);
+    List<ActivityRegistration> findByActivityUserIdPhone(@Param("activity_id") String activity_id, @Param("phone") String phone, @Param("user_id") String user_id);
 
-    List<ActivityRegistration> findByActivityIdAndUserIdAndPhones(@Param("activity_id") String activity_id,@Param("user_id") String user_id, @Param("registrations") List<ActivityRegistration> registrations);
+    List<ActivityRegistration> findByActivityIdAndUserIdAndPhones(@Param("activity_id") String activity_id, @Param("user_id") String user_id, @Param("registrations") List<ActivityRegistration> registrations);
 
     List<ActivityRegistrationExports> findRegistrationExport(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
 
     void adortRegister(@Param("list") List<String> ids);
 
-    List<ActivityRegistration> getActivityRegistration(@Param("activityId") Integer activityId, @Param("userId") int userId);
+    List<ActivityRegistration> getActivityRegistration(@Param("activityId") String activityId, @Param("userId") String userId);
 
     List<ActivityDetail> findPendingActivity(Integer userId);
 

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

@@ -286,7 +286,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      *
      * @return
      */
-    public List<ActivityRegistration> getCurrRegUsers(String activity_id, String phone) {
+    public List<ActivityRegistration> getCurrRegUsers(String activityId, String phone, String userId) {
 
         /*User user = userService.findByMobile(phone);
         if (user == null)
@@ -306,7 +306,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         } else if (Objects.equals(Constant.UserType.WECHAT, userType)) {
             relationId = user.getId().toString();
         }*/
-        return activityRegistrationDao.findByActivityAndPhone(activity_id, phone);
+        return activityRegistrationDao.findByActivityUserIdPhone(activityId, phone, userId);
     }
 
     /**
@@ -393,7 +393,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      * @param userId
      * @return
      */
-    public List<ActivityRegistration> getActivityRegistration(Integer activityId, int userId) {
+    public List<ActivityRegistration> getActivityRegistration(String activityId, String userId) {
         return activityRegistrationDao.getActivityRegistration(activityId, userId);
     }
 

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

@@ -584,7 +584,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/ActivityRegistrationDao.xml

@@ -315,7 +315,7 @@
         </foreach>
     </select>
 
-    <select id="findByActivityAndPhone"
+    <select id="findByActivityUserIdPhone"
             resultType="platform.modules.sys.entity.ActivityRegistration">
 
        SELECT
@@ -325,7 +325,12 @@
         WHERE
             reg.del_flag = 0
         and reg.activity_id = #{activity_id}
-        and reg.phone = #{phone}
+        <if test="phone != null and phone != '' ">
+            and reg.phone = #{phone}
+        </if>
+        <if test="user_id != null and user_id != '' ">
+            and reg.user_id = #{user_id}
+        </if>
         ORDER BY
             reg.create_time ASC
     </select>