社会组织改版

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerController.java

@@ -25,7 +25,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao;
 import com.elink.esua.epdc.modules.volunteer.excel.VolunteerExcel;
 import com.elink.esua.epdc.modules.volunteer.service.VolunteerService;
@@ -196,17 +195,5 @@ public class VolunteerController {
         return volunteerService.getVolunteerList(formDto);
     }
 
-    /**
-     * @describe: 小程序完善居民信息-认证/更新认证 时检查是否为志愿组织管理员
-     * @author wangtong
-     * @date 2021/9/29 9:04
-     * @params [user]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     */
-    @PostMapping("setAppOrgAdminUser")
-    public Result setAppOrgAdminUser(@RequestBody UserDTO dto) {
-        return volunteerService.setAppOrgAdminUser(dto);
-    }
-
 
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java

@@ -106,4 +106,13 @@ public interface VolunteerDao extends BaseDao<VolunteerEntity> {
     * @return java.util.List<com.elink.esua.epdc.volunteer.VolunteerListResultDTO>
     */
     List<VolunteerListResultDTO> getVolunteerList(AppVorgFormDTO formDto);
+
+    /**
+    * @describe: 查询组织管理员信息
+    * @author wangtong
+    * @date 2021/9/29 10:14
+    * @params [orgId]
+    * @return com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity
+    */
+    VolunteerEntity selectAdminInfo(@Param("orgId") String orgId);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerOrgDao.java

@@ -115,4 +115,13 @@ public interface VolunteerOrgDao extends BaseDao<VolunteerOrgEntity> {
     * @return java.util.List<com.elink.esua.epdc.volunteer.OrgDetailListResultDTO>
     */
     List<OrgDetailListResultDTO> getOrgDetailList(AppVorgFormDTO formDto);
+
+    /**
+    * @describe:查询设置此手机号为管理员的组织
+    * @author wangtong
+    * @date 2021/9/29 10:07
+    * @params [mobile]
+    * @return java.util.List<java.lang.String>
+    */
+    List<Long> getOrgIdsByAdminMobile(@Param("mobile") String mobile);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerService.java

@@ -21,7 +21,6 @@ package com.elink.esua.epdc.modules.volunteer.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.UserDTO;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity;
 import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO;
 import com.elink.esua.epdc.volunteer.AppVorgFormDTO;
@@ -181,6 +180,4 @@ public interface VolunteerService extends BaseService<VolunteerEntity> {
      */
     Result getVolunteerList(AppVorgFormDTO formDto);
 
-
-    Result setAppOrgAdminUser(UserDTO dto);
 }

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VactInfoServiceImpl.java

@@ -40,7 +40,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -152,15 +151,10 @@ public class VactInfoServiceImpl extends BaseServiceImpl<VactInfoDao, VactInfoEn
             entity.setReason("");
             updateById(entity);
         }
-        List<VactOrgRelationEntity> relationList = new ArrayList();
+        VactOrgRelationEntity relationEntity = new VactOrgRelationEntity();
-        List<Long> orgIdList = volunteerDao.getOrgIdListByUserId(formDto.getUserId());
+        relationEntity.setVactId(entity.getId());
-        for(Long orgId : orgIdList){
+        relationEntity.setVolunteerOrgId(formDto.getOrgId());
-            VactOrgRelationEntity relationEntity = new VactOrgRelationEntity();
+        vactOrgRelationService.insert(relationEntity);
-            relationEntity.setVactId(entity.getId());
-            relationEntity.setVolunteerOrgId(orgId);
-            relationList.add(relationEntity);
-        }
-        vactOrgRelationService.insertBatch(relationList);
         return new Result().ok("提交成功");
     }
 

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerOrgServiceImpl.java

@@ -113,12 +113,51 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
         return setAdminUserForOrg(dto,entity.getId());
     }
 
