Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -821,7 +821,7 @@ public class AppUserServiceImpl implements AppUserService {
         tokenDto.setNickname(user.getNickname());
         tokenDto.setMobile(user.getMobile());
         tokenDto.setPartyFlag(user.getPartyFlag());
-        EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState());
+        EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState());
 
         // 更新社群用户党员标识并加入关联的所有网格党员群
         if (NumConstant.ONE_STR.equals(user.getPartyFlag())) {

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java

@@ -50,7 +50,7 @@ public interface EventsNoticeConstant {
     /**
      * 议题反对
      */
-    String NOTICE_ISSUE_OPPOSE = "你的议题【有新的反对】";
+    String NOTICE_ISSUE_OPPOSE = "你的议题【有新的不支持】";
     /**
      * 项目支持
      */
@@ -58,7 +58,7 @@ public interface EventsNoticeConstant {
     /**
      * 项目反对
      */
-    String NOTICE_ITEM_OPPOSE = "你的项目【有新的反对】";
+    String NOTICE_ITEM_OPPOSE = "你的项目【有新的不支持】";
     /**
      * 评论支持
      */
@@ -66,7 +66,7 @@ public interface EventsNoticeConstant {
     /**
      * 评论反对
      */
-    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的反对】";
+    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】";
     /**
      * 项目被评论
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java

@@ -205,7 +205,7 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl<EventCo
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_COMMENT_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE_COMMENT_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
             }
         } else {
             // 项目
@@ -219,7 +219,7 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl<EventCo
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_COMMENT_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM_COMMENT_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
             }
         }
         // 发送消息

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java

@@ -214,7 +214,7 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_ISSUE_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的议题");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的议题");
             }
         } else {
             // 项目
@@ -230,7 +230,7 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的项目");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的项目");
             }
         }
         // 发送消息

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -186,7 +186,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         informationFormDTO.setUserId(entity.getUserId());
         informationFormDTO.setContent(dto.getAdvice());
         informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_PROGRESS_NOTICE);
-        informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM);
+        informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE);
         informationFormDTO.setBusinessId(entity.getId());
         informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent());
 
@@ -207,6 +207,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             // 转项目
             if (EventIssueItemState.ISSUE_CHANGE_TO_ITEM == dto.getState()) {
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_CHANGE_TO_ITEM);
+                informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM);
                 // 插入项目表
                 ItemEntity itemEntity = initItemEntity(entity);
                 itemService.insert(itemEntity);

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java

@@ -22,7 +22,7 @@ public interface GroupNoticeConstant {
     /**
      * 社群解散
      */
-    String NOTICE_GROUP_DISBAND = "您加入的社群已被解散";
+    String NOTICE_GROUP_DISBAND = "您所在的社群已被解散";
 
     /**
      * 删除社群成员

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java

@@ -21,7 +21,7 @@ public interface TopicNoticeConstant {
     /**
      * 评论反对
      */
-    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的反对】";
+    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】";
 
 
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java

@@ -150,7 +150,7 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
                     // 反对
                     informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_COMMENT_OPPOSE);
                     informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_OPPOSE);
-                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
                 }
 
             }else {

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java

@@ -69,6 +69,20 @@ public class AppGroupController {
         return groupService.saveGroup(groupCreateFormDto);
     }
 
+    /**
+     *
+     * 批量创建网格党员群
+     *
+     * @params [depts]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/12/19 9:42
+     */
+    @PostMapping("createPartys")
+    public Result createPartyGroups(@RequestBody List<CompleteDeptDTO> depts) {
+        return groupService.savePartyGroups(depts);
+    }
+
     /**
      *
      * 解散社群

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.group.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.group.*;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
@@ -272,4 +273,15 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     Result joinGridPartyGroup(GroupUserFormDTO formDto);
 
+    /**
+     *
+     * 批量生成网格党员群
+     *
+     * @params [deptList]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/12/19 9:34
+     */
+    Result savePartyGroups(List<CompleteDeptDTO> deptList);
+
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.group.*;
@@ -196,8 +198,9 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
                     for (GroupUserListResultDTO usersDTO:
                             userListResultDTOS) {
                         if (!usersDTO.getUserId().equals(dto.getUserId())) {
-                            informationFormDTO.setUserId(usersDTO.getUserId());
-                            newsTask.insertUserInformation(informationFormDTO);
+                            EpdcInformationFormDTO notice = ConvertUtils.sourceToTarget(informationFormDTO, EpdcInformationFormDTO.class);
+                            notice.setUserId(usersDTO.getUserId());
+                            newsTask.insertUserInformation(notice);
                         }
                     }
                 }
@@ -374,4 +377,20 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
         return new Result();
     }
+
+    @Override
+    public Result savePartyGroups(List<CompleteDeptDTO> deptList) {
+        for (CompleteDeptDTO dept:
+                deptList) {
+            GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(dept, GroupCreateFormDTO.class);
+            groupCreateFormDto.setGroupName(dept.getCommunity().concat(dept.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX));
+            groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR);
+            groupCreateFormDto.setGroupIntroduction(dept.getStreet().concat(dept.getCommunity()).concat(dept.getGrid()));
+            groupCreateFormDto.setGroupCategory(NumConstant.ZERO_STR);
+            groupCreateFormDto.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
+            this.saveGroup(groupCreateFormDto);
+        }
+
+        return new Result();
+    }
 }

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -213,7 +213,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
 
             // 获取群主信息
             UserGroupDTO userGroupDto = userGroupService.getLordInfoByGroupId(resultDto.getGroupId());
-            if (formDto.getUserId().equals(userGroupDto.getUserId())) {
+            if (null != userGroupDto && formDto.getUserId().equals(userGroupDto.getUserId())) {
                 resultDto.setLordFlag(NumConstant.ONE_STR);
             } else {
                 resultDto.setLordFlag(NumConstant.ZERO_STR);

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -74,7 +74,7 @@
             '网格长会尽快审核您创建的社群，请耐心等待'
             WHEN gp.STATE = 5 THEN
             gp.PROCESSING_OPINIONS
-            WHEN ( gp.STATE = 10 AND COUNT( DISTINCT ugp1.ID ) <![CDATA[ <= ]]> 1 AND gp.GROUP_CATEGORY = '1' ) THEN
+            WHEN ( gp.STATE = 10 AND COUNT( DISTINCT ugp1.ID ) <![CDATA[ <= ]]> 1 AND gp.GROUP_CATEGORY = '1' AND COUNT(DISTINCT tp.ID) = 0 ) THEN
             '您的社群审核已通过，快加好友进来吧' ELSE ''
             END AS description
         FROM