修改测试bug

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-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.*;
@@ -375,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();
+    }
 }