入群接口（跳过申请流程）

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/AppGroupController.java

@@ -189,6 +189,19 @@ public class AppGroupController {
         return groupService.applyForGroup(formDto);
     }
 
+    /**
+     * joinGroup
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/28 14:00
+     */
+    @PostMapping("joinGroup")
+    public Result joinGroup(@RequestBody GroupApplyFormDTO formDto) {
+        return groupService.joinGroup(formDto);
+    }
+
     /**
      * 用户加入党员群
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/GroupService.java

@@ -248,6 +248,16 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     Result applyForGroup(GroupApplyFormDTO formDto);
 
+    /**
+     * 申请入群
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/28 14:07
+     */
+    Result joinGroup(GroupApplyFormDTO formDto);
+
     /**
      * 获取网格下所有社群
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -411,6 +411,19 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         return new Result().error();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result joinGroup(GroupApplyFormDTO formDto) {
+        UserGroupEntity userGroupEntity = ConvertUtils.sourceToTarget(formDto, UserGroupEntity.class);
+        userGroupEntity.setLordFlag(NumConstant.ZERO_STR);
+        userGroupEntity.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
+        if (userGroupService.insert(userGroupEntity)) {
+            return new Result();
+        }
+
+        return new Result().error();
+    }
+
     @Override
     public List<GroupListDTO> listOfGroupByGridId(Long deptId) {
         return baseDao.selectListOfGroupByGridId(deptId);