From 96f72e35432271771d2224ec3e2b91a13f9bcf97 Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 14 Oct 2024 09:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=90=8C=E9=9F=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96=E3=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8=E5=AF=B9=E5=BA=94=E6=8B=BC?= =?UTF-8?q?=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dangan-dangan/pom.xml | 6 + .../controller/DaJianSuoController.java | 187 ++++++++++++++++-- .../com/da/dangan/mapper/DaBirthDjMapper.java | 2 + .../com/da/dangan/mapper/DaCzrkdjMapper.java | 2 + .../com/da/dangan/mapper/DaQyzMapper.java | 2 + .../com/da/dangan/mapper/DaYtzmMapper.java | 2 + .../da/dangan/mapper/DaZfnyhkcgMapper.java | 2 + .../com/da/dangan/mapper/DaZqzMapper.java | 2 + .../da/dangan/service/IDaBirthDjService.java | 2 + .../da/dangan/service/IDaCzrkdjService.java | 2 + .../com/da/dangan/service/IDaQyzService.java | 2 + .../com/da/dangan/service/IDaYtzmService.java | 2 + .../da/dangan/service/IDaZfnyhkcgService.java | 2 + .../com/da/dangan/service/IDaZqzService.java | 2 + .../service/impl/DaBirthDjServiceImpl.java | 4 + .../service/impl/DaCzrkdjServiceImpl.java | 5 + .../dangan/service/impl/DaQyzServiceImpl.java | 4 + .../service/impl/DaYtzmServiceImpl.java | 4 + .../service/impl/DaZfnyhkcgServiceImpl.java | 4 + .../dangan/service/impl/DaZqzServiceImpl.java | 4 + .../com/da/dangan/util/ChineseToPinyin.java | 38 ++++ .../mapper/dangan/DaBirthDjMapper.xml | 82 ++++---- .../mapper/dangan/DaCzrkdjMapper.xml | 113 +++++------ .../resources/mapper/dangan/DaQyzMapper.xml | 96 +++++---- .../resources/mapper/dangan/DaYtzmMapper.xml | 59 ++++-- .../mapper/dangan/DaZfnyhkcgMapper.xml | 117 ++++++----- .../resources/mapper/dangan/DaZqzMapper.xml | 111 ++++++----- dangan-ui/src/utils/request.js | 2 +- 28 files changed, 600 insertions(+), 260 deletions(-) create mode 100644 dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java diff --git a/dangan-dangan/pom.xml b/dangan-dangan/pom.xml index 3ab637e..7b440d5 100644 --- a/dangan-dangan/pom.xml +++ b/dangan-dangan/pom.xml @@ -27,6 +27,12 @@ hutool-all 4.5.1 + + + com.belerweb + pinyin4j + 2.5.1 + \ No newline at end of file diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java index 50a87cd..450eeb9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java @@ -7,6 +7,7 @@ import com.da.common.core.page.TableDataInfo; import com.da.common.utils.ip.IpUtils; import com.da.dangan.domain.*; import com.da.dangan.service.*; +import com.da.dangan.util.ChineseToPinyin; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -38,7 +39,7 @@ public class DaJianSuoController extends BaseController { private IDaZqzService daZqzService; /** - *获取当前客户端ip 扫描仪webscan插件使用 + * 获取当前客户端ip 扫描仪webscan插件使用 */ @GetMapping("/ip") public String getIp() { @@ -47,11 +48,19 @@ public class DaJianSuoController extends BaseController { } /** - * 查询常住人口登记列表 + * 查询常住人口登记列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')") @GetMapping("/czrk") public TableDataInfo list(DaCzrkdj daCzrkdj) { + //拼音转换 + String name = daCzrkdj.getName().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daCzrkdj.setName(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || @@ -65,17 +74,42 @@ public class DaJianSuoController extends BaseController { } /** - * 查询出生登记列表 + * 查询常住人口登记列表---/不走同音检索 + */ + @PreAuthorize("@ss.hasPermi('dangan:czrkdj:list')") + @GetMapping("/czrk1") + public TableDataInfo list1(DaCzrkdj daCzrkdj) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daCzrkdj.setUserId(getUserId()); + } + startPage(); + List list = daCzrkdjService.searchDaCzrkdjList1(daCzrkdj); + return getDataTable(list); + } + + /** + * 查询出生登记列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:birthDJ:list')") @GetMapping("/cszm") - public TableDataInfo list(DaBirthDj daBirthDj) - { + public TableDataInfo list(DaBirthDj daBirthDj) { + //拼音转换 + String name = daBirthDj.getName().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daBirthDj.setName(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daBirthDj.setUserId(getUserId()); } startPage(); @@ -84,67 +118,174 @@ public class DaJianSuoController extends BaseController { } /** - * 查询迁移证列表 + * 查询出生登记列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:birthDJ:list')") + @GetMapping("/cszm1") + public TableDataInfo list1(DaBirthDj daBirthDj) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daBirthDj.setUserId(getUserId()); + } + startPage(); + List list = daBirthDjService.searchDaBirthDjList1(daBirthDj); + return getDataTable(list); + } + + /** + * 查询迁移证列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:qyz:list')") @GetMapping("/qyz") public TableDataInfo list(DaQyz daQyz) { + //拼音转换 + String name = daQyz.getName1().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daQyz.setName1(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daQyz.setUserId(getUserId()); } startPage(); List list = daQyzService.searchDaQyzList(daQyz); return getDataTable(list); } + /** - * 查询一胎证明列表 + * 查询迁移证列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:qyz:list')") + @GetMapping("/qyz1") + public TableDataInfo list1(DaQyz daQyz) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daQyz.setUserId(getUserId()); + } + startPage(); + List list = daQyzService.searchDaQyzList1(daQyz); + return getDataTable(list); + } + + /** + * 查询一胎证明列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:ytzm:list')") @GetMapping("/ytzm") public TableDataInfo list(DaYtzm daYtzm) { + //拼音转换 + String name = daYtzm.getwName().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daYtzm.setwName(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daYtzm.setUserId(getUserId()); } startPage(); List list = daYtzmService.searchYtzmList(daYtzm); return getDataTable(list); } + /** - * 查询转非农业人口批复存根列表 + * 查询一胎证明列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:ytzm:list')") + @GetMapping("/ytzm1") + public TableDataInfo list1(DaYtzm daYtzm) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daYtzm.setUserId(getUserId()); + } + startPage(); + List list = daYtzmService.searchYtzmList1(daYtzm); + return getDataTable(list); + } + + /** + * 查询转非农业人口批复存根列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:list')") @GetMapping("/zfny") public TableDataInfo list(DaZfnyhkcg daZfnyhkcg) { + //拼音转换 + String name = daZfnyhkcg.getName().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daZfnyhkcg.setName(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daZfnyhkcg.setUserId(getUserId()); } startPage(); List list = daZfnyhkcgService.searchDaZfnyhkcgList(daZfnyhkcg); return getDataTable(list); } + /** - * 查询准迁证列表 + * 查询转非农业人口批复存根列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:zfnyhkcg:list')") + @GetMapping("/zfny1") + public TableDataInfo list1(DaZfnyhkcg daZfnyhkcg) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daZfnyhkcg.setUserId(getUserId()); + } + startPage(); + List list = daZfnyhkcgService.searchDaZfnyhkcgList1(daZfnyhkcg); + return getDataTable(list); + } + + /** + * 查询准迁证列表 /同音检索 */ @PreAuthorize("@ss.hasPermi('dangan:zqz:list')") @GetMapping("/zqz") public TableDataInfo list(DaZqz daZqz) { + //拼音转换 + String name = daZqz.getName().trim(); + if (name != null && !name.equals("")) { + String pinyin = ChineseToPinyin.toPinyin(name); + daZqz.setName(pinyin); + } else { + return new TableDataInfo(); + } // 超管及角色为管理员显示所有目录信息 LoginUser loginUser = getLoginUser(); if (SysUser.isAdmin(getUserId()) || loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { - }else{ + } else { daZqz.setUserId(getUserId()); } startPage(); @@ -152,4 +293,22 @@ public class DaJianSuoController extends BaseController { return getDataTable(list); } + /** + * 查询准迁证列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:zqz:list')") + @GetMapping("/zqz1") + public TableDataInfo list1(DaZqz daZqz) { + // 超管及角色为管理员显示所有目录信息 + LoginUser loginUser = getLoginUser(); + if (SysUser.isAdmin(getUserId()) || + loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) { + } else { + daZqz.setUserId(getUserId()); + } + startPage(); + List list = daZqzService.searchDaZqzList1(daZqz); + return getDataTable(list); + } + } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java index 55e35ce..7f7fb97 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java @@ -63,4 +63,6 @@ public interface DaBirthDjMapper List searchDaBirthDjList(DaBirthDj daBirthDj); Long selectCountByMuIds(List ids); + + List searchDaBirthDjList1(DaBirthDj daBirthDj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java index 18cc2e7..0aba62e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java @@ -63,4 +63,6 @@ public interface DaCzrkdjMapper List searchDaCzrkdjList(DaCzrkdj daCzrkdj); Long selectCountByMuIds(List muIds); + + List searchDaCzrkdjList1(DaCzrkdj daCzrkdj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java index 1ef1dd8..bde0e79 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java @@ -63,4 +63,6 @@ public interface DaQyzMapper List searchDaQyzList(DaQyz daQyz); Long selectCountByMuIds(List ids); + + List searchDaQyzList1(DaQyz daQyz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java index 076570e..b6cd43b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java @@ -63,4 +63,6 @@ public interface DaYtzmMapper List searchYtzmList(DaYtzm daYtzm); Long selectCountByMuIds(List ids); + + List searchYtzmList1(DaYtzm daYtzm); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java index d0df938..0e877b3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java @@ -63,4 +63,6 @@ public interface DaZfnyhkcgMapper List searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg); Long selectCountByMuIds(List ids); + + List searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java index 9907d80..f23b521 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java @@ -63,4 +63,6 @@ public interface DaZqzMapper List searchDaZqzList(DaZqz daZqz); Long selectCountByMuIds(List ids); + + List searchDaZqzList1(DaZqz daZqz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java index a520c96..36aa07b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java @@ -61,4 +61,6 @@ public interface IDaBirthDjService public int deleteDaBirthDjById(Long id); List searchDaBirthDjList(DaBirthDj daBirthDj); + + List searchDaBirthDjList1(DaBirthDj daBirthDj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java index 4eba610..fef1611 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java @@ -54,4 +54,6 @@ public interface IDaCzrkdjService List searchDaCzrkdjList(DaCzrkdj daCzrkdj); + + List searchDaCzrkdjList1(DaCzrkdj daCzrkdj); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java index 590d177..aecd743 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java @@ -61,4 +61,6 @@ public interface IDaQyzService public int deleteDaQyzById(Long id); List searchDaQyzList(DaQyz daQyz); + + List searchDaQyzList1(DaQyz daQyz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java index 9b7aafc..8f5a8f9 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java @@ -61,4 +61,6 @@ public interface IDaYtzmService public int deleteDaYtzmById(Long id); List searchYtzmList(DaYtzm daYtzm); + + List searchYtzmList1(DaYtzm daYtzm); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java index d253d77..66d49a2 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java @@ -61,4 +61,6 @@ public interface IDaZfnyhkcgService public int deleteDaZfnyhkcgById(Long id); List searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg); + + List searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java index f0e212e..5480f7e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java @@ -61,4 +61,6 @@ public interface IDaZqzService public int deleteDaZqzById(Long id); List searchDaZqzList(DaZqz daZqz); + + List searchDaZqzList1(DaZqz daZqz); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java index d2d8d87..ddd9e54 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java @@ -60,6 +60,10 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService public List searchDaBirthDjList(DaBirthDj daBirthDj) { return daBirthDjMapper.searchDaBirthDjList(daBirthDj); } + @Override + public List searchDaBirthDjList1(DaBirthDj daBirthDj) { + return daBirthDjMapper.searchDaBirthDjList1(daBirthDj); + } /** * 新增出生登记 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java index 52ed337..0d994ba 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java @@ -60,6 +60,11 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService { return daCzrkdjMapper.searchDaCzrkdjList(daCzrkdj); } + @Override + public List searchDaCzrkdjList1(DaCzrkdj daCzrkdj) { + return daCzrkdjMapper.searchDaCzrkdjList1(daCzrkdj); + } + /** * 新增常住人口登记 * diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java index c5d5a80..732091e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java @@ -60,6 +60,10 @@ public class DaQyzServiceImpl implements IDaQyzService public List searchDaQyzList(DaQyz daQyz) { return daQyzMapper.searchDaQyzList(daQyz); } + @Override + public List searchDaQyzList1(DaQyz daQyz) { + return daQyzMapper.searchDaQyzList1(daQyz); + } /** * 新增迁移证 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java index a1ad1b4..3e7b0c7 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java @@ -60,6 +60,10 @@ public class DaYtzmServiceImpl implements IDaYtzmService public List searchYtzmList(DaYtzm daYtzm) { return daYtzmMapper.searchYtzmList(daYtzm); } + @Override + public List searchYtzmList1(DaYtzm daYtzm) { + return daYtzmMapper.searchYtzmList1(daYtzm); + } /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java index 84652a9..c502195 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java @@ -60,6 +60,10 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService public List searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg) { return daZfnyhkcgMapper.searchDaZfnyhkcgList(daZfnyhkcg); } + @Override + public List searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg) { + return daZfnyhkcgMapper.searchDaZfnyhkcgList1(daZfnyhkcg); + } /** * 新增转非农业人口批复存根 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java index 03e2fab..db73d75 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java @@ -60,6 +60,10 @@ public class DaZqzServiceImpl implements IDaZqzService public List searchDaZqzList(DaZqz daZqz) { return daZqzMapper.searchDaZqzList(daZqz); } + @Override + public List searchDaZqzList1(DaZqz daZqz) { + return daZqzMapper.searchDaZqzList1(daZqz); + } /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java b/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java new file mode 100644 index 0000000..0b06c8a --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java @@ -0,0 +1,38 @@ +package com.da.dangan.util; + +import net.sourceforge.pinyin4j.PinyinHelper; +import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; +import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; +import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; +import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; + +public class ChineseToPinyin { + public static String toPinyin(String chinese) { + HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat(); + format.setCaseType(HanyuPinyinCaseType.LOWERCASE); + format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); + + StringBuilder sb = new StringBuilder(); + char[] chars = chinese.toCharArray(); + for (char ch : chars) { + if (Character.isWhitespace(ch)) { + continue; + } + if (ch > 128) { + try { + String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format); + if (pinyinArray != null) { + sb.append(pinyinArray[0]); + } else { + sb.append(ch); + } + } catch (BadHanyuPinyinOutputFormatCombination e) { + e.printStackTrace(); + } + } else { + sb.append(ch); + } + } + return sb.toString(); + } +} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 0cf0fed..9f3c243 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -62,20 +62,20 @@ and mu_path = #{muPath} and birth_num like concat('%', #{birthNum}, '%') - - and ( - (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%' - )) - or - (m_name like concat('%', #{name}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), - '%' )) - or - (f_name like concat('%', #{name}, '%')OR to_pinyin ( f_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), - '%' )) + and (name like concat('%', #{name}, '%') + or m_name like concat('%', #{name}, '%') + or f_name like concat('%', #{name}, '%') ) + and birthday like concat('%', #{birthday}, '%') @@ -115,23 +115,14 @@ order by id desc - + + + - + + + + + + + + + + + + + + +