Merge remote-tracking branch 'origin/master'

dangan-dangan/pom.xml

@@ -27,6 +27,12 @@
             <artifactId>hutool-all</artifactId>
             <version>4.5.1</version>
         </dependency>
+        <!--拼音转换-->
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.1</version>
+        </dependency>
     </dependencies>
 
 </project>

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<DaCzrkdj> 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<DaBirthDj> 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<DaQyz> 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<DaQyz> 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<DaYtzm> 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<DaYtzm> 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<DaZfnyhkcg> 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<DaZfnyhkcg> 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<DaZqz> list = daZqzService.searchDaZqzList1(daZqz);
+        return getDataTable(list);
+    }
+
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaBirthDjMapper.java

@@ -63,4 +63,6 @@ public interface DaBirthDjMapper
     List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj);
 
     Long selectCountByMuIds(List<Long> ids);
+
+    List<DaBirthDj> searchDaBirthDjList1(DaBirthDj daBirthDj);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaCzrkdjMapper.java

@@ -63,4 +63,6 @@ public interface DaCzrkdjMapper
     List<DaCzrkdj> searchDaCzrkdjList(DaCzrkdj daCzrkdj);
 
     Long selectCountByMuIds(List<Long> muIds);
+
+    List<DaCzrkdj> searchDaCzrkdjList1(DaCzrkdj daCzrkdj);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaQyzMapper.java

@@ -63,4 +63,6 @@ public interface DaQyzMapper
     List<DaQyz> searchDaQyzList(DaQyz daQyz);
 
     Long selectCountByMuIds(List<Long> ids);
+
+    List<DaQyz> searchDaQyzList1(DaQyz daQyz);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaYtzmMapper.java

@@ -63,4 +63,6 @@ public interface DaYtzmMapper
     List<DaYtzm> searchYtzmList(DaYtzm daYtzm);
 
     Long selectCountByMuIds(List<Long> ids);
+
+    List<DaYtzm> searchYtzmList1(DaYtzm daYtzm);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaZfnyhkcgMapper.java

@@ -63,4 +63,6 @@ public interface DaZfnyhkcgMapper
     List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg);
 
     Long selectCountByMuIds(List<Long> ids);
+
+    List<DaZfnyhkcg> searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg);
 }

dangan-dangan/src/main/java/com/da/dangan/mapper/DaZqzMapper.java

@@ -63,4 +63,6 @@ public interface DaZqzMapper
     List<DaZqz> searchDaZqzList(DaZqz daZqz);
 
     Long selectCountByMuIds(List<Long> ids);
+
+    List<DaZqz> searchDaZqzList1(DaZqz daZqz);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java

@@ -61,4 +61,6 @@ public interface IDaBirthDjService
     public int deleteDaBirthDjById(Long id);
 
     List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj);
+
+    List<DaBirthDj> searchDaBirthDjList1(DaBirthDj daBirthDj);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java

@@ -54,4 +54,6 @@ public interface IDaCzrkdjService
 
 
     List<DaCzrkdj> searchDaCzrkdjList(DaCzrkdj daCzrkdj);
+
+    List<DaCzrkdj> searchDaCzrkdjList1(DaCzrkdj daCzrkdj);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java

@@ -61,4 +61,6 @@ public interface IDaQyzService
     public int deleteDaQyzById(Long id);
 
     List<DaQyz> searchDaQyzList(DaQyz daQyz);
+
+    List<DaQyz> searchDaQyzList1(DaQyz daQyz);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java

@@ -61,4 +61,6 @@ public interface IDaYtzmService
     public int deleteDaYtzmById(Long id);
 
     List<DaYtzm> searchYtzmList(DaYtzm daYtzm);
+
+    List<DaYtzm> searchYtzmList1(DaYtzm daYtzm);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java

@@ -61,4 +61,6 @@ public interface IDaZfnyhkcgService
     public int deleteDaZfnyhkcgById(Long id);
 
     List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg);
+
+    List<DaZfnyhkcg> searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg);
 }

dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java

@@ -61,4 +61,6 @@ public interface IDaZqzService
     public int deleteDaZqzById(Long id);
 
     List<DaZqz> searchDaZqzList(DaZqz daZqz);
+
+    List<DaZqz> searchDaZqzList1(DaZqz daZqz);
 }

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java

@@ -60,6 +60,10 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
     public List<DaBirthDj> searchDaBirthDjList(DaBirthDj daBirthDj) {
         return daBirthDjMapper.searchDaBirthDjList(daBirthDj);
     }
