新增 活动前台小程序接口

修改 活动后台添加小程序二维码

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

@@ -1,7 +1,8 @@
 package platform.modules.api.web;
 
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -9,6 +10,7 @@ import platform.common.Constant;
 import platform.common.annotation.OperationLog;
 import platform.common.base.controller.BaseController;
 import platform.common.util.ShiroUtils;
+import platform.common.util.WxAppUtil;
 import platform.modules.build.entity.Company;
 import platform.modules.build.service.CompanyService;
 import platform.modules.government.dto.ParamRegistration;
@@ -19,9 +21,11 @@ import platform.modules.government.service.AttachmentService;
 import platform.modules.government.service.UserService;
 import platform.modules.sys.entity.ActivityDetail;
 import platform.modules.sys.entity.ActivityFavourite;
-import platform.modules.sys.entity.ActivityFeedback;
 import platform.modules.sys.entity.ActivityRegistration;
-import platform.modules.sys.service.*;
+import platform.modules.sys.service.ActivityFavouriteService;
+import platform.modules.sys.service.ActivityRegistrationService;
+import platform.modules.sys.service.ActivityService;
+import platform.modules.sys.service.WaitToDoService;
 import platform.modules.sys.web.ResponseMessage;
 
 import java.util.*;
@@ -43,9 +47,6 @@ public class ActivityOpenController extends BaseController {
     @Autowired
     private ActivityRegistrationService activityRegistrationService;
 
-    @Autowired
-    private ActivityFeedbackService activityFeedbackService;
-
     @Autowired
     private AttachmentService attachmentService;
 
@@ -105,26 +106,10 @@ 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, null);
-        if (!CollectionUtils.isEmpty(activityRegistrationList)) {
-            for (ActivityRegistration activityRegistration : activityRegistrationList) {
-                if (!Objects.equals("3", activityRegistration.getReview_state())) {
-                    return ResponseMessage.success("查询成功!", true);
-                }
-            }
-        }
-        return ResponseMessage.success("查询成功!", false);
-    }
-
-    /**
-     * 获取已报名的用户
-     *
-     * @return
-     */
-    @GetMapping(value = "/getRegUsers")
-    public ResponseMessage getRegUsers(String activity_id, String user_id) {
-        log.info("获取已报名的用户！");
-        return ResponseMessage.success("查询成功!", activityRegistrationService.getCurrRegUsers(activity_id, null, user_id));
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
+        if (CollectionUtils.isEmpty(activityRegistrationList))
+            return ResponseMessage.success("查询成功!", false);
+        return ResponseMessage.success("查询成功!", true);
     }
 
     /**
@@ -152,30 +137,24 @@ public class ActivityOpenController extends BaseController {
                 //已报名人数
                 registrationNumber = activityRegistrationService.getActivityRegistrationNumber(id);
                 if (registrationNumber >= Integer.parseInt(quota)) {
-                    return ResponseMessage.error("名额不足，仅剩" + (Integer.parseInt(quota) - registrationNumber) + "个名额，请修改人数！");
+                    return ResponseMessage.success("名额不足，仅剩" + (Integer.parseInt(quota) - registrationNumber) + "个名额，请修改人数！", false);
                 }
             }
         }
+
         List<ActivityRegistration> registrationList = paramRegistration.getRegistrationList();
         if (!org.apache.commons.collections.CollectionUtils.isEmpty(registrationList)) {
-            List<ActivityRegistration> registrations = activityRegistrationService.findByActivityIdAndUserIdAndPhones(id + "", registrationList.get(0).getUser_id() + "", registrationList);
-            if (!org.apache.commons.collections.CollectionUtils.isEmpty(registrations)) {
-                String phone = "";
-                for (ActivityRegistration registration : registrations) {
-                    phone += registration.getPhone() + " ";
-                }
-                return ResponseMessage.error("手机号码为:" + phone + "的用户已报名");
-            }
             for (ActivityRegistration registration : registrationList) {
-//                if (registration.getId() == null) {
-                activityRegistrationService.saveActivityRegistration(registration);
-//                }
+                if (registration.getId() == null) {
+                    activityRegistrationService.saveActivityRegistration(registration);
+                }
             }
             List<User> pusers = userService.findUsersByPermission("G_ACTIVITY_MANAGE");
             waitToDoService.completeAllTODO(activityDetail.getId(), Constant.DictionaryType.ACTIVITY_APPLICATION);
             for (User puser : pusers) {
                 waitToDoService.newTODO(activityDetail.getActivity_title() + "审核", "/government/activity/review/" + activityDetail.getId(), Constant.WaitToDo_OperType.AUDIT, activityDetail.getId(),
                         Constant.DictionaryType.ACTIVITY_APPLICATION, null, puser.getId().toString(), Constant.WaitToDo_IsSerial.IS_SERIAL, false);
+
             }
         }
         if (!Objects.equals(quota, null) && !Objects.equals(quota, "")) {
@@ -194,7 +173,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, null);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
         if (!CollectionUtils.isEmpty(activityRegistrationList)) {
             List<String> ids = new ArrayList<>();
             for (ActivityRegistration activityRegistration : activityRegistrationList) {
@@ -205,16 +184,6 @@ 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: 获取已报名
@@ -225,7 +194,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, null);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
         return ResponseMessage.success("查询成功!", activityRegistrationList);
     }
 
@@ -236,13 +205,14 @@ public class ActivityOpenController extends BaseController {
      * @Params: [id]
      * @Return: platform.modules.sys.web.ResponseMessage
      **/
