From 7c081d82b0b9720e48b0d19fe83a150f69000643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Mon, 13 May 2024 11:38:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E5=B8=82=E5=8C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppAreaController.java | 2 +- .../java/com/ruoyi/app/domain/AppUser.java | 5 ++++ .../service/impl/AppProvinceServiceImpl.java | 28 +++++++++++++++++-- .../resources/mapper/app/AppUserMapper.xml | 2 +- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppAreaController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppAreaController.java index 58e67fe..da28e06 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppAreaController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppAreaController.java @@ -96,7 +96,7 @@ public class AppAreaController extends BaseController { * 区id查询区名称 */ @GetMapping("/getTownById") - @ApiOperation(value = "省市区树状结构", notes = "省市区树状结构", httpMethod = "GET") + @ApiOperation(value = "区id查询区名称", notes = "区id查询区名称", httpMethod = "GET") public AjaxResult getTownById(@RequestParam("townId") Integer townId) { return AjaxResult.success(appTownService.getTownById(townId)); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java index 69fd3aa..bcbf1b4 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java @@ -91,6 +91,11 @@ public class AppUser extends BaseEntity @Excel(name = "在职时间", width = 30, dateFormat = "yyyy-MM-dd") private Date jobTime; + /** 在职结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "在职时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date jobEndTime; + /** 职位名称 */ @Excel(name = "职位名称") private String jobName; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java index 3d4f4ca..3709c80 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppProvinceServiceImpl.java @@ -102,10 +102,9 @@ public class AppProvinceServiceImpl implements IAppProvinceService { @Override public List selectAppProvinceTree() { - // 查询所有省级列表 List appProvinces = appProvinceMapper.selectAppProvinceList(null); - return appProvinces.stream() + List collect = appProvinces.stream() .map(appProvince -> { AreaVo areaVo = new AreaVo(); areaVo.setId(appProvince.getId()); @@ -119,6 +118,7 @@ public class AppProvinceServiceImpl implements IAppProvinceService { } List children = appCities.stream() + .filter(appCity -> !appCity.getId().equals(appCity.getId())) .map(appCity -> { AreaVo child = new AreaVo(); child.setId(appCity.getId()); @@ -132,6 +132,7 @@ public class AppProvinceServiceImpl implements IAppProvinceService { } List townChildren = appTowns.stream() + .filter(appTown -> !appTown.getId().equals(appCity.getId())) // Filter out where child id is same as parent id .map(appTown -> { AreaVo townChild = new AreaVo(); townChild.setId(appTown.getId()); @@ -151,6 +152,29 @@ public class AppProvinceServiceImpl implements IAppProvinceService { return areaVo; }) .collect(Collectors.toList()); + collect.stream().forEach( + areaVo -> { + if (areaVo.getChildren() == null || areaVo.getChildren().isEmpty()) { + areaVo.setIsLeaf(true); + } + if ( areaVo.getLevel() == 1 && areaVo.getChildren().isEmpty()) { + ArrayList areaVos = new ArrayList<>(); + AppTown appTown1 = new AppTown(); + appTown1.setCityId(Long.valueOf(areaVo.getId())); + List appTowns1 = appTownMapper.selectAppTownList(appTown1); + List townChildren = appTowns1.stream().map(appTown -> { + AreaVo townChild = new AreaVo(); + townChild.setId(appTown.getId()); + townChild.setName(appTown.getName()); + townChild.setLevel(3); + townChild.setIsLeaf(true); + return townChild; + }).collect(Collectors.toList()); + areaVo.setChildren(townChildren); + } + } + ); + return collect; } } diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml index 8f24aeb..96f1035 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, username, password, nickname, email, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member, + select id, username, password, nickname, email, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member,job_end_time, order_id, order_start_time, order_end_time from app_user