From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 2ddd1b3..eeaeb70 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -86,6 +86,8 @@
     public ComEldersAuthUserService comEldersAuthUserService;
     @Resource
     private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
+    @Resource
+    private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
 
     /**
      * 新增社区活动
@@ -273,7 +275,7 @@
         }
         ActivitySignVO activitySignVO = new ActivitySignVO();
         activitySignVO.setActivityId(id);
-        R r = comActActivityService.listActivitySign(activitySignVO);
+        R r = comActActivityService.listActivitySigns(activitySignVO);
         if (R.isOk(r)) {
             List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
             if (!ObjectUtils.isEmpty(activitySignVOS)) {
@@ -308,7 +310,7 @@
     }
 
     /**
-     * 活动报名名单
+     * 分页活动报名名单
      *
      * @param activitySignVO 查询参数
      * @return 报名人员集合
@@ -316,6 +318,17 @@
     @PostMapping("listactivitysign")
     public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
         return comActActivityService.listActivitySign(activitySignVO);
+    }
+
+    /**
+     * 活动报名名单
+     *
+     * @param activitySignVO 查询参数
+     * @return 报名人员集合
+     */
+    @PostMapping("listactivitysigns")
+    public R listActivitySigns(@RequestBody ActivitySignVO activitySignVO) {
+        return comActActivityService.listActivitySigns(activitySignVO);
     }
 
     /**
@@ -553,6 +566,15 @@
     @PostMapping("addeasyphoto")
     public R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
         return comActEasyPhotoService.addEasyPhoto(comActEasyPhotoVO);
+    }
+
+    /**
+     * 查询随手拍是否有活动
+     * @return  活动详情
+     */
+    @PostMapping("getEasyPhotoActivity")
+    public R getEasyPhotoActivity(@RequestParam("communityId") Long communityId) {
+        return comActEasyPhotoActivityService.getEasyPhotoActivity(communityId);
     }
 
     /**
@@ -1578,11 +1600,18 @@
     }
 
     @PostMapping("/eldersauth/addByFamilyUser")
+    @Transactional(rollbackFor = Exception.class)
     R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
 
         ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
         if(authUserDO == null){
             return R.fail("未查询到老人信息");
+        }
+
+        Long elderId = authUserDO.getId();
+        boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
+        if(!canReAuthThisMonth){
+            return R.fail("当月已认证，不能再次进行认证");
         }
 
         String idCard = authUserDO.getIdCard();
@@ -1609,6 +1638,15 @@
         eldersAuthDO.setBirthDay(birthDay);
         int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
         if(add==1){
+            //设置认证成功
+            Long familyUserId = eldersAuthDO.getFamilyUserId();
+            ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
+            comEldersAuthUserDO.setId(familyUserId);
+            comEldersAuthUserDO.setIsAuth(1);
+            boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
+            if(!updated){
+                throw  new ServiceException("添加认证失败，更新认证状态");
+            }
             //认证成功  添加认证记录
             List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
                     .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
@@ -1685,4 +1723,32 @@
     R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
         return eldersAuthService.setCommunityAuthType(communityId, type);
     }
+
+    /**
+     * 随手拍活动定时任务
+     * @return  执行结果
+     */
+    @PostMapping("timeTaskEasyPhotoActivity")
+    public R timeTaskEasyPhotoActivity(){
+        return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
+    }
+
+    /**
+     * 社区随手拍列表统计
+     * @param communityId   社区id
+     * @return  统计结果
+     */
+    @GetMapping("easyphoto/statistics")
+    public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
+        return comActEasyPhotoService.easyPhotoStatistics(communityId);
+    }
+
+    /**
+     * 综治后台-查询社区列表
+     * @return  社区列表
+     */
+    @GetMapping("/eventgrid/community/list")
+    public R getCommunityLists(){
+        return comActService.getCommunityLists();
+    }
 }

--
Gitblit v1.7.1