-    @GetMapping(value = "/is_favourite")
-    public ResponseMessage isFavourite(@RequestParam("activity_id") String activityId, @RequestParam("user_id") String userId) throws Exception {
-
-        log.info("查询是否收藏！activity_id = {}", activityId);
-        ActivityFavourite activityFavourite = activityFavouriteService.selectByActivityIdAndUserId(activityId, userId);
-        if (Objects.equals(activityFavourite, null)) return ResponseMessage.success("查询成功!", false);
-        return ResponseMessage.success("查询成功!", true);
+    @GetMapping(value = "/is_favourite/{activity_id}")
+    public ResponseMessage isFavourite(@PathVariable("activity_id") int id) throws Exception {
+
+        log.info("查询是否收藏！activity_id = {}", id);
+        if (!ShiroUtils.isLogin()) return ResponseMessage.success("请先登录!", 2);
+        ActivityFavourite activityFavourite = activityFavouriteService.selectByActivityIdAndUserId(id + "", ShiroUtils.getUserId() + "");
+        if (Objects.equals(activityFavourite, null)) return ResponseMessage.success("查询成功!", 1);
+        return ResponseMessage.success("查询成功!", 0);
     }
 
     /**
@@ -256,6 +226,8 @@ public class ActivityOpenController extends BaseController {
     @PostMapping(value = "/add_favourite")
     public ResponseMessage addFavourite(@RequestBody ActivityFavourite activityFavourite) throws Exception {
 
+        if (!ShiroUtils.isLogin()) return ResponseMessage.success("请先登录!", 2);
+
         int count = activityFavouriteService.saveActivityFavourite(activityFavourite);
         if (count > 0) return ResponseMessage.success("收藏成功!");
         return ResponseMessage.success("收藏失败!");
@@ -269,10 +241,10 @@ public class ActivityOpenController extends BaseController {
      * @Return: platform.modules.sys.web.ResponseMessage
      **/
     @OperationLog(value = "取消收藏活动")
-    @DeleteMapping(value = "/remove_favourite")
-    public ResponseMessage removeFavourite(@RequestParam("activity_id") String activity_id, @RequestParam("user_id") String userId) throws Exception {
+    @DeleteMapping(value = "/remove_favourite/{activity_id}")
+    public ResponseMessage removeFavourite(@PathVariable("id") int id) throws Exception {
 
-        boolean b = activityFavouriteService.deleteByActivityIdAndUserId(activity_id, userId);
+        boolean b = activityFavouriteService.deleteByActivityIdAndUserId(id + "", ShiroUtils.getUserId() + "");
         if (b) return ResponseMessage.success("取消收藏成功!");
         return ResponseMessage.success("取消收藏失败!");
     }
@@ -310,17 +282,9 @@ public class ActivityOpenController extends BaseController {
     @PutMapping(value = "/sign")
     public ResponseMessage getByPhone(@RequestBody ActivityRegistration activityRegistration) {
 
-        activityRegistration.setReview_state("1");
-        ActivityRegistration activityRegistration1 = activityRegistrationService.findOne(activityRegistration);
-        if (activityRegistration1 != null) {
-            ActivityRegistration activityRegistration_n = new ActivityRegistration();
-            activityRegistration_n.setId(activityRegistration1.getId());
-            activityRegistration_n.setSign_state("0");
-            activityRegistration_n.setSign_time(new Date());
-            activityRegistrationService.updateSelective(activityRegistration_n);
-            return ResponseMessage.success("签到成功!");
-        }
-        return ResponseMessage.error("签到失败!");
+        activityRegistration.setSign_state("0");
+        activityRegistrationService.updateState(activityRegistration);
+        return ResponseMessage.success("签到成功!");
     }
 
     //根据手机号获取用户信息和企业信息
@@ -331,44 +295,15 @@ public class ActivityOpenController extends BaseController {
         Map<String, String> map = new HashMap<>();
         User user = userService.findByMobile(phone);
         if (user != null) {
-            map.put("user_id", user.getId() + "");
+            Company company = companyService.findById(user.getCompany_id());
             map.put("user_name", user.getUser_name());
             map.put("phone", user.getPhone());
             map.put("email", user.getEmail());
 
-            if (user.getCompany_id() != null) {
-                Company company = companyService.findById(user.getCompany_id());
-                map.put("company_name", company.getCompany_name());
-                map.put("industry_name", company.getIndustry_name());
-            }
+            map.put("company_name", company.getCompany_name());
+            map.put("industry_name", company.getIndustry_name());
         }
-        return ResponseMessage.success("查询成功!", map);
-    }
-
-    @OperationLog(value = "根据活动id获取最新的公开反馈评论信息")
-    @GetMapping(value = "/feedback/list")
-    public ResponseMessage feedbackList(@RequestParam("activity_id") String activityId, @RequestParam("min_score") String minScore, @RequestParam("max_score") String maxScore) {
-        List<ActivityFeedback> list = activityFeedbackService.feedbackList(activityId, "1", "1", minScore, maxScore);
-        return ResponseMessage.success("操作成功!", list);
-    }
-
-    @OperationLog(value = "根据活动id和用户id获取反馈评论信息")
-    @GetMapping(value = "/feedback")
-    public ResponseMessage feedbackGet(@RequestParam("activity_id") String activityId, @RequestParam("user_id") String userId) {
-        return ResponseMessage.success("操作成功!", activityFeedbackService.feedbackGet(activityId, userId));
-    }
-
-    @OperationLog(value = "新增反馈")
-    @PostMapping(value = "/feedback")
-    public ResponseMessage feedbackSave(@RequestBody ActivityFeedback activityFeedback) {
-        activityFeedback.setIs_view(false);
-        activityFeedback.setIs_top(false);
-        return ResponseMessage.success("操作成功!", activityFeedbackService.feedbackSave(activityFeedback));
-    }
 
-    @OperationLog(value = "获取各分数段人数")
-    @GetMapping(value = "/feedback/score_count")
-    public ResponseMessage feedbackScoreCount(@RequestParam("activity_id") String activityId) {
-        return ResponseMessage.success("操作成功!", activityFeedbackService.getScoreCount(activityId, "1", "1", null, null));
+        return ResponseMessage.success("查询成功!", map);
     }
 }

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

@@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo;
 import org.apache.catalina.Executor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.stereotype.Controller;
@@ -42,7 +41,6 @@ import platform.modules.request.ActivityFindRequest;
 import platform.modules.request.ContractReportFindRequest;
 import platform.modules.sys.entity.*;
 import platform.modules.sys.report.ActivityRegistrationExports;
-import platform.modules.sys.report.ActivitySignExports;
 import platform.modules.sys.report.ContractExport;
 import platform.modules.sys.service.*;
 import platform.modules.sys.web.ResponseMessage;
@@ -125,9 +123,10 @@ public class ActivityController extends BaseController {
      */
     @OperationLog(value = "查看活动详情")
     @GetMapping(value = "/get/{id}")
-    public String view(@PathVariable("id") Integer id, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, String minScore, String maxScore, ModelMap modelMap) throws Exception {
+    public String view(@PathVariable("id") Integer id, ModelMap modelMap) throws Exception {
         log.info("跳转到活动详情页面!");
 
+
         ActivityDetail activityDetail = activityService.findOne(id.toString());
         List<Attachment> attachments = attachmentService.selectByIdAndBusinessId(Constant.Attachment.ACTIVITY, activityDetail.getId(), null);
         if (null != attachments && attachments.size() > 0) {
@@ -176,17 +175,11 @@ public class ActivityController extends BaseController {
                 num++;
             }
         }
-        PageInfo<ActivityFeedback> feedbackPageInfo = activityFeedbackService.feedbackPage(id + "", minScore, maxScore, pageNum, PAGESIZE);
-        Map<String, Integer> scoreCount = activityFeedbackService.getScoreCount(id + "", null, null, null, null);
+
         modelMap.put("fileUrl", setFileUrl());
         modelMap.addAttribute("registrationList", registrationList);
         modelMap.addAttribute("signList", signList);
-//        modelMap.addAttribute("feedbackList", feedbackList);
-        modelMap.addAttribute("activity_id", id);
-        modelMap.addAttribute("pageInfo", feedbackPageInfo);
-        modelMap.addAttribute("scoreCount", scoreCount);
-        modelMap.addAttribute("minScore", minScore);
-        modelMap.addAttribute("maxScore", maxScore);
+        modelMap.addAttribute("feedbackList", feedbackList);
         modelMap.addAttribute("quota", quota);
         modelMap.addAttribute("num", num);
 
@@ -210,13 +203,13 @@ public class ActivityController extends BaseController {
     }
 
     /**
-     * 跳转到报名信息导出excel
+     * 跳转到导出excel
      *
      * @return
      */
     @OperationLog(value = "导出活动报名信息表")
-    @GetMapping(value = "/exportExcelRegistration")
-    public void exportExcelRegistration(HttpServletResponse response, ActivityFindRequest activityFindRequest) throws Exception {
+    @GetMapping(value = "/exportExcel")
+    public void exportExcel(HttpServletResponse response, ActivityFindRequest activityFindRequest) throws Exception {
         log.info("跳转到活动报名下载!");
         Integer id = activityFindRequest.getId();
         ActivityDetail activityDetail = activityService.findOne(id.toString());
@@ -242,48 +235,6 @@ public class ActivityController extends BaseController {
         new ExportExcel(activityDetail.getActivity_title() + "报名信息表", ActivityRegistrationExports.class).setDataList(registrationList).write(response, fileName).dispose();
     }
 
-    /**
-     * 跳转到签到信息导出excel
-     *
-     * @return
-     */
-    @OperationLog(value = "导出活动签到信息表")
-    @GetMapping(value = "/exportExcelSign")
-    public void exportExcelSign(HttpServletResponse response, ActivityFindRequest activityFindRequest) throws Exception {
-
-        log.info("跳转到活动报名下载!");
-        Integer id = activityFindRequest.getId();
-        ActivityDetail activityDetail = activityService.findOne(id.toString());
-        String fileName = activityDetail.getActivity_title() + "签到信息表.xlsx";
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.findSginList(id);
-        List<ActivitySignExports> signList = new ArrayList<>();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        for (ActivityRegistration activityRegistration : activityRegistrationList) {
-
-            ActivitySignExports activitySignExports = new ActivitySignExports();
-            BeanUtils.copyProperties(activityRegistration, activitySignExports);
-
-            if (activityRegistration.getRegistration_time() != null)
-                activitySignExports.setRegistration_time(sdf.format(activityRegistration.getRegistration_time()));
-
-            if (activityRegistration.getSign_time() != null)
-                activitySignExports.setSign_time(sdf.format(activityRegistration.getSign_time()));
-
-
-            if (StringUtils.isBlank(activitySignExports.getSign_state())) {
-                activitySignExports.setSign_state("待确认");
-            }
-            if (Objects.equals(activitySignExports.getSign_state(), "0")) {
-                activitySignExports.setSign_state("已签到");
-            }
-            if (Objects.equals(activitySignExports.getSign_state(), "1")) {
-                activitySignExports.setSign_state("未参加");
-            }
-            signList.add(activitySignExports);
-        }
-        new ExportExcel(activityDetail.getActivity_title() + "签到信息表", ActivitySignExports.class).setDataList(signList).write(response, fileName).dispose();
-    }
-
     /**
      * 跳转到详情页面
      *
@@ -878,7 +829,6 @@ public class ActivityController extends BaseController {
         ActivityRegistration activityRegistration = new ActivityRegistration();
         activityRegistration.setId(Integer.parseInt(id));
         activityRegistration.setSign_state(state);
-        activityRegistration.setSign_time(new Date());
         return ResponseMessage.success("操作成功", activityRegistrationService.updateState(activityRegistration));
     }
 
@@ -888,7 +838,6 @@ public class ActivityController extends BaseController {
         log.info("批量更新活动签到状态");
         ActivityRegistration activityRegistration = new ActivityRegistration();
         activityRegistration.setSign_state(state);
-        activityRegistration.setSign_time(new Date());
 
         String[] idsArr = ids.split(",");
 
@@ -1044,11 +993,11 @@ public class ActivityController extends BaseController {
         log.info("跳转到活动二维码!");
 
         try {
-            InputStream is_detail = activityService.getQRcode("1", "350", id);
+            InputStream is_detail = activityService.getQRcode("1", "350", "activity_id=" + id);
             byte[] bytes_detail = IOUtils.toByteArray(is_detail);
             String encoded_detail = Base64.getEncoder().encodeToString(bytes_detail);
 
-            InputStream is_sign = activityService.getQRcode("2", "350", id);
+            InputStream is_sign = activityService.getQRcode("2", "350", "activity_id=" + id);
             byte[] bytes_sign = IOUtils.toByteArray(is_sign);
             String encoded_sign = Base64.getEncoder().encodeToString(bytes_sign);
 
@@ -1114,10 +1063,10 @@ public class ActivityController extends BaseController {
         String name = "";
         if ("1".equals(type)) {
             name = "报名二维码.jpg";
-            is = activityService.getQRcode(type, "430", id);
+            is = activityService.getQRcode(type, "430", "activity_id=" + id);
         } else if ("2".equals(type)) {
             name = "签到二维码.jpg";
-            is = activityService.getQRcode(type, "430", id);
+            is = activityService.getQRcode(type, "430", "activity_id=" + id);
         }
         name = new String(name.getBytes(), "ISO-8859-1");
         response.setHeader("Content-type", "application/octet-stream");
@@ -1127,32 +1076,5 @@ public class ActivityController extends BaseController {
         is.close();
         os.close();
     }
-
-    /**
-     * 跳转到地图
-     *
-     * @return
-     * @throws Exception
-     */
-    @GetMapping(value = "/map")
-    public String toMap() {
-        log.info("跳转到地图!");
-
-        return BASE_GOVERNMENT_PATH + "map_component/map";
-    }
-
-    /**
-     * 跳转到回复反馈
-     *
-     * @return
-     * @throws Exception
-     */
-    @GetMapping(value = "/reply/{id}")
-    public String toReplyDialog(@PathVariable("id") String feedbackId, ModelMap modelMap) {
-        log.info("跳转到回复反馈!");
-        ActivityFeedback feedback = activityFeedbackService.findById(Integer.parseInt(feedbackId));
-        modelMap.addAttribute("feedback", feedback);
-        return BASE_GOVERNMENT_PATH + "activity_reply";
-    }
 }
 

src/main/java/platform/modules/home/service/HomeRefactorService.java

@@ -3,6 +3,7 @@ package platform.modules.home.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.models.auth.In;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +24,12 @@ import platform.modules.sys.entity.ActivityReview;
 import platform.modules.sys.service.*;
 import platform.modules.sys.web.ResponseMessage;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 /**
@@ -136,10 +140,10 @@ public class HomeRefactorService {
      * @return
      */
     public ResponseMessage findProjectDetail(Integer id, Integer isFilling) {
-        if (isFilling == 0){
+        if (isFilling == 0) {
             //项目申报
             ProjectDeclaration project = projectDeclarationService.selectById(String.valueOf(id));
-            if (project != null){
+            if (project != null) {
                 String sourceName = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.PROJECT_SOURCE, project.getProject_source());
                 project.setProject_source_name(sourceName);
                 project.setProject_content(StringEscapeUtils.unescapeHtml4(project.getProject_content()));
@@ -160,7 +164,7 @@ public class HomeRefactorService {
                 projectDeclarationService.updateSelective(project);
             }
             return ResponseMessage.success("success", project);
-        } else if (isFilling == 1){
+        } else if (isFilling == 1) {
             ProjectProvincesDeclaration provinces = projectProvincesDeclarationService.selectById(String.valueOf(id));
             if (null != provinces) {
                 String sourceName = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.PROJECT_SOURCE, provinces.getProject_source());
@@ -224,27 +228,35 @@ public class HomeRefactorService {
             // 综合星级
             activity.setAvg_star(activityFeedbackService.findAvgStar(id));
             //是否收藏
-            if (isFavourited(id, user_id)){
+            if (isFavourited(id, user_id)) {
                 activity.setIs_favourited("1");
-            }
-            else {
+            } else {
                 activity.setIs_favourited("0");
             }
             //浏览数+1
             activity.setReading_number(activity.getReading_number() + 1);
             activityService.updateSelective(activity);
         }
+        InputStream is_detail = activityService.getQRcode("1", "350", "activity_id=" + id);
+        try {
+            byte[] bytes_detail = IOUtils.toByteArray(is_detail);
+            String encoded_detail = Base64.getEncoder().encodeToString(bytes_detail);
+            activity.setQr_code("data:image/jpg;base64," + encoded_detail);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         return activity;
     }
 
     /**
      * 活动是否收藏
+     *
      * @param id
      * @return
      */
-    public boolean isFavourited(Integer id, Integer user_id){
+    public boolean isFavourited(Integer id, Integer user_id) {
         ActivityFavourite activityFavourite = activityFavouriteService.selectByActivityIdAndUserId(id + "", user_id + "");
-        if (activityFavourite != null){
+        if (activityFavourite != null) {
             return true;
         }
         return false;

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

@@ -56,6 +56,9 @@ public class ActivityDetail extends BaseEntity {
     @Transient
     private int registration_number;
 
+    @Transient
+    private int registration_pass_number;
+
     @Transient
     private int registration_success_number;
 
@@ -147,5 +150,6 @@ public class ActivityDetail extends BaseEntity {
     private String activity_type_status;
     @Transient
     List<Integer> regUsers;
-
+    @Transient
+    private String qr_code;
 }

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

@@ -22,6 +22,8 @@ public class ActivityRegistration extends BaseEntity {
 
     private String industry_name;
 
+    private Integer gender;
+
     private String name;
 
     private String phone;
@@ -36,8 +38,6 @@ public class ActivityRegistration extends BaseEntity {
 
     private String review_state;
 
-    private Date sign_time;
-
     private String sign_state;
 
     private String relation_id;

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

@@ -80,10 +80,9 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         //已报名人数
         int registrationNumber = getActivityRegistrationNumber(activityRegistration.getActivity_id());
         User currUser = new User();
-        if (activityRegistration.getUser_id() != null && !activityRegistration.getUser_id().equals("")){
+        if (activityRegistration.getUser_id() != null && !activityRegistration.getUser_id().equals("")) {
             currUser = userService.findById(activityRegistration.getUser_id());
-        }
-        else {
+        } else {
             currUser = ShiroUtils.getUserEntity();
         }
         activityRegistration.setUser_id(currUser.getId());
@@ -91,12 +90,12 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         if (Objects.equals(Constant.UserType.GOVERNMENT, currUser.getUser_type())) {
             activityRegistration.setRelation_id("0");
         } else if (Objects.equals(Constant.UserType.BUILD, currUser.getUser_type())) {
-            activityRegistration.setRelation_id(currUser.getBuild_id()+ "");
+            activityRegistration.setRelation_id(currUser.getBuild_id() + "");
         } else if (Objects.equals(Constant.UserType.STREET, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getStreet_id() + "");
         } else if (Objects.equals(Constant.UserType.COMPANY, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getCompany_id() + "");
-        }else if (Objects.equals(Constant.UserType.PERSONAL, currUser.getUser_type())) {
+        } else if (Objects.equals(Constant.UserType.PERSONAL, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getId() + "");
         } else {
             activityRegistration.setUser_type("6");// 没有账号
@@ -270,12 +269,36 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             relationId = ShiroUtils.getStreetId().toString();
         } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
             relationId = ShiroUtils.getCompanyId().toString();
-        }else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
+        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
             relationId = ShiroUtils.getUserId().toString();
         }
         return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
     }
 
+    /**
+     * 获取当前账户所在单位已报名的
+     *
+     * @return
+     */
+    public List<ActivityRegistration> getCurrRegUsers(String activity_id, String phone) {
+
+        User user = userService.findByMobile(phone);
+        Integer userType = user.getUser_type();
+        String relationId = "";
+        if (Objects.equals(Constant.UserType.GOVERNMENT, userType)) {
+            relationId = "0";
+        } else if (Objects.equals(Constant.UserType.BUILD, userType)) {
+            relationId = user.getBuild_id().toString();
+        } else if (Objects.equals(Constant.UserType.STREET, userType)) {
+            relationId = user.getStreet_id().toString();
+        } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
+            relationId = user.getCompany_id().toString();
+        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
+            relationId = user.getId().toString();
+        }
+        return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
+    }
+
     /**
      * 获取当前账户所在单位已报名的
      *
@@ -295,7 +318,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             relationId = user.getStreet_id().toString();
         } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
             relationId = user.getCompany_id().toString();
-        }else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
+        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
             relationId = user.getId().toString();
         }
         return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
@@ -303,41 +326,41 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
 
     public Boolean sendActivityAbortSMS(ActivityDetail activity, List<ActivityRegistration> registrations) {
         //您报名的活动：${activity_title} 已取消。具体信息请登录PC端查看。感谢您的支持。
-    	try {
-    		if (null != registrations && registrations.size() > 0) {
+        try {
+            if (null != registrations && registrations.size() > 0) {
                 for (ActivityRegistration registration : registrations) {
                     String phone = registration.getPhone();
-                    if(StringUtils.isNotBlank(phone)) {
+                    if (StringUtils.isNotBlank(phone)) {
                         String activity_title = activity.getActivity_title();
                         String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
                         AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_ABORT, "企业提升发展服务平台", templateParam);
                     }
                 }
             }
-    		return true;
-    	}catch(Exception e) {
-    		e.printStackTrace();
-    		return false;
-    	}
-        
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
     }
 
-    public Boolean sendActivityUpdateSMS(ActivityDetail activity, List<ActivityRegistration> registrations){
+    public Boolean sendActivityUpdateSMS(ActivityDetail activity, List<ActivityRegistration> registrations) {
         //您报名的活动：${activity_title} 活动内容有变更。具体信息请登录PC端查看。感谢您的支持。
-    	try {
-	        if (null != registrations && registrations.size() > 0) {
-	            for (ActivityRegistration registration : registrations) {
-	                String phone = registration.getPhone();
-	                String activity_title = activity.getActivity_title();
-	                String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
-	                AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_UPDATE, "企业提升发展服务平台", templateParam);
-	            }
-	        }
-	        return true;
-        }catch(Exception e) {
-    		e.printStackTrace();
-    		return false;
-    	}
+        try {
+            if (null != registrations && registrations.size() > 0) {
+                for (ActivityRegistration registration : registrations) {
+                    String phone = registration.getPhone();
+                    String activity_title = activity.getActivity_title();
+                    String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
+                    AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_UPDATE, "企业提升发展服务平台", templateParam);
+                }
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     /**
@@ -357,7 +380,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      * @return
      */
     public List<ActivityRegistration> getActivityRegistration(Integer activityId, int userId) {
-        return  activityRegistrationDao.getActivityRegistration(activityId, userId);
+        return activityRegistrationDao.getActivityRegistration(activityId, userId);
     }
 
     /**
@@ -383,9 +406,9 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      * @param type
      * @return
      */
-    public List<ActivityDetail> findTypesActivitys(String type, Integer userId){
+    public List<ActivityDetail> findTypesActivitys(String type, Integer userId) {
         List<ActivityDetail> statistics = new ArrayList<>();
-        switch (type){
+        switch (type) {
             case "pending"://待参加
                 statistics = activityRegistrationDao.findPendingActivity(userId);
                 break;
@@ -413,10 +436,9 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
                 activity.setFileDown(fileDown);
             }
             //是否收藏
-            if (homeRefactorService.isFavourited(activity.getId(), userId)){
+            if (homeRefactorService.isFavourited(activity.getId(), userId)) {
                 activity.setIs_favourited("1");
-            }
-            else {
+            } else {
                 activity.setIs_favourited("0");
             }
             //活动回顾

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

@@ -1,5 +1,6 @@
 package platform.modules.sys.service;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
@@ -14,10 +15,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.util.AlibabaSMSUtil;
-import platform.common.util.DateUtil;
-import platform.common.util.ShiroUtils;
-import platform.common.util.WebUtil;
+import platform.common.util.*;
 import platform.modules.build.entity.BuildInfo;
 import platform.modules.government.dao.AttachmentDao;
 import platform.modules.government.dto.*;
@@ -36,6 +34,8 @@ import platform.modules.sys.entity.ActivityPush;
 import platform.modules.sys.entity.ActivityRegistration;
 import tk.mybatis.mapper.entity.Example;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -479,18 +479,18 @@ public class ActivityService extends BaseService<ActivityDetail> {
         List<ActivityDetail> dates = activityDetailDao.getEventList(start1, start2, null, ShiroUtils.getUserId());
         return dates;
     }
-    
+
     public Integer getAllActivityCount() {
         int count = activityDetailDao.getAllActivityCount();
         return count;
     }
-    
+
     public Integer getJoinedActivityCount() {
-    	SearchCondition condition = new SearchCondition();
-    	if(ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
-			condition.setUser_type(Constant.UserType.STREET);
-			condition.setStreet_id(ShiroUtils.getStreetId());
-		}
+        SearchCondition condition = new SearchCondition();
+        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+            condition.setUser_type(Constant.UserType.STREET);
+            condition.setStreet_id(ShiroUtils.getStreetId());
+        }
         int count = activityDetailDao.getJoinedActivityCount(condition);
         return count;
     }
@@ -516,19 +516,17 @@ public class ActivityService extends BaseService<ActivityDetail> {
                     FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), request.getFile_url());
                     ad.setFileDown(fileDown);
                 }
-                if (ad.getActivity_deadline() != null){
+                if (ad.getActivity_deadline() != null) {
                     LocalDateTime deadline = LocalDateTime.parse(ad.getActivity_deadline(), formatter);
-                    if (!deadline.isBefore(LocalDateTime.now())){
+                    if (!deadline.isBefore(LocalDateTime.now())) {
                         ad.setCan_sign_up(true);
                     }
-                }
-                else {
+                } else {
                     ad.setCan_sign_up(true);
                 }
-                if (homeRefactorService.isFavourited(ad.getId(), request.getUser_id())){
+                if (homeRefactorService.isFavourited(ad.getId(), request.getUser_id())) {
                     ad.setIs_favourited("1");
-                }
-                else {
+                } else {
                     ad.setIs_favourited("0");
                 }
             }
@@ -538,6 +536,7 @@ public class ActivityService extends BaseService<ActivityDetail> {
 
     /**
      * 获取已结束的活动列表
+     *
      * @param condition
      * @return
      */
@@ -582,7 +581,7 @@ public class ActivityService extends BaseService<ActivityDetail> {
 //        ActivityDetail detail = this.findById(id);
         ActivityDetail detail = activityDetailDao.findByActivityId(id);
 
-        PageHelper.startPage(pageNum,5);
+        PageHelper.startPage(pageNum, 5);
         List<ActivityRegistration> registrations =
                 activityRegistrationService.getActivityRegistration(id, ShiroUtils.getUserId());
         ActivityOrderDetail orderDetail = new ActivityOrderDetail();
@@ -607,9 +606,9 @@ public class ActivityService extends BaseService<ActivityDetail> {
     /**
      * 强烈推荐
      *
-     * @return
      * @param pageNum
      * @param pageSize
+     * @return
      */
     public PageInfo<ActivityDetail> findHighlyRecommended(Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
@@ -624,5 +623,35 @@ public class ActivityService extends BaseService<ActivityDetail> {
         }
         return new PageInfo<>(highlyRecommendedList);
     }
+
+    /**
+     * @Author: huZhiHao
+     * @Description: 获取二维码 1 详情 2 签到
+     * @Date: 2019/12/19
+     * @Params: [accessToken, type, width, scene]
+     * @Return: java.io.InputStream
+     **/
+    public InputStream getQRcode(String type, String width, String scene) {
+
+        String access_token = JSON.parseObject(WxAppUtil.getAccessToken(APP_ID, APP_SERCRET)).getString("access_token");
+        String path = "";
+        InputStream is = null;
+        try {
+            if (Objects.equals("1", type)) {
+                path = ACTIVITY_PAGE_PATH_DETAIL;
+            } else if (Objects.equals("2", type)) {
+                path = ACTIVITY_PAGE_PATH_SIGN;
+            }
+            is = WxAppUtil.getUnlimitedQRCode(access_token, path, width, scene);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return is;
+    }
+
+    private static String APP_ID = "wx3007d6086b29908c";
+    private static String APP_SERCRET = "68245dbd037f7516bcbe0eeafc1e01a9";
+    private static String ACTIVITY_PAGE_PATH_DETAIL = "/pages/index/index";
+    private static String ACTIVITY_PAGE_PATH_SIGN = "/pages/index/index";
 }
 

src/main/resources/application.yml

@@ -15,12 +15,12 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-#    active: dev
+    active: dev
 #    active: test
 #    active: aliyun
 #    active: vpn
 #    active: prod_in
-    active: prod_out
+#    active: prod_out
 #    active: prod_test
 
   #数据源

src/main/resources/mapper/company/StockLandDao.xml

@@ -38,7 +38,7 @@
 				or
 				nextChecker LIKE CONCAT(CONCAT('%,',#{condition.userId}), ',%')
 			)
-
+			
 			and g.create_time in (select max(CREATE_TIME)from z_approval where del_flag=0 group by APPLY_ID )
 		and a.approve_status in
 			<foreach collection="condition.apply_status" index="index" item="item" open="(" separator="," close=")">
@@ -139,9 +139,9 @@
 				)
 			)
 		</if>
-
+		
 		order by create_time desc
-
+		
 	</select>
 
 
@@ -171,7 +171,7 @@
 			approve_status_name,
 			overTime,
 			update_time
-
+			
 		from (
 		SELECT
 			a.id,
@@ -187,6 +187,7 @@
 			d.NAME AS approve_status_name,
 			g.CHECKER,
 			g.DEAL_TIME as deal_time,
+
 			hour(timediff(date_add(IFNULL(a.update_time,a.create_time),interval 5 day),NOW())) as overTime
 		FROM
 			c_stock_land_apply a
@@ -215,14 +216,14 @@
 					)
 				</if>
 			)
-
+			
 			<if test="condition.applyUserType!=null and condition.applyUserType!=''">
 				and zUser.user_type = #{condition.applyUserType}
 			</if>
-
+			
 			and g.del_flag = 0
-			) q
-			WHERE 1=1
+			)q
+			WHERE 1=1 
 		<if test="condition.approve_status != null and condition.approve_status!=''">
 			and q.approve_status=#{condition.approve_status}
 		</if>
@@ -274,10 +275,10 @@
 		LEFT JOIN z_user zUser on zUser.id = a.create_by
 		WHERE
 		a.del_flag = '0'
-		AND
+		AND 
 			type.id = #{stockLandId} and type2.id=#{approvedId}
 		AND
-			a.approve_status in
+			a.approve_status in 
 			<foreach collection="statusList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
@@ -305,13 +306,13 @@
 					(
 						select temp.maxTime from (select APPLY_ID,max(CREATE_TIME) maxTime
 						from z_approval
-
+						
 						GROUP BY APPLY_ID
 						) temp	)
 				)
 order by a.create_time desc
 	</select>
-
+	
 	<!-- 查询所有审核状态下的列表 -->
 	<select id="findSelectPage" resultType="platform.modules.company.entity.StockLand">
 		SELECT DISTINCT
@@ -436,91 +437,4 @@ order by a.create_time desc
 			<![CDATA[ and DATE_FORMAT(sla.create_time, '%Y-%m-%d')<=  DATE_FORMAT(#{condition.end_date}, '%Y-%m-%d')   ]]>
 		</if>
 	</select>
-
-	<!-- 所有存量用地数据 -->
-	<select id="findListByStreetId" resultType="platform.modules.company.dto.StockLandStatistic">
-		SELECT
-			stockland.id,
-			stockland.street_id,
-			stockland.apply_type,
-			stockland.apply_status,
-			stockland.approve_status,
-			stockland.process_status,
-			zuser.user_type AS apply_user_type,
-			t.approval_round
-		FROM
-			c_stock_land_apply stockland
-		LEFT JOIN z_user zuser ON zuser.id = stockland.create_by
-		LEFT JOIN (
-			SELECT
-				APPLY_ID,
-				max( APPROVAL_ROUND ) APPROVAL_ROUND,
-				max( id ) AS id
-			FROM
-				z_approval
-			WHERE
-				type = "存量用地"
-			AND del_flag = 0
-			AND is_withdraw IS NULL
-			GROUP BY
-				APPLY_ID
-		) t ON t.APPLY_ID = stockland.id
-		WHERE
-			stockland.del_flag = '0'
-		<if test="street_id != null and street_id != ''">
-			AND stockland.street_id = #{street_id}
-		</if>
-		<if test="apply_user_type!=null and apply_user_type!=''">
-			AND zuser.user_type = #{apply_user_type}
-		</if>
-	</select>
-
-	<!-- 获取除待提交外的申请 -->
-	<select id="findListByStreetIdAndTime" resultType="platform.modules.company.dto.StockLandStatistic">
-		SELECT
-			stockland.id,
-			stockland.street_id,
-			stockland.apply_type,
-			stockland.apply_status,
-			stockland.approve_status,
-			stockland.process_status,
-			stockland.summary_procedure,
-			stockland.create_time
-		FROM
-			c_stock_land_apply stockland
-		WHERE
-			stockland.del_flag = '0'
-		AND stockland.apply_status != 0
-		<if test="street_id != null and street_id != ''">
-			AND stockland.street_id = #{street_id}
-		</if>
-		<if test="start_time != null and start_time != ''">
-			AND stockland.create_time <![CDATA[>=]]> #{start_time}
-		</if>
-		<if test="end_time != null and end_time != ''">
-			AND stockland.create_time <![CDATA[<=]]> #{end_time}
-		</if>
-	</select>
-
-
-	<update id="updateEasyProcessData" >
-UPDATE c_stock_land_apply
-SET approve_status = "80",
-apply_status = 3,
-update_by = 0,
-update_name = "sql",
-update_time = CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME )
-WHERE
-	apply_no in
-		<foreach collection="applyNoList" index="index" item="item" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-	</update>
-
-	<insert id="insertAutoEasyProcessDataToStockLand" >
-	INSERT INTO `z_approval`
-	(`APPLY_ID`,   `TYPE`,   `DEPARTMENT`, `BEFORE_APPROVALSTATUS`, `AFTER_APPROVALSTATUS`, `CHECKER`, `NEXTCHECKER`, `APPROVAL_COMMENT`, `APPROVAL_ROUND`,               `CREATE_TIME`,                         `CREATE_BY`,   `UPDATE_TIME`,                                  `UPDATE_BY`, `DEAL_TIME`,       `STATUS`,        `DEL_FLAG`, `ACTION_FLAG`, `TRANS_FLAG`, `REMARK`, `OPER_TYPE`,  `PRO_INSTANCE_ID`, `CREATE_NAME`, `UPDATE_NAME`, `IS_WITHDRAW`, `CAN_WITHDRAW`)
-	VALUES (#{applyid}, '存量用地', '企业服务处',     '2',                    '14',                    140,        '',         '做简易流程处理',        1,                CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),       140,         CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),            NULL,       NULL,       0,                   0,           NULL,       NULL,        '通过',     '通过',       null,            '张磊',         "sql",            null,       NULL)
-	,(#{applyid}, '存量用地',     '企业服务处',         '14',                      '80',                    140,         '',        '审核通过',             1,             CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ), '140',     CONCAT_WS( " ", CURRENT_DATE, CURRENT_TIME ),       NULL,       NULL,               0,             0,                NULL,        NULL,     NULL,     '通过',       null,              '张磊',       "sql",          NULL,            NULL)
-	</insert>
 </mapper>

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

@@ -265,7 +265,8 @@
         FROM
             ac_activity_registration reg
         WHERE
-            reg.user_type = #{type}
+            reg.del_flag = 0
+        and reg.user_type = #{type}
         and reg.relation_id =#{rel}
         and reg.activity_id =#{activity_id}
         ORDER BY

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

@@ -21,15 +21,10 @@ function editActivity(title, url, w, h) {
 
 /*详情*/
 function activityDetail(title, url, w, h) {
-    removeTabFlag();
     var index = layer_show(title, pagePath + url, w, h);
     layer.full(index);
 }
 
-function removeTabFlag() {
-    sessionStorage.removeItem("tabIndex");
-}
-
 /*审核*/
 function activityReview(title, url, w, h) {
     var index = layer_show(title, pagePath + url, w, h);