diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java index 7cf7ab5..10403ab 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/PartyOrgTypeController.java @@ -92,13 +92,13 @@ public class PartyOrgTypeController { ExcelUtils.exportExcelToTarget(response, null, list, PartyOrgTypeExcel.class); } - /* + /** * 获取 党组织类型,用于下拉选项 * @param * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author zhangyong * @Date 15:28 2021-08-06 - **/ + */ @GetMapping("getPartyOrgType") public Result> getPartyOrgType() { return new Result>().ok(partyOrgTypeService.getPartyOrgType()); diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java new file mode 100644 index 0000000..0445e4e --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysUserGridmanController.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有,侵权必究! + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; +import com.elink.esua.epdc.service.SysUserService; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 网格员管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@RestController +@RequestMapping("sysUser") +@Api(tags = "网格员管理") +public class SysUserGridmanController { + @Autowired + private SysUserService sysUserService; + + /** + * 获取网格员列表 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [formDto] + * @author jyyzz + * @since 2021/8/30 16:29 + */ + @GetMapping("gridmanList") + public Result> getGridmanList(@RequestBody EpdcAppGridManFormDTO formDto) { + List gridmanList = sysUserService.listGridmanInfo(formDto); + return new Result>().ok(gridmanList); + } +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java index d8e4ba1..0018a2b 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/DeptMaCodeDao.java @@ -53,4 +53,25 @@ public interface DeptMaCodeDao extends BaseDao { * @date 2019/9/19 10:38 */ List selectListNoCodeGridId(); -} \ No newline at end of file + + /** + * 查询需要修改的组织机构信息 + * + * @param deptId + * @return java.util.List + * @author lc + * @since 2021/8/30 16:25 + */ + List selectListOfOrganizationInfo(Long deptId); + + /** + * + * 更新网格名称 + * + * @params [newDeptName, deptId] + * @return void + * @author liuchuang + * @since 2020/3/7 1:20 + */ + void updateGridByDeptId(String newDeptName, Long deptId); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java index 980e8c3..fb3e558 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/PartyOrgTypeDao.java @@ -67,12 +67,12 @@ public interface PartyOrgTypeDao extends BaseDao { **/ Integer isTypeImgRepeated(@Param("imgUrl") String typeName, @Param("id") String id); - /* + /** * 获取 党组织类型,用于下拉选项 * @param * @return java.util.List * @Author zhangyong * @Date 15:28 2021-08-06 - **/ + */ List getPartyOrgType(); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index 83ff0a9..e579fbe 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java @@ -9,6 +9,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.entity.SysUserEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import org.apache.ibatis.annotations.Mapper; @@ -139,4 +141,13 @@ public interface SysUserDao extends BaseDao { * @date 2021/6/4 9:22 */ List> getUserList4Vaccination(); + + /** + * 小程序-首页网格员列表 + * @params [formDto] + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/28 22:18 + */ + List selectListGridmanInfo(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java index 18a9636..cb14a01 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java @@ -51,4 +51,24 @@ public class DeptMaCodeEntity extends BaseEpdcEntity { */ private String leaderFlag; -} \ No newline at end of file + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; + +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java index f47db3a..9db2ff7 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptMaCodeDTO; import com.elink.esua.epdc.entity.DeptMaCodeEntity; +import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import java.util.List; import java.util.Map; @@ -121,4 +122,14 @@ public interface DeptMaCodeService extends BaseService { * @date 2019/10/22 09:59 */ Result createGridLeaderMaCode(); -} \ No newline at end of file + + /** + * 修改机构名称 + * + * @param body + * @return void + * @author lc + * @since 2021/8/30 16:23 + */ + void modifyDeptName(OrganizationModifyDTO body); +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java index e9a8056..4e343b7 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/PartyOrgTypeService.java @@ -95,12 +95,12 @@ public interface PartyOrgTypeService extends BaseService { */ void delete(String[] ids); - /* + /** * 获取 党组织类型,用于下拉选项 * @param * @return java.util.List * @Author zhangyong * @Date 15:28 2021-08-06 - **/ + */ List getPartyOrgType(); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java index b21b6bf..4d38101 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysUserService.java @@ -16,6 +16,8 @@ import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO; import com.elink.esua.epdc.dto.VerifyMobileDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.entity.SysUserEntity; import java.util.List; @@ -177,4 +179,13 @@ public interface SysUserService extends BaseService { * @date 2021/6/4 9:21 */ List> getUserList4Vaccination(); + + /** + * 首页-网格员列表获取 + * @params [formDto] + * @return java.util.List + * @author zhangfenghe + * @since 2021/8/28 22:00 + */ + List listGridmanInfo(EpdcAppGridManFormDTO formDto); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java index d06038f..edaa914 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java @@ -34,6 +34,7 @@ import com.elink.esua.epdc.dto.DeptMaCodeDTO; import com.elink.esua.epdc.dto.UploadToOssDTO; import com.elink.esua.epdc.entity.DeptMaCodeEntity; import com.elink.esua.epdc.feign.OssFeignClient; +import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.service.DeptMaCodeService; import com.elink.esua.epdc.utils.WxMaServiceUtils; import lombok.extern.slf4j.Slf4j; @@ -44,6 +45,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.*; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -212,4 +214,58 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl maList = baseDao.selectListOfOrganizationInfo(body.getDeptId()); + if (null != maList && maList.size() > 0) { + // 组织机构信息处理 + List entities = handleOrganizationInfo(body, maList); + // 更新事件组织机构信息 + updateBatchById(entities); + } + // 更新网格名称 + baseDao.updateGridByDeptId(body.getNewDeptName(), body.getDeptId()); + } + + /** + * 组织机构信息处理 + * + * @return java.util.List + * @params [dto, userList] + * @author liuchuang + * @since 2020/3/7 15:22 + */ + private List handleOrganizationInfo(OrganizationModifyDTO dto, List maList) { + List entities = new ArrayList<>(); + for (DeptMaCodeEntity maEntity : maList) { + DeptMaCodeEntity entity = new DeptMaCodeEntity(); + if (StringUtils.isNotEmpty(maEntity.getParentDeptIds()) && StringUtils.isNotEmpty(maEntity.getParentDeptNames())) { + List parentDeptIds = Arrays.asList(maEntity.getParentDeptIds().split(",")); + List parentDeptNames = Arrays.asList(maEntity.getParentDeptNames().split("-")); + int index = parentDeptIds.indexOf(dto.getDeptId().toString()); + if (index >= 0 && parentDeptNames.size() > index) { + parentDeptNames.set(index, dto.getNewDeptName()); + entity.setId(maEntity.getId()); + entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-")); + } + } + + if (StringUtils.isNotEmpty(maEntity.getAllDeptIds()) && StringUtils.isNotEmpty(maEntity.getAllDeptNames())) { + List allDeptIds = Arrays.asList(maEntity.getAllDeptIds().split(",")); + List allDeptNames = Arrays.asList(maEntity.getAllDeptNames().split("-")); + int index = allDeptIds.indexOf(dto.getDeptId().toString()); + if (index >= 0 && allDeptNames.size() > index) { + allDeptNames.set(index, dto.getNewDeptName()); + entity.setId(maEntity.getId()); + entity.setAllDeptNames(StringUtils.join(allDeptNames, "-")); + } + } + + entities.add(entity); + } + + return entities; + } + +} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 04bfc6d..9190d40 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -50,10 +50,7 @@ import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer; -import com.elink.esua.epdc.service.AdminImgService; -import com.elink.esua.epdc.service.SysDeptInfoService; -import com.elink.esua.epdc.service.SysDeptService; -import com.elink.esua.epdc.service.SysUserService; +import com.elink.esua.epdc.service.*; import com.elink.esua.epdc.utils.EpmetUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -104,6 +101,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) { //普通管理员,只能查询所属部门及子部门的数据 @@ -1001,6 +1001,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl> getUserList4Vaccination() { return baseDao.getUserList4Vaccination(); } + + @Override + public List listGridmanInfo(EpdcAppGridManFormDTO formDto) { + int pageIndex =(formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List listGridmanInfo = baseDao.selectListGridmanInfo(formDto); + return listGridmanInfo; + } + } diff --git a/epdc-cloud-admin/src/main/resources/mapper/DeptMaCodeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/DeptMaCodeDao.xml index 2889a5e..0ae3e72 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/DeptMaCodeDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/DeptMaCodeDao.xml @@ -37,4 +37,21 @@ AND NOT EXISTS (SELECT 1 FROM epdc_dept_ma_code e WHERE e.GRID_ID = d.id AND e.DEL_FLAG = '0') - \ No newline at end of file + + + + UPDATE epdc_dept_ma_code SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId} + + + diff --git a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml index f46014c..0ffebce 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/PartyOrgTypeDao.xml @@ -56,6 +56,6 @@ TYPE_NAME tagName FROM epdc_party_org_type WHERE DEL_FLAG = '0' - AND ENABLE = '1' + ORDER BY SORT diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml index 554756b..5fc5696 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml @@ -218,4 +218,21 @@ ORDER BY u.create_date DESC + diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 8c5f912..40bd061 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 8c5f912270a32bf7cf695349c0681fb6198e2e5e +Subproject commit 40bd0613d9f3dd621d327713e3d7f15c656570f3