From 57376acd999409ed16b9d51ec4e175a92c8fe320 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 Nov 2021 10:52:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?/gov/org/customergrid/gridoption=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/AgencyIdFormDTO.java | 4 ++++ .../epmet/controller/CustomerGridController.java | 6 ++++-- .../main/java/com/epmet/dao/CustomerGridDao.java | 3 +++ .../com/epmet/service/CustomerGridService.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 16 +++++++++++++++- .../main/resources/mapper/CustomerGridDao.xml | 14 ++++++++++++++ 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java index cd0b55bbc8..a02cdad5f4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java @@ -19,4 +19,8 @@ public class AgencyIdFormDTO implements Serializable { */ @NotBlank(message = "组织机构ID不能为空") private String agencyId; + + //等着杨林改完，我再限制必填吧 + //@NotBlank(message = "查询条件和查看居民详情:query;新增或修改居民信息：addorupdate") + private String purpose; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index eccbc2860f..9063a4a5c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -289,6 +289,9 @@ public class CustomerGridController { /** * @Description 获取组织下网格选项 + * 居民信息：1）查询条件 :所属网格下拉框；2）查看详情：所属网格下拉框 + * label: 社区-网格 + * value: 网格id * @Param formDTO * @Return {@link Result>} * @Author zhaoqifeng @@ -297,7 +300,6 @@ public class CustomerGridController { @PostMapping("gridoption") public Result> getGridOption(@RequestBody AgencyIdFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); - return new Result>().ok(customerGridService.getGridOption(formDTO.getAgencyId())); + return new Result>().ok(customerGridService.getGridOption(formDTO.getAgencyId(),formDTO.getPurpose())); } - } 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 bec972b9d7..eca348b6f2 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 @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserIdAndPidDTO; import com.epmet.dto.UserIdDTO; @@ -342,4 +343,6 @@ public interface CustomerGridDao extends BaseDao { * @Description 查询组织下直属网格列表 **/ List selectByPid(@Param("pid") String pid); + + List getGridOptionForQuery(String gridPids); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 453c81f256..7538c7bb29 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -337,5 +337,5 @@ public interface CustomerGridService extends BaseService { * @Author zhaoqifeng * @Date 2021/10/26 14:01 */ - List getGridOption(String agencyId); + List getGridOption(String agencyId,String purpose); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 43a73d3b46..353cf3bea2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -844,7 +844,20 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getGridOption(String agencyId) { + public List getGridOption(String agencyId, String purpose) { + //查询条件和查看居民详情:query;新增或修改居民信息：addorupdate + if ("query".equals(purpose) || StringUtils.isEmpty(purpose)) { + CustomerAgencyDTO customerAgencyDTO = customerAgencyService.get(agencyId); + String gridPids = ""; + if (null != customerAgencyDTO) { + if (StringUtils.isEmpty(customerAgencyDTO.getPid()) || NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid())) { + gridPids = agencyId; + } else { + gridPids = customerAgencyDTO.getPids().concat(StrConstant.COLON).concat(agencyId); + } + } + return baseDao.getGridOptionForQuery(gridPids); + } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(CustomerGridEntity::getPid, agencyId); wrapper.last("ORDER BY CONVERT ( GRID_NAME USING gbk ) ASC"); @@ -859,4 +872,5 @@ public class CustomerGridServiceImpl extends BaseServiceImpl + From eb1591946b3f794d23d8b8ed26833f1372a008c4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 Nov 2021 10:56:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?/gov/org/customergrid/gridoption=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AgencyIdFormDTO.java | 4 ---- .../com/epmet/dto/form/GridOptionFormDTO.java | 24 +++++++++++++++++++ .../controller/CustomerGridController.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java index a02cdad5f4..cd0b55bbc8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AgencyIdFormDTO.java @@ -19,8 +19,4 @@ public class AgencyIdFormDTO implements Serializable { */ @NotBlank(message = "组织机构ID不能为空") private String agencyId; - - //等着杨林改完，我再限制必填吧 - //@NotBlank(message = "查询条件和查看居民详情:query;新增或修改居民信息：addorupdate") - private String purpose; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java new file mode 100644 index 0000000000..e6fae52bc9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridOptionFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description /gov/org/customergrid/gridoption + * @Author yinzuomei + * @Date 2021/11/12 10:54 上午 + */ +@Data +public class GridOptionFormDTO implements Serializable { + /** + * 部门Id + */ + @NotBlank(message = "组织机构ID不能为空") + private String agencyId; + //等着杨林改完，我再限制必填吧 + //@NotBlank(message = "查询条件和查看居民详情:query;新增或修改居民信息：addorupdate") + private String purpose; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 9063a4a5c5..b46bd1aeab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -298,7 +298,7 @@ public class CustomerGridController { * @Date 2021/10/26 14:02 */ @PostMapping("gridoption") - public Result> getGridOption(@RequestBody AgencyIdFormDTO formDTO){ + public Result> getGridOption(@RequestBody GridOptionFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return new Result>().ok(customerGridService.getGridOption(formDTO.getAgencyId(),formDTO.getPurpose())); } From af011f61db8d88cb6a79255529a2504245c874da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 Nov 2021 11:03:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index d3c9e4660d..94ca7a4587 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -702,5 +702,6 @@ on(cg.PID=ca.id and ca.DEL_FLAG='0') where cg.DEL_FLAG='0' and cg.PIDS like concat(#{gridPids},'%') + order by ca.CREATED_TIME asc,cg.CREATED_TIME asc