From 77a08338fc2017f12e45877c7a4796f335e64dfe Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 13 Dec 2023 19:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F-=E6=B2=BB?= =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerGridManageUserListFormDTO.java | 30 +++++++ .../result/CustomerGridManageUserListDTO.java | 85 +++++++++++++++++++ .../CustomerGridManageUserController.java | 13 ++- .../java/com/epmet/dao/CustomerGridDao.java | 2 + .../CustomerCommunityManageUserEntity.java | 3 + .../entity/CustomerGridManageUserEntity.java | 7 +- .../CustomerGridManageUserService.java | 6 +- ...ustomerCommunityManageUserServiceImpl.java | 2 +- .../CustomerGridManageUserServiceImpl.java | 38 +++++++-- .../main/resources/mapper/CustomerGridDao.xml | 9 ++ 10 files changed, 179 insertions(+), 16 deletions(-) create mode 100755 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridManageUserListFormDTO.java create mode 100755 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridManageUserListDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridManageUserListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridManageUserListFormDTO.java new file mode 100755 index 0000000000..4fac1d9b49 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CustomerGridManageUserListFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 网格治理人员 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-11-27 + */ +@Data +public class CustomerGridManageUserListFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private Integer pageNo; + + private Integer pageSize; + + private String agencyId; + + private String level; + + private String staffId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridManageUserListDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridManageUserListDTO.java new file mode 100755 index 0000000000..505ad8024d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerGridManageUserListDTO.java @@ -0,0 +1,85 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 网格治理人员 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-11-27 + */ +@Data +public class CustomerGridManageUserListDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 网格id + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 人员属性 + */ + private String property; + + /** + * 1：专职网格员2：北上速办专职3：专业网格管理员4：兼职网格管理员 + */ + private String type; + + /** + * 删除标识:0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridManageUserController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridManageUserController.java index 2bcc34135d..794459d191 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridManageUserController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridManageUserController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -11,6 +13,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.CustomerCommunityManageUserDTO; import com.epmet.dto.CustomerGridManageUserDTO; +import com.epmet.dto.form.CustomerGridManageUserListFormDTO; +import com.epmet.dto.result.CustomerGridManageUserListDTO; import com.epmet.dto.result.CustomerGridStatisticsReulstDTO; import com.epmet.excel.CustomerGridManageUserExcel; import com.epmet.service.CustomerGridManageUserService; @@ -35,10 +39,11 @@ public class CustomerGridManageUserController { @Autowired private CustomerGridManageUserService customerGridManageUserService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = customerGridManageUserService.page(params); - return new Result>().ok(page); + @PostMapping("page") + public Result> page(@LoginUser TokenDto tokenDto,@RequestBody CustomerGridManageUserListFormDTO dto){ + dto.setStaffId(tokenDto.getUserId()); + PageData page = customerGridManageUserService.page(dto); + return new Result>().ok(page); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 1fb999e0f0..cafbf7cff8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -385,6 +385,8 @@ public interface CustomerGridDao extends BaseDao { List getDelGridIdList(@Param("agencyId") String agencyId); + List getGridIdList(@Param("agencyId") String agencyId); + /** * @describe: 通过网格id获取社区行政编码 * @author wangtong diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerCommunityManageUserEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerCommunityManageUserEntity.java index caabd3e6e0..a7ec207204 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerCommunityManageUserEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerCommunityManageUserEntity.java @@ -1,5 +1,7 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; @@ -24,6 +26,7 @@ public class CustomerCommunityManageUserEntity extends BaseEpmetEntity { /** * 客户ID */ + @TableField(fill = FieldFill.INSERT) private String customerId; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridManageUserEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridManageUserEntity.java index c8cf236e2b..7d2464915a 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridManageUserEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridManageUserEntity.java @@ -1,5 +1,7 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; @@ -23,7 +25,10 @@ public class CustomerGridManageUserEntity extends BaseEpmetEntity { /** * 客户ID - */ + */ /** + * 客户ID + */ + @TableField(fill = FieldFill.INSERT) private String customerId; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridManageUserService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridManageUserService.java index b8d0f040f0..9c8e6b5bb0 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridManageUserService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridManageUserService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.CustomerGridManageUserDTO; +import com.epmet.dto.form.CustomerGridManageUserListFormDTO; +import com.epmet.dto.result.CustomerGridManageUserListDTO; import com.epmet.dto.result.CustomerGridStatisticsReulstDTO; import com.epmet.entity.CustomerGridManageUserEntity; @@ -20,12 +22,12 @@ public interface CustomerGridManageUserService extends BaseService * @author generator * @date 2023-11-27 */ - PageData page(Map params); + PageData page(CustomerGridManageUserListFormDTO dto); /** * 默认查询 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerCommunityManageUserServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerCommunityManageUserServiceImpl.java index 362f8026c8..5b4fb524e8 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerCommunityManageUserServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerCommunityManageUserServiceImpl.java @@ -68,7 +68,7 @@ public class CustomerCommunityManageUserServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, CustomerGridManageUserDTO.class); + public PageData page(CustomerGridManageUserListFormDTO dto) { + + CustomerStaffAgencyDTO customerStaffAgencyDTO = customerStaffAgencyDao.selectLatestCustomerByStaff(dto.getStaffId()); + if (customerStaffAgencyDTO == null ){ + throw new EpmetException("未查询到工作人员信息"+dto.getStaffId()); + } + List gridIds = customerGridDao.getGridIdList(customerStaffAgencyDTO.getAgencyId()); + if (gridIds.size() > 0) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .in(CustomerGridManageUserEntity::getGridId, gridIds); + PageHelper.startPage(dto.getPageNo(),dto.getPageSize()); + List list = baseDao.selectList(lambdaQueryWrapper); + PageInfo customerGridManageUserEntityPageInfo = new PageInfo<>(list); + List result = ConvertUtils.sourceToTarget(list,CustomerGridManageUserListDTO.class); + + return new PageData<>(result,customerGridManageUserEntityPageInfo.getTotal()); + } + return new PageData<>(); } @Override @@ -77,7 +99,7 @@ public class CustomerGridManageUserServiceImpl extends BaseServiceImpl + + UPDATE customer_grid SET total_user = total_user+#{incrCount} where id = #{gridId} and del_flag = '0'