+    @Override
+    public List<DaBirthDj> searchDaBirthDjList1(DaBirthDj daBirthDj) {
+        return daBirthDjMapper.searchDaBirthDjList1(daBirthDj);
+    }
 
     /**
      * 新增出生登记

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<DaCzrkdj> searchDaCzrkdjList1(DaCzrkdj daCzrkdj) {
+        return daCzrkdjMapper.searchDaCzrkdjList1(daCzrkdj);
+    }
+
     /**
      * 新增常住人口登记
      *

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java

@@ -60,6 +60,10 @@ public class DaQyzServiceImpl implements IDaQyzService
     public List<DaQyz> searchDaQyzList(DaQyz daQyz) {
         return daQyzMapper.searchDaQyzList(daQyz);
     }
+    @Override
+    public List<DaQyz> searchDaQyzList1(DaQyz daQyz) {
+        return daQyzMapper.searchDaQyzList1(daQyz);
+    }
 
     /**
      * 新增迁移证

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java

@@ -60,6 +60,10 @@ public class DaYtzmServiceImpl implements IDaYtzmService
     public List<DaYtzm> searchYtzmList(DaYtzm daYtzm) {
         return daYtzmMapper.searchYtzmList(daYtzm);
     }
+    @Override
+    public List<DaYtzm> searchYtzmList1(DaYtzm daYtzm) {
+        return daYtzmMapper.searchYtzmList1(daYtzm);
+    }
 
 
     /**

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java

@@ -60,6 +60,10 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
     public List<DaZfnyhkcg> searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg) {
         return daZfnyhkcgMapper.searchDaZfnyhkcgList(daZfnyhkcg);
     }
+    @Override
+    public List<DaZfnyhkcg> searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg) {
+        return daZfnyhkcgMapper.searchDaZfnyhkcgList1(daZfnyhkcg);
+    }
 
     /**
      * 新增转非农业人口批复存根

dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java

@@ -60,6 +60,10 @@ public class DaZqzServiceImpl implements IDaZqzService
     public List<DaZqz> searchDaZqzList(DaZqz daZqz) {
         return  daZqzMapper.searchDaZqzList(daZqz);
     }
+    @Override
+    public List<DaZqz> searchDaZqzList1(DaZqz daZqz) {
+        return  daZqzMapper.searchDaZqzList1(daZqz);
+    }
 
 
     /**

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();
+    }
+}

dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml

@@ -62,11 +62,11 @@
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>
             <if test="birthNum != null  and birthNum != ''">and birth_num like concat('%', #{birthNum}, '%')</if>
             <if test="name != null  and name != ''">
-                <!--and (name like concat('%', #{name}, '%')
+                and (name like concat('%', #{name}, '%')
                 or m_name like concat('%', #{name}, '%')
                 or f_name like concat('%', #{name}, '%')
-                    )-->
+                )
-                and (
+                <!--and (
                  (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                  ))
                  or
@@ -75,7 +75,7 @@
                  or
                  (f_name like concat('%', #{name}, '%')OR to_pinyin ( f_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
                  '%' ))
-                )
+                 )-->
             </if>
             <if test="birthday != null ">
                 and birthday like concat('%', #{birthday}, '%')
@@ -115,23 +115,14 @@
         </where>
         order by id desc
     </select>
-    <!--检索-->
+    <!--检索+同音-->
     <select id="searchDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
         select distinct b.* from da_birth_dj b
         left join da_user_catalog uc on b.mu_id = uc.mu_id
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
-                <!--
+                <!--and (
-                and (name like concat('%', #{name}, '%')
-                     or m_name like  concat('%', #{name}, '%')
-                     or f_name like  concat('%', #{name}, '%')
-                     or birthday like  concat('%', #{name}, '%')
-                     or m_card_id like  concat('%', #{name}, '%')
-                     or f_card_id like  concat('%', #{name}, '%')
-                     )
-                -->
-                and (
                 (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                 ))
                 or
@@ -143,6 +134,31 @@
                 or birthday like concat('%', #{name}, '%')
                 or m_card_id like concat('%', #{name}, '%')
                 or f_card_id like concat('%', #{name}, '%')
+                )-->
+                and (
+                name_p LIKE #{name}
+                or
+                m_name_p LIKE #{name}
+                or
+                f_name_p LIKE #{name}
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索不加同音-->
+    <select id="searchDaBirthDjList1" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
+        select distinct b.* from da_birth_dj b
+        left join da_user_catalog uc on b.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  ">and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+                and (name like concat('%', #{name}, '%')
+                or m_name like concat('%', #{name}, '%')
+                or f_name like concat('%', #{name}, '%')
+                or birthday like concat('%', #{name}, '%')
+                or m_card_id like concat('%', #{name}, '%')
+                or f_card_id like concat('%', #{name}, '%')
                 )
             </if>
         </where>
@@ -169,16 +185,16 @@
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
             <if test="birthNum != null">birth_num,</if>
-            <if test="name != null">name,</if>
+            <if test="name != null">name,name_p,</if>
             <if test="birthday != null">birthday,</if>
             <if test="sex != null">sex,</if>
             <if test="bornAddress != null">born_address,</if>
-            <if test="mName != null">m_name,</if>
+            <if test="mName != null">m_name,m_name_p,</if>
             <if test="mAge != null">m_age,</if>
             <if test="mGj != null">m_gj,</if>
             <if test="mNation != null">m_nation,</if>
             <if test="mCardId != null">m_card_id,</if>
-            <if test="fName != null">f_name,</if>
+            <if test="fName != null">f_name,f_name_p,</if>
             <if test="fAge != null">f_age,</if>
             <if test="fGj != null">f_gj,</if>
             <if test="fNation != null">f_nation,</if>
@@ -209,16 +225,16 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="birthNum != null">#{birthNum},</if>
-            <if test="name != null">#{name},</if>
+            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="sex != null">#{sex},</if>
             <if test="bornAddress != null">#{bornAddress},</if>
-            <if test="mName != null">#{mName},</if>
+            <if test="mName != null">#{mName},to_pinyin ( #{mName} ),</if>
             <if test="mAge != null">#{mAge},</if>
             <if test="mGj != null">#{mGj},</if>
             <if test="mNation != null">#{mNation},</if>
             <if test="mCardId != null">#{mCardId},</if>
-            <if test="fName != null">#{fName},</if>
+            <if test="fName != null">#{fName},to_pinyin ( #{fName} ),</if>
             <if test="fAge != null">#{fAge},</if>
             <if test="fGj != null">#{fGj},</if>
             <if test="fNation != null">#{fNation},</if>
@@ -253,16 +269,16 @@
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="birthNum != null">birth_num = #{birthNum},</if>
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null">name = #{name},name_p = to_pinyin ( #{name} ),</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="bornAddress != null">born_address = #{bornAddress},</if>
-            <if test="mName != null">m_name = #{mName},</if>
+            <if test="mName != null">m_name = #{mName},m_name_p = to_pinyin ( #{mName} ),</if>
             <if test="mAge != null">m_age = #{mAge},</if>
             <if test="mGj != null">m_gj = #{mGj},</if>
             <if test="mNation != null">m_nation = #{mNation},</if>
             <if test="mCardId != null">m_card_id = #{mCardId},</if>
-            <if test="fName != null">f_name = #{fName},</if>
+            <if test="fName != null">f_name = #{fName},f_name_p = to_pinyin ( #{fName} ),</if>
             <if test="fAge != null">f_age = #{fAge},</if>
             <if test="fGj != null">f_gj = #{fGj},</if>
             <if test="fNation != null">f_nation = #{fNation},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -83,31 +83,13 @@
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>
             <if test="relation != null  and relation != ''">and relation = #{relation}</if>
             <if test="name != null  and name != ''">
-                <!--and ( name like concat('%', #{name}, '%')
+                and (
+                name like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%')
-                or other_name like concat('%', #{name}, '%')
+                <!-- or other_name like concat('%', #{name}, '%')
-                or used_name like concat('%', #{name}, '%')
+                or used_name like concat('%', #{name}, '%') -->
                 or jhr1 like concat('%', #{name}, '%')
                 or jhr2 like concat('%', #{name}, '%')
-                )-->
-                and (
-                (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (hz_name like concat('%', #{name}, '%')OR to_pinyin ( hz_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
-                '%' ))
-                or
-                (other_name like concat('%', #{name}, '%')OR to_pinyin ( other_name ) LIKE CONCAT( '%', to_pinyin (
-                #{name} ), '%' ))
-                or
-                (used_name like concat('%', #{name}, '%')OR to_pinyin ( used_name ) LIKE CONCAT( '%', to_pinyin (
-                #{name} ), '%' ))
-                or
-                (jhr1 like concat('%', #{name}, '%')OR to_pinyin ( jhr1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (jhr2 like concat('%', #{name}, '%')OR to_pinyin ( jhr2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
                 )
             </if>
             <if test="birthday != null  and birthday != ''">
@@ -171,7 +153,7 @@
         </where>
         order by id desc
     </select>
-    <!--检索-->
+    <!--检索+同音字-->
     <select id="searchDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         select distinct c.* from da_czrkdj c
         left join da_user_catalog uc on c.mu_id = uc.mu_id
@@ -179,16 +161,7 @@
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="name != null  and name != ''">
-                <!--and ( name like concat('%', #{name}, '%')
+                <!-- and (
-                 or hz_name like concat('%', #{name}, '%')
-                 or other_name like concat('%', #{name}, '%')
-                 or used_name like concat('%', #{name}, '%')
-                 or jhr1 like concat('%', #{name}, '%')
-                 or jhr2 like concat('%', #{name}, '%')
-                 or birthday like concat('%', #{name}, '%')
-                 or card_id like concat('%', #{name}, '%')
-                 )-->
-                and (
                  (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                  ))
                  or
@@ -208,6 +181,36 @@
                  ))
                  or birthday like concat('%', #{name}, '%')
                  or card_id like concat('%', #{name}, '%')
+                 )-->
+                and (
+                name_p LIKE  #{name}
+                or
+                hz_p LIKE #{name}
+                or
+                jhr1_p LIKE  #{name}
+                or
+                jhr2_p LIKE #{name}
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索+无同音字-->
+    <select id="searchDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
+        select distinct c.* from da_czrkdj c
+        left join da_user_catalog uc on c.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  ">and uc.user_id = #{userId}</if>
+            <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
+            <if test="name != null  and name != ''">
+                and ( name like concat('%', #{name}, '%')
+                or hz_name like concat('%', #{name}, '%')
+                or other_name like concat('%', #{name}, '%')
+                or used_name like concat('%', #{name}, '%')
+                or jhr1 like concat('%', #{name}, '%')
+                or jhr2 like concat('%', #{name}, '%')
+                or birthday like concat('%', #{name}, '%')
+                or card_id like concat('%', #{name}, '%')
                 )
             </if>
         </where>
@@ -234,13 +237,13 @@
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
             <if test="relation != null">relation,</if>
-            <if test="name != null">name,</if>
+            <if test="name != null">name,name_p,</if>
             <if test="otherName != null">other_name,</if>
             <if test="usedName != null">used_name,</if>
             <if test="sex != null">sex,</if>
-            <if test="jhr1 != null">jhr1,</if>
+            <if test="jhr1 != null">jhr1,jhr1_p,</if>
             <if test="jhgx1 != null">jhgx1,</if>
-            <if test="jhr2 != null">jhr2,</if>
+            <if test="jhr2 != null">jhr2,jhr2_p,</if>
             <if test="jhgx2 != null">jhgx2,</if>
             <if test="gmcszqfrq != null">gmcszqfrq,</if>
             <if test="birthday != null">birthday,</if>
@@ -262,7 +265,7 @@
             <if test="hkdjsxbgjznrsjjblrz2 != null">hkdjsxbgjznrsjjblrz2,</if>
             <if test="jiguan != null">jiguan,</if>
             <if test="xzz != null">xzz,</if>
-            <if test="hzName != null">hz_name,</if>
+            <if test="hzName != null">hz_name,hz_p,</if>
             <if test="hb != null">hb,</if>
             <if test="djrq != null">djrq,</if>
             <if test="byzk != null">byzk,</if>
@@ -295,13 +298,13 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="relation != null">#{relation},</if>
-            <if test="name != null">#{name},</if>
+            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
             <if test="otherName != null">#{otherName},</if>
             <if test="usedName != null">#{usedName},</if>
             <if test="sex != null">#{sex},</if>
-            <if test="jhr1 != null">#{jhr1},</if>
+            <if test="jhr1 != null">#{jhr1},to_pinyin ( #{jhr1} ),</if>
             <if test="jhgx1 != null">#{jhgx1},</if>
-            <if test="jhr2 != null">#{jhr2},</if>
+            <if test="jhr2 != null">#{jhr2},to_pinyin ( #{jhr2} ),</if>
             <if test="jhgx2 != null">#{jhgx2},</if>
             <if test="gmcszqfrq != null">#{gmcszqfrq},</if>
             <if test="birthday != null">#{birthday},</if>
@@ -323,7 +326,7 @@
             <if test="hkdjsxbgjznrsjjblrz2 != null">#{hkdjsxbgjznrsjjblrz2},</if>
             <if test="jiguan != null">#{jiguan},</if>
             <if test="xzz != null">#{xzz},</if>
-            <if test="hzName != null">#{hzName},</if>
+            <if test="hzName != null">#{hzName},to_pinyin ( #{hzName} ),</if>
             <if test="hb != null">#{hb},</if>
             <if test="djrq != null">#{djrq},</if>
             <if test="byzk != null">#{byzk},</if>
@@ -360,13 +363,13 @@
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="relation != null">relation = #{relation},</if>
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null">name = #{name},name_p = to_pinyin ( #{name} ),</if>
             <if test="otherName != null">other_name = #{otherName},</if>
             <if test="usedName != null">used_name = #{usedName},</if>
             <if test="sex != null">sex = #{sex},</if>
-            <if test="jhr1 != null">jhr1 = #{jhr1},</if>
+            <if test="jhr1 != null">jhr1 = #{jhr1},jhr1_p = to_pinyin ( #{jhr1} ),</if>
             <if test="jhgx1 != null">jhgx1 = #{jhgx1},</if>
-            <if test="jhr2 != null">jhr2 = #{jhr2},</if>
+            <if test="jhr2 != null">jhr2 = #{jhr2},jhr2_p = to_pinyin ( #{jhr2} ),</if>
             <if test="jhgx2 != null">jhgx2 = #{jhgx2},</if>
             <if test="gmcszqfrq != null">gmcszqfrq = #{gmcszqfrq},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
@@ -388,7 +391,7 @@
             <if test="hkdjsxbgjznrsjjblrz2 != null">hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2},</if>
             <if test="jiguan != null">jiguan = #{jiguan},</if>
             <if test="xzz != null">xzz = #{xzz},</if>
-            <if test="hzName != null">hz_name = #{hzName},</if>
+            <if test="hzName != null">hz_name = #{hzName},hz_p = to_pinyin ( #{hzName} ),</if>
             <if test="hb != null">hb = #{hb},</if>
             <if test="djrq != null">djrq = #{djrq},</if>
             <if test="byzk != null">byzk = #{byzk},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml

@@ -64,13 +64,13 @@
             <if test="fwUnit != null  and fwUnit != ''">and fw_unit like concat('%', #{fwUnit}, '%')</if>
             <if test="wjXh != null  and wjXh != ''">and wj_xh like concat('%', #{wjXh}, '%')</if>
             <if test="name1 != null  and name1 != ''">
-                <!--and ( name1 like concat('%', #{name1}, '%')
+                and ( name1 like concat('%', #{name1}, '%')
                 or name2 like concat('%', #{name1}, '%')
                 or name3 like concat('%', #{name1}, '%')
                 or name4 like concat('%', #{name1}, '%')
-                )-->
+                )
 
-                and (
+                <!-- and (
                   (name1 like concat('%', #{name1}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
                   '%' ))
                   or
@@ -82,7 +82,7 @@
                   or
                   (name4 like concat('%', #{name1}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
                   '%' ))
-                )
+                  )-->
             </if>
             <if test="sex1 != null  and sex1 != ''">and sex1 = #{sex1}</if>
             <if test="cardId1 != null  and cardId1 != ''">
@@ -119,23 +119,14 @@
         </where>
         order by id desc
     </select>
+    <!--检索+同音字-->
     <select id="searchDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
         select distinct q.* from da_qyz q
         left join da_user_catalog uc on q.mu_id = uc.mu_id
         <where>
             <if test="userId != null">and uc.user_id = #{userId}</if>
             <if test="name1 != null  and name1 != ''">
-                <!--and ( name1 like concat('%', #{name1}, '%')
+                <!--and (
-                or name2 like concat('%', #{name1}, '%')
-                or name3 like concat('%', #{name1}, '%')
-                or name4 like concat('%', #{name1}, '%')
-                or card_id1 like concat('%', #{name1}, '%')
-                or card_id2 like concat('%', #{name1}, '%')
-                or card_id3 like concat('%', #{name1}, '%')
-                or card_id4 like concat('%', #{name1}, '%')
-                )-->
-
-                and (
                 (name1 like concat('%', #{name1}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
                 '%' ))
                 or
@@ -151,6 +142,35 @@
                 or card_id2 like concat('%', #{name1}, '%')
                 or card_id3 like concat('%', #{name1}, '%')
                 or card_id4 like concat('%', #{name1}, '%')
+                )-->
+                and (
+                name1_p LIKE #{name1}
+                or
+                name2_p LIKE #{name1}
+                or
+                name3_p LIKE #{name1}
+                or
+                name4_p LIKE #{name1}
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索+无同音字-->
+    <select id="searchDaQyzList1" parameterType="DaQyz" resultMap="DaQyzResult">
+        select distinct q.* from da_qyz q
+        left join da_user_catalog uc on q.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null">and uc.user_id = #{userId}</if>
+            <if test="name1 != null  and name1 != ''">
+                and ( name1 like concat('%', #{name1}, '%')
+                or name2 like concat('%', #{name1}, '%')
+                or name3 like concat('%', #{name1}, '%')
+                or name4 like concat('%', #{name1}, '%')
+                or card_id1 like concat('%', #{name1}, '%')
+                or card_id2 like concat('%', #{name1}, '%')
+                or card_id3 like concat('%', #{name1}, '%')
+                or card_id4 like concat('%', #{name1}, '%')
                 )
             </if>
         </where>
@@ -178,16 +198,16 @@
             <if test="muPath != null">mu_path,</if>
             <if test="fwUnit != null">fw_unit,</if>
             <if test="wjXh != null">wj_xh,</if>
-            <if test="name1 != null">name1,</if>
+            <if test="name1 != null">name1,name1_p,</if>
             <if test="sex1 != null">sex1,</if>
             <if test="cardId1 != null">card_id1,</if>
-            <if test="name2 != null">name2,</if>
+            <if test="name2 != null">name2,name2_p,</if>
             <if test="sex2 != null">sex2,</if>
             <if test="cardId2 != null">card_id2,</if>
-            <if test="name3 != null">name3,</if>
+            <if test="name3 != null">name3,name3_p,</if>
             <if test="sex3 != null">sex3,</if>
             <if test="cardId3 != null">card_id3,</if>
-            <if test="name4 != null">name4,</if>
+            <if test="name4 != null">name4,name4_p,</if>
             <if test="sex4 != null">sex4,</if>
             <if test="cardId4 != null">card_id4,</if>
             <if test="qyReason != null">qy_reason,</if>
@@ -218,16 +238,16 @@
             <if test="muPath != null">#{muPath},</if>
             <if test="fwUnit != null">#{fwUnit},</if>
             <if test="wjXh != null">#{wjXh},</if>
-            <if test="name1 != null">#{name1},</if>
+            <if test="name1 != null">#{name1},to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">#{sex1},</if>
             <if test="cardId1 != null">#{cardId1},</if>
-            <if test="name2 != null">#{name2},</if>
+            <if test="name2 != null">#{name2},to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">#{sex2},</if>
             <if test="cardId2 != null">#{cardId2},</if>
-            <if test="name3 != null">#{name3},</if>
+            <if test="name3 != null">#{name3},to_pinyin ( #{name3} ),</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="cardId3 != null">#{cardId3},</if>
-            <if test="name4 != null">#{name4},</if>
+            <if test="name4 != null">#{name4},to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="cardId4 != null">#{cardId4},</if>
             <if test="qyReason != null">#{qyReason},</if>
@@ -262,16 +282,16 @@
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="fwUnit != null">fw_unit = #{fwUnit},</if>
             <if test="wjXh != null">wj_xh = #{wjXh},</if>
-            <if test="name1 != null">name1 = #{name1},</if>
+            <if test="name1 != null">name1 = #{name1}, name1_p = to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
             <if test="cardId1 != null">card_id1 = #{cardId1},</if>
-            <if test="name2 != null">name2 = #{name2},</if>
+            <if test="name2 != null">name2 = #{name2},name2_p = to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
             <if test="cardId2 != null">card_id2 = #{cardId2},</if>
-            <if test="name3 != null">name3 = #{name3},</if>
+            <if test="name3 != null">name3 = #{name3},name3_p = to_pinyin ( #{name3} ),</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="cardId3 != null">card_id3 = #{cardId3},</if>
-            <if test="name4 != null">name4 = #{name4},</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
             <if test="cardId4 != null">card_id4 = #{cardId4},</if>
             <if test="qyReason != null">qy_reason = #{qyReason},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml

@@ -60,16 +60,16 @@
             <if test="year != null  and year != ''">and year like concat('%', #{year}, '%')</if>
             <if test="xh != null  and xh != ''">and xh like concat('%', #{xh}, '%')</if>
             <if test="wName != null  and wName != ''">
-                <!--and ( w_name like concat('%', #{wName}, '%')
+                and ( w_name like concat('%', #{wName}, '%')
                 or m_name like concat('%', #{wName}, '%')
-                   )-->
+                )
-                and (
+                <!-- and (
                 (w_name like concat('%', #{wName}, '%')OR to_pinyin ( w_name ) LIKE CONCAT( '%', to_pinyin ( #{wName}
                 ), '%' ))
                 or
                 (m_name like concat('%', #{wName}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{wName} ),
                 '%' ))
-                )
+                )-->
             </if>
             <if test="birthday != null ">
                 and birthday like concat('%', #{birthday}, '%')
@@ -102,24 +102,41 @@
         </where>
         order by id desc
     </select>
+    <!--检索+同音字-->
     <select id="searchYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
         select distinct y.* from da_ytzm y
         left join da_user_catalog uc on y.mu_id = uc.mu_id
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="wName != null  and wName != ''">
-                <!--and ( w_name like concat('%', #{wName}, '%')
+                <!-- and (
-                      or m_name like concat('%', #{wName}, '%')
+                 (w_name like concat('%', #{wName}, '%')OR to_pinyin ( w_name ) LIKE CONCAT( '%', to_pinyin ( #{wName}
+                 ), '%' ))
+                 or
+                 (m_name like concat('%', #{wName}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{wName} ),
+                 '%' ))
                  or birthday like concat('%', #{wName}, '%')
                  or w_card_id like concat('%', #{wName}, '%')
                  or m_card_id like concat('%', #{wName}, '%')
                  )-->
                 and (
-                (w_name like concat('%', #{wName}, '%')OR to_pinyin ( w_name ) LIKE CONCAT( '%', to_pinyin ( #{wName}
+                  w_name_p LIKE #{wName}
-                ), '%' ))
                 or
-                (m_name like concat('%', #{wName}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{wName} ),
+                  m_name_p LIKE  #{wName}
-                '%' ))
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索+无同音字-->
+    <select id="searchYtzmList1" parameterType="DaYtzm" resultMap="DaYtzmResult">
+        select distinct y.* from da_ytzm y
+        left join da_user_catalog uc on y.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  ">and uc.user_id = #{userId}</if>
+            <if test="wName != null  and wName != ''">
+                and ( w_name like concat('%', #{wName}, '%')
+                or m_name like concat('%', #{wName}, '%')
                 or birthday like concat('%', #{wName}, '%')
                 or w_card_id like concat('%', #{wName}, '%')
                 or m_card_id like concat('%', #{wName}, '%')
@@ -150,10 +167,10 @@
             <if test="muPath != null">mu_path,</if>
             <if test="year != null">year,</if>
             <if test="xh != null">xh,</if>
-            <if test="wName != null">w_name,</if>
+            <if test="wName != null">w_name,w_name_p,</if>
             <if test="wUnit != null">w_unit,</if>
             <if test="wCardId != null">w_card_id,</if>
-            <if test="mName != null">m_name,</if>
+            <if test="mName != null">m_name,m_name_p,</if>
             <if test="mUnit != null">m_unit,</if>
             <if test="mCardId != null">m_card_id,</if>
             <if test="syzh != null">syzh,</if>
@@ -186,10 +203,10 @@
             <if test="muPath != null">#{muPath},</if>
             <if test="year != null">#{year},</if>
             <if test="xh != null">#{xh},</if>
-            <if test="wName != null">#{wName},</if>
+            <if test="wName != null">#{wName},to_pinyin ( #{wName} ),</if>
             <if test="wUnit != null">#{wUnit},</if>
             <if test="wCardId != null">#{wCardId},</if>
-            <if test="mName != null">#{mName},</if>
+            <if test="mName != null">#{mName},to_pinyin ( #{mName} ),</if>
             <if test="mUnit != null">#{mUnit},</if>
             <if test="mCardId != null">#{mCardId},</if>
             <if test="syzh != null">#{syzh},</if>
@@ -226,10 +243,10 @@
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="year != null">year = #{year},</if>
             <if test="xh != null">xh = #{xh},</if>
-            <if test="wName != null">w_name = #{wName},</if>
+            <if test="wName != null">w_name = #{wName},w_name_p = to_pinyin ( #{wName} ),</if>
             <if test="wUnit != null">w_unit = #{wUnit},</if>
             <if test="wCardId != null">w_card_id = #{wCardId},</if>
-            <if test="mName != null">m_name = #{mName},</if>
+            <if test="mName != null">m_name = #{mName},m_name_p = to_pinyin ( #{mName} ),</if>
             <if test="mUnit != null">m_unit = #{mUnit},</if>
             <if test="mCardId != null">m_card_id = #{mCardId},</if>
             <if test="syzh != null">syzh = #{syzh},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml

@@ -65,14 +65,14 @@
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>
             <if test="num != null  and num != ''">and num like concat('%', #{num}, '%')</if>
             <if test="name != null  and name != ''">
-                <!--and ( name like concat('%', #{name}, '%')
+                and ( name like concat('%', #{name}, '%')
                 or name1 like concat('%', #{name}, '%')
                 or name2 like concat('%', #{name}, '%')
                 or name3 like concat('%', #{name}, '%')
                 or name4 like concat('%', #{name}, '%')
                 or name5 like concat('%', #{name}, '%')
-                   )-->
+                )
-                and (
+                <!-- and (
                 (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                 ))
                 or
@@ -90,7 +90,7 @@
                 or
                 (name5 like concat('%', #{name}, '%')OR to_pinyin ( name5 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                 ))
-                )
+                )-->
             </if>
             <if test="address != null  and address != ''">and address = #{address}</if>
             <if test="relation1 != null  and relation1 != ''">and relation1 = #{relation1}</if>
@@ -124,20 +124,14 @@
         </where>
         order by id desc
     </select>
+    <!--检索+同音字-->
     <select id="searchDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
         select distinct z.* from da_zfnyhkcg z
         left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
             <if test="userId != null ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
-                <!--and ( name like concat('%', #{name}, '%')
+                <!-- and (
-                   or name1 like concat('%', #{name}, '%')
-                   or name2 like concat('%', #{name}, '%')
-                   or name3 like concat('%', #{name}, '%')
-                   or name4 like concat('%', #{name}, '%')
-                   or name5 like concat('%', #{name}, '%')
-                   )-->
-                and (
                  (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                  ))
                  or
@@ -155,6 +149,37 @@
                  or
                  (name5 like concat('%', #{name}, '%')OR to_pinyin ( name5 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
                  ))
+                 )-->
+                and (
+                name_p LIKE #{name}
+                or
+                name1_p LIKE #{name}
+                or
+                name2_p LIKE #{name}
+                or
+                name3_p LIKE #{name}
+                or
+                name4_p LIKE #{name}
+                or
+                name5_p LIKE #{name}
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索+无同音字-->
+    <select id="searchDaZfnyhkcgList1" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
+        select distinct z.* from da_zfnyhkcg z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null ">and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+                and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
+                or name5 like concat('%', #{name}, '%')
                 )
             </if>
         </where>
@@ -180,22 +205,22 @@
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
             <if test="num != null">num,</if>
-            <if test="name != null">name,</if>
+            <if test="name != null">name,name_p,</if>
             <if test="address != null">address,</if>
             <if test="relation1 != null">relation1,</if>
-            <if test="name1 != null">name1,</if>
+            <if test="name1 != null">name1,name1_p,</if>
             <if test="sex1 != null">sex1,</if>
             <if test="relation2 != null">relation2,</if>
-            <if test="name2 != null">name2,</if>
+            <if test="name2 != null">name2,name2_p,</if>
             <if test="sex2 != null">sex2,</if>
             <if test="relation3 != null">relation3,</if>
-            <if test="name3 != null">name3,</if>
+            <if test="name3 != null">name3,name3_p,</if>
             <if test="sex3 != null">sex3,</if>
             <if test="relation4 != null">relation4,</if>
-            <if test="name4 != null">name4,</if>
+            <if test="name4 != null">name4,name4_p,</if>
             <if test="sex4 != null">sex4,</if>
             <if test="relation5 != null">relation5,</if>
-            <if test="name5 != null">name5,</if>
+            <if test="name5 != null">name5,name5_p,</if>
             <if test="sex5 != null">sex5,</if>
             <if test="jg1 != null">jg1,</if>
             <if test="jg2 != null">jg2,</if>
@@ -222,22 +247,22 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="num != null">#{num},</if>
-            <if test="name != null">#{name},</if>
+            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
             <if test="address != null">#{address},</if>
             <if test="relation1 != null">#{relation1},</if>
-            <if test="name1 != null">#{name1},</if>
+            <if test="name1 != null">#{name1},to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">#{sex1},</if>
             <if test="relation2 != null">#{relation2},</if>
-            <if test="name2 != null">#{name2},</if>
+            <if test="name2 != null">#{name2},to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">#{sex2},</if>
             <if test="relation3 != null">#{relation3},</if>
-            <if test="name3 != null">#{name3},</if>
+            <if test="name3 != null">#{name3},to_pinyin ( #{name3} ),</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="relation4 != null">#{relation4},</if>
-            <if test="name4 != null">#{name4},</if>
+            <if test="name4 != null">#{name4},to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="relation5 != null">#{relation5},</if>
-            <if test="name5 != null">#{name5},</if>
+            <if test="name5 != null">#{name5},to_pinyin ( #{name5} ),</if>
             <if test="sex5 != null">#{sex5},</if>
             <if test="jg1 != null">#{jg1},</if>
             <if test="jg2 != null">#{jg2},</if>
@@ -268,22 +293,22 @@
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="num != null">num = #{num},</if>
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null">name = #{name}, name_p = to_pinyin ( #{name} ),</if>
             <if test="address != null">address = #{address},</if>
             <if test="relation1 != null">relation1 = #{relation1},</if>
-            <if test="name1 != null">name1 = #{name1},</if>
+            <if test="name1 != null">name1 = #{name1},name1_p = to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
             <if test="relation2 != null">relation2 = #{relation2},</if>
-            <if test="name2 != null">name2 = #{name2},</if>
+            <if test="name2 != null">name2 = #{name2},name2_p = to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
             <if test="relation3 != null">relation3 = #{relation3},</if>
-            <if test="name3 != null">name3 = #{name3},</if>
+            <if test="name3 != null">name3 = #{name3},name3_p = to_pinyin ( #{name3} ),</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="relation4 != null">relation4 = #{relation4},</if>
-            <if test="name4 != null">name4 = #{name4},</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
             <if test="relation5 != null">relation5 = #{relation5},</if>
-            <if test="name5 != null">name5 = #{name5},</if>
+            <if test="name5 != null">name5 = #{name5},name5_p = to_pinyin ( #{name5} ),</if>
             <if test="sex5 != null">sex5 = #{sex5},</if>
             <if test="jg1 != null">jg1 = #{jg1},</if>
             <if test="jg2 != null">jg2 = #{jg2},</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml

@@ -74,27 +74,11 @@
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>
             <if test="num != null  and num != ''">and num like concat('%',#{num}, '%')</if>
             <if test="name != null  and name != ''">
-                <!--and ( name like concat('%', #{name}, '%')
+                and ( name like concat('%', #{name}, '%')
                 or name1 like concat('%', #{name}, '%')
                 or name2 like concat('%', #{name}, '%')
                 or name3 like concat('%', #{name}, '%')
                 or name4 like concat('%', #{name}, '%')
-                   )-->
-                and (
-                (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
-                or
-                (name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                ))
                 )
             </if>
             <if test="cardId != null  and cardId != ''">
@@ -151,17 +135,28 @@
         </where>
         order by id desc
     </select>
+    <!--检索+同音字-->
     <select id="searchDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
         select distinct z.* from da_zqz z
         left join da_user_catalog uc on z.mu_id = uc.mu_id
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
-                <!--nd ( name like concat('%', #{name}, '%')
+                <!--and (
-                   or name1 like concat('%', #{name}, '%')
+                (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
-                   or name2 like concat('%', #{name}, '%')
+                ))
-                   or name3 like concat('%', #{name}, '%')
+                or
-                   or name4 like concat('%', #{name}, '%')
+                (name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                ))
+                or
+                (name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                ))
+                or
+                (name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                ))
+                or
+                (name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                ))
                 or card_id like concat('%', #{name}, '%')
                 or card_id1 like concat('%', #{name}, '%')
                 or card_id2 like concat('%', #{name}, '%')
@@ -173,20 +168,32 @@
                 or birth_date4 like concat('%', #{name}, '%')
                 )-->
                 and (
-                (name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                name_p LIKE #{name}
-                ))
                 or
-                (name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                name1_p LIKE #{name}
-                ))
                 or
-                (name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                name2_p LIKE #{name}
-                ))
                 or
-                (name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                name3_p LIKE #{name}
-                ))
                 or
-                (name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
+                name4_p LIKE #{name}
-                ))
+                )
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--检索+无同音字-->
+    <select id="searchDaZqzList1" parameterType="DaZqz" resultMap="DaZqzResult">
+        select distinct z.* from da_zqz z
+        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <where>
+            <if test="userId != null  ">and uc.user_id = #{userId}</if>
+            <if test="name != null  and name != ''">
+                and ( name like concat('%', #{name}, '%')
+                or name1 like concat('%', #{name}, '%')
+                or name2 like concat('%', #{name}, '%')
+                or name3 like concat('%', #{name}, '%')
+                or name4 like concat('%', #{name}, '%')
                 or card_id like concat('%', #{name}, '%')
                 or card_id1 like concat('%', #{name}, '%')
                 or card_id2 like concat('%', #{name}, '%')
@@ -222,27 +229,27 @@
             <if test="muId != null">mu_id,</if>
             <if test="muPath != null">mu_path,</if>
             <if test="num != null">num,</if>
-            <if test="name != null">name,</if>
+            <if test="name != null">name,name_p,</if>
             <if test="cardId != null">card_id,</if>
             <if test="address != null">address,</if>
             <if test="djJg != null">dj_jg,</if>
             <if test="relation1 != null">relation1,</if>
-            <if test="name1 != null">name1,</if>
+            <if test="name1 != null">name1,name1_p,</if>
             <if test="sex1 != null">sex1,</if>
             <if test="birthDate1 != null">birth_date1,</if>
             <if test="cardId1 != null">card_id1,</if>
             <if test="relation2 != null">relation2,</if>
-            <if test="name2 != null">name2,</if>
+            <if test="name2 != null">name2,name2_p,</if>
             <if test="sex2 != null">sex2,</if>
             <if test="birthDate2 != null">birth_date2,</if>
             <if test="cardId2 != null">card_id2,</if>
             <if test="relation3 != null">relation3,</if>
-            <if test="name3 != null">name3,</if>
+            <if test="name3 != null">name3,name3_p,</if>
             <if test="birthDate3 != null">birth_date3,</if>
             <if test="sex3 != null">sex3,</if>
             <if test="cardId3 != null">card_id3,</if>
             <if test="relation4 != null">relation4,</if>
-            <if test="name4 != null">name4,</if>
+            <if test="name4 != null">name4,name4_p,</if>
             <if test="sex4 != null">sex4,</if>
             <if test="birthDate4 != null">birth_date4,</if>
             <if test="cardId4 != null">card_id4,</if>
@@ -273,27 +280,27 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="num != null">#{num},</if>
-            <if test="name != null">#{name},</if>
+            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
             <if test="cardId != null">#{cardId},</if>
             <if test="address != null">#{address},</if>
             <if test="djJg != null">#{djJg},</if>
             <if test="relation1 != null">#{relation1},</if>
-            <if test="name1 != null">#{name1},</if>
+            <if test="name1 != null">#{name1},to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">#{sex1},</if>
             <if test="birthDate1 != null">#{birthDate1},</if>
             <if test="cardId1 != null">#{cardId1},</if>
             <if test="relation2 != null">#{relation2},</if>
-            <if test="name2 != null">#{name2},</if>
+            <if test="name2 != null">#{name2},to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">#{sex2},</if>
             <if test="birthDate2 != null">#{birthDate2},</if>
             <if test="cardId2 != null">#{cardId2},</if>
             <if test="relation3 != null">#{relation3},</if>
-            <if test="name3 != null">#{name3},</if>
+            <if test="name3 != null">#{name3},to_pinyin ( #{name3} ),</if>
             <if test="birthDate3 != null">#{birthDate3},</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="cardId3 != null">#{cardId3},</if>
             <if test="relation4 != null">#{relation4},</if>
-            <if test="name4 != null">#{name4},</if>
+            <if test="name4 != null">#{name4},to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="birthDate4 != null">#{birthDate4},</if>
             <if test="cardId4 != null">#{cardId4},</if>
@@ -328,27 +335,27 @@
             <if test="muId != null">mu_id = #{muId},</if>
             <if test="muPath != null">mu_path = #{muPath},</if>
             <if test="num != null">num = #{num},</if>
-            <if test="name != null">name = #{name},</if>
+            <if test="name != null">name = #{name}, name_p = to_pinyin ( #{name} ),</if>
             <if test="cardId != null">card_id = #{cardId},</if>
             <if test="address != null">address = #{address},</if>
             <if test="djJg != null">dj_jg = #{djJg},</if>
             <if test="relation1 != null">relation1 = #{relation1},</if>
-            <if test="name1 != null">name1 = #{name1},</if>
+            <if test="name1 != null">name1 = #{name1},name1_p = to_pinyin ( #{name1} ),</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
             <if test="birthDate1 != null">birth_date1 = #{birthDate1},</if>
             <if test="cardId1 != null">card_id1 = #{cardId1},</if>
             <if test="relation2 != null">relation2 = #{relation2},</if>
-            <if test="name2 != null">name2 = #{name2},</if>
+            <if test="name2 != null">name2 = #{name2},name2_p = to_pinyin ( #{name2} ),</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
             <if test="birthDate2 != null">birth_date2 = #{birthDate2},</if>
             <if test="cardId2 != null">card_id2 = #{cardId2},</if>
             <if test="relation3 != null">relation3 = #{relation3},</if>
-            <if test="name3 != null">name3 = #{name3},</if>
+            <if test="name3 != null">name3 = #{name3},name3_p = to_pinyin ( #{name3} ),</if>
             <if test="birthDate3 != null">birth_date3 = #{birthDate3},</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="cardId3 != null">card_id3 = #{cardId3},</if>
             <if test="relation4 != null">relation4 = #{relation4},</if>
-            <if test="name4 != null">name4 = #{name4},</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = to_pinyin ( #{name4} ),</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
             <if test="birthDate4 != null">birth_date4 = #{birthDate4},</if>
             <if test="cardId4 != null">card_id4 = #{cardId4},</if>

dangan-quartz/src/main/java/com/da/quartz/util/AbstractQuartzJob.java

@@ -1,20 +1,19 @@
 package com.da.quartz.util;
 
-import java.util.Date;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.da.common.constant.Constants;
 import com.da.common.constant.ScheduleConstants;
 import com.da.common.utils.ExceptionUtil;
 import com.da.common.utils.StringUtils;
 import com.da.common.utils.bean.BeanUtils;
-import com.da.common.utils.spring.SpringUtils;
 import com.da.quartz.domain.SysJob;
 import com.da.quartz.domain.SysJobLog;
-import com.da.quartz.service.ISysJobLogService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
 
 /**
  * 抽象quartz调用
@@ -93,7 +92,7 @@ public abstract class AbstractQuartzJob implements Job
         }
 
         // 写入数据库当中
-        SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
+        //SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
     }
 
     /**

dangan-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 10s超时
-  timeout: 20000
+  timeout: 60000
 })
 
 // request拦截器