From 83862a09d88e5b355b63cb97caf19a38e73c0f0e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 27 Apr 2022 15:40:13 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?= =?UTF-8?q?=E6=83=85=E5=86=B5=E5=A2=9E=E5=8A=A0=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcVaccineFormDTO.java | 27 +++++++++++++++++++ .../epmet/controller/IcVaccineController.java | 14 +++++++++- .../com/epmet/service/IcVaccineService.java | 7 +++++ .../service/impl/IcVaccineServiceImpl.java | 18 ++++++++++--- 4 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineFormDTO.java new file mode 100644 index 0000000000..8c0dc1af1d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcVaccineFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 疫苗接种情况-列表点击查询详情 + * @Author sun + */ +@Data +public class IcVaccineFormDTO extends PageFormDTO { + + private static final long serialVersionUID = -6809065476616323072L; + + public interface Detail extends CustomerClientShowGroup { + } + + /** + * 核酸记录Id + */ + @NotBlank(message = "疫苗接种记录Id不能为空", groups = {Detail.class}) + private String vaccineId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index 07f3e9305c..2628f0ae5d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -19,7 +19,8 @@ import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; -import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.IcVaccineDTO; +import com.epmet.dto.form.IcVaccineFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListCommonExcelResultDTO; import com.epmet.dto.result.IcVaccineListResultDTO; @@ -225,5 +226,16 @@ public class IcVaccineController implements ResultDataResolver { } } + /** + * @Author sun + * @Description 疫苗接种情况-列表点击查询详情 + **/ + @NoRepeatSubmit + @PostMapping("detail") + public Result detail(@RequestBody IcVaccineFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, IcVaccineFormDTO.Detail.class); + return new Result().ok(icVaccineService.detail(formDTO.getVaccineId())); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java index b84626a8c8..154b6f9558 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcVaccineDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.VaccineListDTO; @@ -53,4 +54,10 @@ public interface IcVaccineService extends BaseService { * @Date 2022/3/30 10:24 */ List getVaccineList(String customerId, String idCard); + + /** + * @Author sun + * @Description 疫苗接种情况-列表点击查询详情 + **/ + IcVaccineDTO detail(String vaccineId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 389e23ba04..f138bba0ba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -13,14 +13,13 @@ import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.FileUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; +import com.epmet.dto.IcVaccineDTO; +import com.epmet.dto.UserAdviceDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.IcVaccineListResultDTO; @@ -30,6 +29,7 @@ import com.epmet.dto.result.VaccineListDTO; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; +import com.epmet.entity.UserAdviceEntity; import com.epmet.excel.data.IcNatImportExcelData; import com.epmet.excel.data.IcVaccineImportExcelData; import com.epmet.excel.handler.IcVaccineExcelImportListener; @@ -468,4 +468,14 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Wed, 27 Apr 2022 15:43:18 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=94=9F=E6=88=90id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcExportTemplateServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 482d3af99d..bb951a2183 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -155,7 +156,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl Date: Wed, 27 Apr 2022 15:58:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/AttentionDetailFormDTO.java | 21 +++++++++++++++++++ .../dto/result/VaccinationListResultDTO.java | 1 + .../IcEpidemicSpecialAttentionController.java | 13 ++++++++++++ .../dao/IcEpidemicSpecialAttentionDao.java | 9 ++++++++ .../IcEpidemicSpecialAttentionService.java | 10 +++++++++ ...IcEpidemicSpecialAttentionServiceImpl.java | 11 ++++++++++ .../mapper/IcEpidemicSpecialAttentionDao.xml | 16 ++++++++++++-- 7 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java new file mode 100644 index 0000000000..484cc4e2d2 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/4/27 15:30 + * @DESC + */ +@Data +public class AttentionDetailFormDTO implements Serializable { + + private static final long serialVersionUID = -8257288519752831619L; + + @NotBlank(message = "id不能为空",groups = VaccinationListFormDTO.VaccinationListForm.class) + private String id; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index a2012686fe..01c7374dff 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -99,6 +99,7 @@ public class VaccinationListResultDTO implements Serializable { * 小区名+楼栋名+单元名+房屋名 */ private String allName; + private String id; public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java index 60bb98cc89..e2e046a047 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java @@ -17,6 +17,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.excel.NatExportExcel; import com.epmet.excel.NatImportExcel; import com.epmet.excel.VaccinationExportExcel; @@ -67,6 +68,18 @@ public class IcEpidemicSpecialAttentionController { return new Result().ok(icEpidemicSpecialAttentionService.vaccinationList(formDTO)); } + /** + * Desc: 【疫苗接种关注名单，疫苗接种关注名单】详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:47 + */ + @PostMapping("detail") + public Result detail(@RequestBody AttentionDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class); + return new Result().ok(icEpidemicSpecialAttentionService.detail(formDTO)); + } + /** * Desc:【疫苗接种关注名单，核酸检测关注名单】新增 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java index ba1564855e..0fb3e579d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.AttentionDetailFormDTO; import com.epmet.dto.form.VaccinationListFormDTO; import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; @@ -26,6 +27,14 @@ public interface IcEpidemicSpecialAttentionDao extends BaseDao vaccinationList(VaccinationListFormDTO formDTO); + /** + * Desc: 关注详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:42 + */ + VaccinationListResultDTO nat(AttentionDetailFormDTO formDTO); + /** * Desc: 核酸检测关注名单 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java index 8a6eb03f04..5391f1c1ae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java @@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; +import com.epmet.dto.form.AttentionDetailFormDTO; import com.epmet.dto.form.CancelAttentionPackageFormDTO; import com.epmet.dto.form.VaccinationAddFormDTO; import com.epmet.dto.form.VaccinationListFormDTO; +import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import java.io.InputStream; @@ -130,4 +132,12 @@ public interface IcEpidemicSpecialAttentionService extends BaseService getHeSuanIdCardList(String customerId,List idCardSet); + + /** + * Desc: 详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:33 + */ + VaccinationListResultDTO detail(AttentionDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 0cf1ee381b..6175e742c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -467,6 +467,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl - SELECT + SELECT a.id, a.`NAME`, a.MOBILE, a.ID_CARD, @@ -144,4 +144,16 @@ ) + + + From 94c816662ea36a58637750029cf5021ececf697f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 16:23:05 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/OptionResultDTO.java | 20 +++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 19 ++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index 4226c2acac..739d44fc00 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -1,9 +1,11 @@ package com.epmet.commons.tools.dto.result; import lombok.Data; +import org.apache.commons.collections4.CollectionUtils; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description @@ -21,4 +23,22 @@ public class OptionResultDTO implements Serializable { private List children; private Boolean usableFlag; private String type; + + + /** + * desc:递归获取当前节点的 所有子节点 + * + * @param option + * @param resultMap + */ + public void getCurrenNodeAllChild(OptionResultDTO option, Map resultMap) { + resultMap.put(option.getValue(), option); + if (CollectionUtils.isNotEmpty(option.getChildren())) { + return; + } + option.getChildren().forEach(o -> { + resultMap.put(o.getValue(), o); + getCurrenNodeAllChild(o, resultMap); + }); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 5596554999..51074aac3e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -1289,27 +1289,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if (options == null) { return null; } + //结果平铺展开 Map resultMap = new HashMap<>(); - options.forEach(option-> getChildren(option,resultMap)); + options.forEach(option-> option.getCurrenNodeAllChild(option,resultMap)); return resultMap; } - /** - * desc:递归获取children - * @param option - * @param resultMap - * todo 利用泛型 提取到公共类中 - */ - public void getChildren(OptionResultDTO option, Map resultMap) { - resultMap.put(option.getValue(),option); - if (CollectionUtils.isNotEmpty(option.getChildren())){ - option.getChildren().forEach(o->{ - resultMap.put(o.getValue(),o); - getChildren(o,resultMap); - }); - } - } - /** * 更新主表中人员类别标记 * @param icResiUserTableEnum From 0ff35b0a2a6da51ea383940185f7f545274798b3 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 27 Apr 2022 16:51:15 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E5=8F=8A=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcExportTemplateDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml index a299cd8865..5abc391d2a 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcExportTemplateDao.xml @@ -53,6 +53,7 @@ ic_export_template_config where DEL_FLAG = 0 and TEMP_ID = #{tempId} + and PID = '0' order by SORT From a84822f7453dd26f2049907ef907301224ece5cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 16:51:42 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 51074aac3e..5432d7cb44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -73,7 +73,7 @@ import java.util.stream.Collectors; /** * @ClassName IcResiUserImportServiceImpl - * @Description TODO + * @Description 居民信息导入 服务实现类 * @Author wangxianzhang * @Date 2021/11/4 8:53 下午 * @Version 1.0 From ce76dd0bb55b475674d05c590a72ec5480cc6875 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 27 Apr 2022 17:11:20 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 5 ++++- .../src/main/resources/mapper/IcNeighborHoodDao.xml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 59ac9f2b24..1f4c188744 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -108,7 +108,10 @@ AND a.DEL_FLAG = '0' - order by a.CREATED_TIME, a.BUILDING_NAME +# order by a.CREATED_TIME, a.BUILDING_NAME + #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 + ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), + CONVERT(a.BUILDING_NAME USING gbk) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 660770fe2a..6fedffbbe1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -100,7 +100,6 @@ AND a.DEL_FLAG = '0' -# ORDER BY a.CREATED_TIME ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)