+//    private Result setAdminUserForOrg(VolunteerOrgDTO dto,Long orgId){
+//        Result userResult = userInfoFeignClient.getUserByMobile(dto.getMobile());
+//        if (!userResult.success()) {
+//            throw new RenException("获取用户信息失败");
+//        } else if (userResult.getData() == null){
+//            return new Result().ok("管理员手机号未关联到居民端用户，请检查管理员手机号或提醒该手机号用户在居民端注册。");
+//        }else{
+//            UserDTO userInfo = JSONObject.parseObject(userResult.getData().toString(), UserDTO.class);
+//            //先检查此用户有没有在群里
+//            VolunteerEntity entity = volunteerDao.getByUserIdAndOrgId(userInfo.getId(),orgId);
+//            //不在，新增用户，并设置成群主
+//            if(entity == null){
+//                VolunteerEntity newEntity = new VolunteerEntity();
+//                newEntity.setVolunteerOrgId(orgId);
+//                newEntity.setAdminFlag("1");
+//                newEntity.setRealName(dto.getHeadName());
+//                newEntity.setIdCard(userInfo.getIdentityNo());
+//                newEntity.setMobile(dto.getMobile());
+////                newEntity.setIntroduceInfo();
+//                newEntity.setState("10");
+//                newEntity.setUserId(userInfo.getId());
+//                newEntity.setFaceImg(userInfo.getFaceImg());
+//                newEntity.setPartyFlag(userInfo.getPartyFlag());
+//                newEntity.setDeptId(userInfo.getDeptId().toString());
+//                if(StringUtils.isNotBlank(userInfo.getAllDeptNames())){
+//                    newEntity.setDeptName(userInfo.getAllDeptNames().substring(userInfo.getAllDeptNames().lastIndexOf("-")+1,userInfo.getAllDeptNames().length()));
+//                }
+//                newEntity.setParentDeptIds(userInfo.getParentDeptIds());
+//                newEntity.setParentDeptNames(userInfo.getParentDeptNames());
+//                newEntity.setAllDeptIds(userInfo.getAllDeptIds());
+//                newEntity.setAllDeptNames(userInfo.getAllDeptNames());
+//                volunteerDao.insert(newEntity);
+//            }else {//在，不是群主，修改状态设置为群主
+//                entity.setAdminFlag("1");
+//                entity.setState("10");//审核通过
+//                volunteerDao.updateById(entity);
+//            }
+//            return new Result().ok("管理员手机号已成功关联居民端用户，该手机号居民端用户已被设置为该组织管理员。");
+//        }
+//    }
+
     private Result setAdminUserForOrg(VolunteerOrgDTO dto,Long orgId){
         Result userResult = userInfoFeignClient.getUserByMobile(dto.getMobile());
         if (!userResult.success()) {
             throw new RenException("获取用户信息失败");
-        } else if (userResult.getData() == null){
-            return new Result().ok("管理员手机号未关联到居民端用户，请检查管理员手机号或提醒该手机号用户在居民端注册。");
         }else{
             UserDTO userInfo = JSONObject.parseObject(userResult.getData().toString(), UserDTO.class);
             //先检查此用户有没有在群里
@@ -150,7 +189,7 @@ public class VolunteerOrgServiceImpl extends BaseServiceImpl<VolunteerOrgDao, Vo
                 entity.setState("10");//审核通过
                 volunteerDao.updateById(entity);
             }
-            return new Result().ok("管理员手机号已成功关联居民端用户，该手机号居民端用户已被设置为该组织管理员。");
+            return new Result().ok("操作成功");
         }
     }
 

epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java

@@ -25,7 +25,6 @@ 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.UserDTO;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerDao;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgDao;
 import com.elink.esua.epdc.modules.volunteer.dao.VolunteerOrgRelationDao;
@@ -158,11 +157,6 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
         return new Result().ok(result);
     }
 
-    @Override
-    public Result setAppOrgAdminUser(UserDTO dto) {
-
-        return null;
-    }
 
     @Override
     public List<VolunteerDTO> list(Map<String, Object> params) {

epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml

@@ -103,15 +103,24 @@
         from epdc_volunteer v
         LEFT JOIN epdc_volunteer_org o on v.VOLUNTEER_ORG_ID=o.id and o.del_flag='0'
         where v.DEL_FLAG='0'
-			  and v.USER_ID=#{userId}
+              <if test="id !=null and id != ''">
-              and v.VOLUNTEER_ORG_ID=#{volunteerOrgId}
+                  and v.id=#{id}
+              </if>
+              <if test="id == null or id == ''">
+                  and v.USER_ID=#{userId}
+                  and v.VOLUNTEER_ORG_ID=#{volunteerOrgId}
+              </if>
     </select>
     <select id="getOrgIdListByUserId" resultType="java.lang.Long">
-        SELECT r.VOLUNTEER_ORG_ID
+<!--        SELECT r.VOLUNTEER_ORG_ID-->
-        FROM `epdc_volunteer` v
+<!--        FROM `epdc_volunteer` v-->
-        left join epdc_volunteer_org_relation r on r.VOLUNTEER_ID=v.id and r.DEL_FLAG='0'
+<!--        left join epdc_volunteer_org_relation r on r.VOLUNTEER_ID=v.id and r.DEL_FLAG='0'-->
-        where USER_ID=#{userId}
+<!--        where USER_ID=#{userId}-->
-                    and v.DEL_FLAG='0'
+<!--                    and v.DEL_FLAG='0'-->
+        SELECT distinct VOLUNTEER_ORG_ID
+            FROM `epdc_volunteer`
+            where USER_ID=#{userId}
+                  and DEL_FLAG='0'
     </select>
     <select id="getByUserIdAndOrgId" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity">
         SELECT *
@@ -137,6 +146,12 @@
               and VOLUNTEER_ORG_ID=#{id}
         order by CREATED_TIME desc
     </select>
+    <select id="selectAdminInfo" resultType="com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity">
+        select * from epdc_volunteer
+        where DEL_FLAG='0'
+              and VOLUNTEER_ORG_ID=#{orgId}
+              and ADMIN_FLAG='1'
+    </select>
 
 
 </mapper>

epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerOrgDao.xml

@@ -132,6 +132,12 @@
         order by ai.CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
+    <select id="getOrgIdsByAdminMobile" resultType="java.lang.Long">
+        select id
+        from epdc_volunteer_org
+        where del_flag='0'
+              and mobile=#{mobile}
+    </select>
 
 
 </mapper>