修改档案记录中拼音转换——之前在mysql中转换不支持繁体字

dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java

@@ -61,6 +61,10 @@ public class DaBirthDj extends BaseEntity {
     @Excel(name = "婴儿姓名")
     private String name;
 
+    /** 姓名拼音 */
+    @Excel(name = "姓名拼音")
+    private String nameP;
+
     /**
      * 出生时间
      */
@@ -85,6 +89,10 @@ public class DaBirthDj extends BaseEntity {
     @Excel(name = "母亲姓名")
     private String mName;
 
+    /** 母亲姓名拼音 */
+    @Excel(name = "母亲姓名拼音")
+    private String mNameP;
+
     /**
      * 母亲年龄
      */
@@ -115,6 +123,10 @@ public class DaBirthDj extends BaseEntity {
     @Excel(name = "父亲姓名")
     private String fName;
 
+    /** 父亲姓名拼音 */
+    @Excel(name = "父亲姓名拼音")
+    private String fNameP;
+
     /**
      * 父亲年龄
      */
@@ -233,6 +245,30 @@ public class DaBirthDj extends BaseEntity {
      */
     private String flag;
 
+    public String getNameP() {
+        return nameP;
+    }
+
+    public void setNameP(String nameP) {
+        this.nameP = nameP;
+    }
+
+    public String getmNameP() {
+        return mNameP;
+    }
+
+    public void setmNameP(String mNameP) {
+        this.mNameP = mNameP;
+    }
+
+    public String getfNameP() {
+        return fNameP;
+    }
+
+    public void setfNameP(String fNameP) {
+        this.fNameP = fNameP;
+    }
+
     public String getFlag() {
         return flag;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java

@@ -41,6 +41,10 @@ public class DaCzrkdj extends BaseEntity {
     @Excel(name = "姓名")
     private String name;
 
+    /** 姓名拼音 */
+    @Excel(name = "姓名拼音")
+    private String nameP;
+
     /** 别名 */
     @Excel(name = "别名")
     private String otherName;
@@ -57,6 +61,10 @@ public class DaCzrkdj extends BaseEntity {
     @Excel(name = "监护人1")
     private String jhr1;
 
+    /** 监护人1拼音 */
+    @Excel(name = "监护人1拼音")
+    private String jhr1P;
+
     /** 监护关系1 */
     @Excel(name = "监护关系1")
     private String jhgx1;
@@ -65,6 +73,10 @@ public class DaCzrkdj extends BaseEntity {
     @Excel(name = "监护人2")
     private String jhr2;
 
+    /** 监护人2拼音 */
+    @Excel(name = "监护人2拼音")
+    private String jhr2P;
+
     /** 监护关系2 */
     @Excel(name = "监护关系2")
     private String jhgx2;
@@ -153,6 +165,10 @@ public class DaCzrkdj extends BaseEntity {
     @Excel(name = "户主姓名")
     private String hzName;
 
+    /** 户主拼音 */
+    @Excel(name = "户主拼音")
+    private String hzP;
+
     /** 户别 */
     @Excel(name = "户别")
     private String hb;
@@ -247,6 +263,38 @@ public class DaCzrkdj extends BaseEntity {
      */
     private String flag;
 
+    public String getNameP() {
+        return nameP;
+    }
+
+    public void setNameP(String nameP) {
+        this.nameP = nameP;
+    }
+
+    public String getJhr1P() {
+        return jhr1P;
+    }
+
+    public void setJhr1P(String jhr1P) {
+        this.jhr1P = jhr1P;
+    }
+
+    public String getJhr2P() {
+        return jhr2P;
+    }
+
+    public void setJhr2P(String jhr2P) {
+        this.jhr2P = jhr2P;
+    }
+
+    public String getHzP() {
+        return hzP;
+    }
+
+    public void setHzP(String hzP) {
+        this.hzP = hzP;
+    }
+
     public String getFlag() {
         return flag;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java

@@ -67,6 +67,10 @@ public class DaQyz extends BaseEntity {
     @Excel(name = "姓名1")
     private String name1;
 
+    /** 姓名1拼音 */
+    @Excel(name = "姓名1拼音")
+    private String name1P;
+
     /**
      * 性别1
      */
@@ -85,6 +89,10 @@ public class DaQyz extends BaseEntity {
     @Excel(name = "姓名2")
     private String name2;
 
+    /** 姓名2拼音 */
+    @Excel(name = "姓名2拼音")
+    private String name2P;
+
     /**
      * 性别2
      */
@@ -103,6 +111,11 @@ public class DaQyz extends BaseEntity {
     @Excel(name = "姓名3")
     private String name3;
 
+    /** 姓名3拼音 */
+    @Excel(name = "姓名3拼音")
+    private String name3P;
+
+
     /**
      * 性别3
      */
@@ -121,6 +134,10 @@ public class DaQyz extends BaseEntity {
     @Excel(name = "姓名4")
     private String name4;
 
+    /** 姓名4拼音 */
+    @Excel(name = "姓名4拼音")
+    private String name4P;
+
     /**
      * 性别4
      */
@@ -233,6 +250,38 @@ public class DaQyz extends BaseEntity {
      */
     private String flag;
 
+    public String getName1P() {
+        return name1P;
+    }
+
+    public void setName1P(String name1P) {
+        this.name1P = name1P;
+    }
+
+    public String getName2P() {
+        return name2P;
+    }
+
+    public void setName2P(String name2P) {
+        this.name2P = name2P;
+    }
+
+    public String getName3P() {
+        return name3P;
+    }
+
+    public void setName3P(String name3P) {
+        this.name3P = name3P;
+    }
+
+    public String getName4P() {
+        return name4P;
+    }
+
+    public void setName4P(String name4P) {
+        this.name4P = name4P;
+    }
+
     public String getFlag() {
         return flag;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java

@@ -65,6 +65,10 @@ public class DaYtzm extends BaseEntity {
     @Excel(name = "姓名女")
     private String wName;
 
+    /** 姓名女拼音 */
+    @Excel(name = "姓名女拼音")
+    private String wNameP;
+
     /**
      * 工作单位女
      */
@@ -83,6 +87,10 @@ public class DaYtzm extends BaseEntity {
     @Excel(name = "姓名男")
     private String mName;
 
+    /** 姓名男拼音 */
+    @Excel(name = "姓名男拼音")
+    private String mNameP;
+
     /**
      * 工作单位男
      */
@@ -209,6 +217,22 @@ public class DaYtzm extends BaseEntity {
      */
     private String flag;
 
+    public String getwNameP() {
+        return wNameP;
+    }
+
+    public void setwNameP(String wNameP) {
+        this.wNameP = wNameP;
+    }
+
+    public String getmNameP() {
+        return mNameP;
+    }
+
+    public void setmNameP(String mNameP) {
+        this.mNameP = mNameP;
+    }
+
     public String getFlag() {
         return flag;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java

@@ -61,6 +61,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "申请人姓名")
     private String name;
 
+    /** 姓名拼音 */
+    @Excel(name = "姓名拼音")
+    private String nameP;
+
     /**
      * 住址
      */
@@ -79,6 +83,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "姓名1")
     private String name1;
 
+    /** 姓名1拼音 */
+    @Excel(name = "姓名1拼音")
+    private String name1P;
+
     /**
      * 性别1
      */
@@ -97,6 +105,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "姓名2")
     private String name2;
 
+    /** 姓名2拼音 */
+    @Excel(name = "姓名2拼音")
+    private String name2P;
+
     /**
      * 性别2
      */
@@ -115,6 +127,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "姓名3")
     private String name3;
 
+    /** 姓名3拼音 */
+    @Excel(name = "姓名3拼音")
+    private String name3P;
+
     /**
      * 性别3
      */
@@ -133,6 +149,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "姓名4")
     private String name4;
 
+    /** 姓名4拼音 */
+    @Excel(name = "姓名4拼音")
+    private String name4P;
+
     /**
      * 性别4
      */
@@ -151,6 +171,10 @@ public class DaZfnyhkcg extends BaseEntity {
     @Excel(name = "姓名5")
     private String name5;
 
+    /** 姓名5拼音 */
+    @Excel(name = "姓名5拼音")
+    private String name5P;
+
     /**
      * 性别5
      */
@@ -245,6 +269,54 @@ public class DaZfnyhkcg extends BaseEntity {
      */
     private String flag;
 
+    public String getNameP() {
+        return nameP;
+    }
+
+    public void setNameP(String nameP) {
+        this.nameP = nameP;
+    }
+
+    public String getName1P() {
+        return name1P;
+    }
+
+    public void setName1P(String name1P) {
+        this.name1P = name1P;
+    }
+
+    public String getName2P() {
+        return name2P;
+    }
+
+    public void setName2P(String name2P) {
+        this.name2P = name2P;
+    }
+
+    public String getName3P() {
+        return name3P;
+    }
+
+    public void setName3P(String name3P) {
+        this.name3P = name3P;
+    }
+
+    public String getName4P() {
+        return name4P;
+    }
+
+    public void setName4P(String name4P) {
+        this.name4P = name4P;
+    }
+
+    public String getName5P() {
+        return name5P;
+    }
+
+    public void setName5P(String name5P) {
+        this.name5P = name5P;
+    }
+
     public String getFlag() {
         return flag;
     }

dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java

@@ -50,6 +50,10 @@ public class DaZqz extends BaseEntity
     @Excel(name = "申请人姓名")
     private String name;
 
+    /** 姓名拼音 */
+    @Excel(name = "姓名拼音")
+    private String nameP;
+
     /** 申请人身份证号 */
     @Excel(name = "申请人身份证号")
     private String cardId;
@@ -70,6 +74,10 @@ public class DaZqz extends BaseEntity
     @Excel(name = "姓名1")
     private String name1;
 
+    /** 姓名1拼音 */
+    @Excel(name = "姓名1拼音")
+    private String name1P;
+
     /** 性别1 */
     @Excel(name = "性别1")
     private String sex1;
@@ -90,6 +98,10 @@ public class DaZqz extends BaseEntity
     @Excel(name = "姓名2")
     private String name2;
 
+    /** 姓名2拼音 */
+    @Excel(name = "姓名2拼音")
+    private String name2P;
+
     /** 性别2 */
     @Excel(name = "性别2")
     private String sex2;
@@ -110,6 +122,10 @@ public class DaZqz extends BaseEntity
     @Excel(name = "姓名3")
     private String name3;
 
+    /** 姓名3拼音 */
+    @Excel(name = "姓名3拼音")
+    private String name3P;
+
     /** 出生日期3 */
     @Excel(name = "出生日期3")
     private String birthDate3;
@@ -130,6 +146,10 @@ public class DaZqz extends BaseEntity
     @Excel(name = "姓名4")
     private String name4;
 
+    /** 姓名4拼音 */
+    @Excel(name = "姓名4拼音")
+    private String name4P;
+
     /** 性别4 */
     @Excel(name = "性别4")
     private String sex4;
@@ -212,6 +232,46 @@ public class DaZqz extends BaseEntity
      */
     private String flag;
 
+    public String getNameP() {
+        return nameP;
+    }
+
+    public void setNameP(String nameP) {
+        this.nameP = nameP;
+    }
+
+    public String getName1P() {
+        return name1P;
+    }
+
+    public void setName1P(String name1P) {
+        this.name1P = name1P;
+    }
+
+    public String getName2P() {
+        return name2P;
+    }
+
+    public void setName2P(String name2P) {
+        this.name2P = name2P;
+    }
+
+    public String getName3P() {
+        return name3P;
+    }
+
+    public void setName3P(String name3P) {
+        this.name3P = name3P;
+    }
+
+    public String getName4P() {
+        return name4P;
+    }
+
+    public void setName4P(String name4P) {
+        this.name4P = name4P;
+    }
+
     public String getFlag() {
         return flag;
     }

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

@@ -10,8 +10,8 @@ import com.da.dangan.mapper.DaCatalogMapper;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.service.IDaBirthDjService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,11 +30,11 @@ import java.util.stream.Stream;
 @Service
 public class DaBirthDjServiceImpl implements IDaBirthDjService 
 {
-    @Autowired
+    @Resource
     private DaBirthDjMapper daBirthDjMapper;
-    @Autowired
+    @Resource
     private DaPicturesRecardMapper daPicturesRecardMapper;
-    @Autowired
+    @Resource
     private DaTaskMapper daTaskMapper;
     @Resource
     private DaCatalogMapper daCatalogMapper;
@@ -105,6 +105,16 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
                 }
             }
         }
+        //拼音转换
+        if(daBirthDj.getName() !=null){
+            daBirthDj.setNameP(ChineseToPinyin.toPinyin(daBirthDj.getName()));
+        }
+        if(daBirthDj.getfName() !=null){
+            daBirthDj.setfNameP(ChineseToPinyin.toPinyin(daBirthDj.getfName()));
+        }
+        if(daBirthDj.getmName() !=null){
+            daBirthDj.setmNameP(ChineseToPinyin.toPinyin(daBirthDj.getmName()));
+        }
         daBirthDj.setCreateTime(DateUtils.getNowDate());
         int i = daBirthDjMapper.insertDaBirthDj(daBirthDj);
 
@@ -143,6 +153,16 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daBirthDj.getName() !=null&&!daBirthDj.getName().trim().equals("")){
+            daBirthDj.setNameP(ChineseToPinyin.toPinyin(daBirthDj.getName().trim()));
+        }
+        if(daBirthDj.getfName() !=null&&!daBirthDj.getfName().trim().equals("")){
+            daBirthDj.setfNameP(ChineseToPinyin.toPinyin(daBirthDj.getfName().trim()));
+        }
+        if(daBirthDj.getmName() !=null&&!daBirthDj.getmName().trim().equals("")){
+            daBirthDj.setmNameP(ChineseToPinyin.toPinyin(daBirthDj.getmName().trim()));
+        }
         daBirthDj.setUpdateTime(DateUtils.getNowDate());
         return daBirthDjMapper.updateDaBirthDj(daBirthDj);
     }

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

@@ -10,6 +10,7 @@ import com.da.dangan.mapper.DaCzrkdjMapper;
 import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.service.IDaCzrkdjService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -114,7 +115,20 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
                 }
             }
         }
+
         daCzrkdj.setCreateTime(DateUtils.getNowDate());
+        if(daCzrkdj.getName() !=null&&!daCzrkdj.getName().trim().equals("")){
+            daCzrkdj.setNameP(ChineseToPinyin.toPinyin(daCzrkdj.getName().trim()));
+        }
+        if(daCzrkdj.getHzName() !=null&&!daCzrkdj.getName().trim().equals("")){
+            daCzrkdj.setHzP(ChineseToPinyin.toPinyin(daCzrkdj.getHzName().trim()));
+        }
+        if(daCzrkdj.getJhr1() !=null&&!daCzrkdj.getName().trim().equals("")){
+            daCzrkdj.setJhr1P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr1().trim()));
+        }
+        if(daCzrkdj.getJhr2()!=null&&!daCzrkdj.getName().trim().equals("")){
+            daCzrkdj.setJhr2P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr2().trim()));
+        }
         int i = daCzrkdjMapper.insertDaCzrkdj(daCzrkdj);
 
         //1-根据muId  查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值
@@ -152,6 +166,19 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService {
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daCzrkdj.getName() !=null){
+            daCzrkdj.setNameP(ChineseToPinyin.toPinyin(daCzrkdj.getName()));
+        }
+        if(daCzrkdj.getHzName() !=null){
+            daCzrkdj.setHzP(ChineseToPinyin.toPinyin(daCzrkdj.getHzName()));
+        }
+        if(daCzrkdj.getJhr1() !=null){
+            daCzrkdj.setJhr1P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr1()));
+        }
+        if(daCzrkdj.getJhr2()!=null){
+            daCzrkdj.setJhr2P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr2()));
+        }
         daCzrkdj.setUpdateTime(DateUtils.getNowDate());
         return daCzrkdjMapper.updateDaCzrkdj(daCzrkdj);
     }

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

@@ -10,6 +10,7 @@ import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaQyzMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.service.IDaQyzService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -104,7 +105,19 @@ public class DaQyzServiceImpl implements IDaQyzService
                 }
             }
         }
-
+        //拼音转换
+        if(daQyz.getName1() !=null){
+            daQyz.setName1P(ChineseToPinyin.toPinyin(daQyz.getName1()));
+        }
+        if(daQyz.getName2() !=null){
+            daQyz.setName2P(ChineseToPinyin.toPinyin(daQyz.getName2()));
+        }
+        if(daQyz.getName3() !=null){
+            daQyz.setName3P(ChineseToPinyin.toPinyin(daQyz.getName3()));
+        }
+        if(daQyz.getName4() !=null){
+            daQyz.setName4P(ChineseToPinyin.toPinyin(daQyz.getName4()));
+        }
         daQyz.setCreateTime(DateUtils.getNowDate());
         int i = daQyzMapper.insertDaQyz(daQyz);
         //1-根据muId  查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值
@@ -142,6 +155,19 @@ public class DaQyzServiceImpl implements IDaQyzService
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daQyz.getName1() !=null&&!daQyz.getName1().trim().equals("")){
+            daQyz.setName1P(ChineseToPinyin.toPinyin(daQyz.getName1().trim()));
+        }
+        if(daQyz.getName2() !=null&&!daQyz.getName2().trim().equals("")){
+            daQyz.setName2P(ChineseToPinyin.toPinyin(daQyz.getName2().trim()));
+        }
+        if(daQyz.getName3() !=null&&!daQyz.getName3().trim().equals("")){
+            daQyz.setName3P(ChineseToPinyin.toPinyin(daQyz.getName3().trim()));
+        }
+        if(daQyz.getName4() !=null&&!daQyz.getName4().trim().equals("")){
+            daQyz.setName4P(ChineseToPinyin.toPinyin(daQyz.getName4().trim()));
+        }
         daQyz.setUpdateTime(DateUtils.getNowDate());
         return daQyzMapper.updateDaQyz(daQyz);
     }

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

@@ -10,6 +10,7 @@ import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.mapper.DaYtzmMapper;
 import com.da.dangan.service.IDaYtzmService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,6 +106,13 @@ public class DaYtzmServiceImpl implements IDaYtzmService
                 }
             }
         }
+        //拼音转换
+        if(daYtzm.getmName() !=null){
+            daYtzm.setmNameP(ChineseToPinyin.toPinyin(daYtzm.getmName()));
+        }
+        if(daYtzm.getwName() !=null){
+            daYtzm.setwNameP(ChineseToPinyin.toPinyin(daYtzm.getwName()));
+        }
         daYtzm.setCreateTime(DateUtils.getNowDate());
         int i = daYtzmMapper.insertDaYtzm(daYtzm);
         //1-根据muId  查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值
@@ -143,6 +151,14 @@ public class DaYtzmServiceImpl implements IDaYtzmService
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daYtzm.getmName() !=null&&!daYtzm.getmName().trim().equals("")){
+            daYtzm.setmNameP(ChineseToPinyin.toPinyin(daYtzm.getmName().trim()));
+        }
+
+        if(daYtzm.getwName() !=null&&!daYtzm.getwName().trim().equals("")){
+            daYtzm.setwNameP(ChineseToPinyin.toPinyin(daYtzm.getwName().trim()));
+        }
         daYtzm.setUpdateTime(DateUtils.getNowDate());
         return daYtzmMapper.updateDaYtzm(daYtzm);
     }

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

@@ -10,6 +10,7 @@ import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.mapper.DaZfnyhkcgMapper;
 import com.da.dangan.service.IDaZfnyhkcgService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -104,6 +105,25 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
                 }
             }
         }
+        //拼音转换
+        if(daZfnyhkcg.getName() !=null){
+            daZfnyhkcg.setNameP(ChineseToPinyin.toPinyin(daZfnyhkcg.getName()));
+        }
+        if(daZfnyhkcg.getName1() !=null){
+            daZfnyhkcg.setName1P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName1()));
+        }
+        if(daZfnyhkcg.getName2() !=null){
+            daZfnyhkcg.setName2P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName2()));
+        }
+        if(daZfnyhkcg.getName3() !=null){
+            daZfnyhkcg.setName3P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName3()));
+        }
+        if(daZfnyhkcg.getName4() !=null){
+            daZfnyhkcg.setName4P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName4()));
+        }
+        if(daZfnyhkcg.getName5() !=null){
+            daZfnyhkcg.setName5P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName5()));
+        }
         daZfnyhkcg.setCreateTime(DateUtils.getNowDate());
         int i = daZfnyhkcgMapper.insertDaZfnyhkcg(daZfnyhkcg);
         //1-根据muId  查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值
@@ -141,6 +161,26 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daZfnyhkcg.getName() !=null&&!daZfnyhkcg.getName().trim().equals("")){
+            daZfnyhkcg.setNameP(ChineseToPinyin.toPinyin(daZfnyhkcg.getName().trim()));
+        }
+        if(daZfnyhkcg.getName1() !=null&&!daZfnyhkcg.getName1().trim().equals("")){
+            daZfnyhkcg.setName1P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName1().trim()));
+        }
+        if(daZfnyhkcg.getName2() !=null&&!daZfnyhkcg.getName2().trim().equals("")){
+            daZfnyhkcg.setName2P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName2().trim()));
+        }
+        if(daZfnyhkcg.getName3() !=null&&!daZfnyhkcg.getName3().trim().equals("")){
+            daZfnyhkcg.setName3P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName3().trim()));
+        }
+        if(daZfnyhkcg.getName4() !=null&&!daZfnyhkcg.getName4().trim().equals("")){
+            daZfnyhkcg.setName4P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName4().trim()));
+        }
+        if(daZfnyhkcg.getName5() !=null&&!daZfnyhkcg.getName5().trim().equals("")){
+            daZfnyhkcg.setName5P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName5().trim()));
+        }
+
         daZfnyhkcg.setUpdateTime(DateUtils.getNowDate());
         return daZfnyhkcgMapper.updateDaZfnyhkcg(daZfnyhkcg);
     }

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

@@ -10,6 +10,7 @@ import com.da.dangan.mapper.DaPicturesRecardMapper;
 import com.da.dangan.mapper.DaTaskMapper;
 import com.da.dangan.mapper.DaZqzMapper;
 import com.da.dangan.service.IDaZqzService;
+import com.da.dangan.util.ChineseToPinyin;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -105,6 +106,22 @@ public class DaZqzServiceImpl implements IDaZqzService
                 }
             }
         }
+        //拼音转换
+        if(daZqz.getName() !=null){
+            daZqz.setNameP(ChineseToPinyin.toPinyin(daZqz.getName()));
+        }
+        if(daZqz.getName1() !=null){
+            daZqz.setName1P(ChineseToPinyin.toPinyin(daZqz.getName1()));
+        }
+        if(daZqz.getName2() !=null){
+            daZqz.setName2P(ChineseToPinyin.toPinyin(daZqz.getName2()));
+        }
+        if(daZqz.getName3() !=null){
+            daZqz.setName3P(ChineseToPinyin.toPinyin(daZqz.getName3()));
+        }
+        if(daZqz.getName4() !=null){
+            daZqz.setName4P(ChineseToPinyin.toPinyin(daZqz.getName4()));
+        }
         daZqz.setCreateTime(DateUtils.getNowDate());
         int i = daZqzMapper.insertDaZqz(daZqz);
         //1-根据muId  查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值
@@ -142,6 +159,23 @@ public class DaZqzServiceImpl implements IDaZqzService
                 daPicturesRecardMapper.updateDaPicturesRecard(picturesRecard);
             }
         }
+        //拼音转换
+        if(daZqz.getName() !=null&&!daZqz.getName().trim().equals("")){
+            daZqz.setNameP(ChineseToPinyin.toPinyin(daZqz.getName().trim()));
+        }
+        if(daZqz.getName1() !=null&&!daZqz.getName1().trim().equals("")){
+            daZqz.setName1P(ChineseToPinyin.toPinyin(daZqz.getName1().trim()));
+        }
+        if(daZqz.getName2() !=null&&!daZqz.getName2().trim().equals("")){
+            daZqz.setName2P(ChineseToPinyin.toPinyin(daZqz.getName2().trim()));
+        }
+        if(daZqz.getName3() !=null&&!daZqz.getName3().trim().equals("")){
+            daZqz.setName3P(ChineseToPinyin.toPinyin(daZqz.getName3().trim()));
+        }
+        if(daZqz.getName4() !=null&&!daZqz.getName4().trim().equals("")){
+            daZqz.setName4P(ChineseToPinyin.toPinyin(daZqz.getName4().trim()));
+        }
+
         daZqz.setUpdateTime(DateUtils.getNowDate());
         return daZqzMapper.updateDaZqz(daZqz);
     }

dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java

@@ -9,6 +9,9 @@ import com.da.dangan.domain.*;
 import com.da.dangan.domain.vo.*;
 import com.da.dangan.service.*;
 import com.da.dangan.util.CallThirdInterface;
+import com.da.dangan.util.ChineseToPinyin;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -460,6 +463,266 @@ public class TimeTask {
         }
     }
     
+    /**
+     * 繁体字不能识别拼音，更改代码后，更新所有数据的拼音
+     */
+    public void updateDanganPinyin(){
+        //查询total数
+        Long total;
+        Integer pageNum;
+        Integer pageSize = 1000;
+        Long pages=0L;
+
+        //常住人口登记
+        pageNum = 1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaCzrkdj> daCzrkdjs = daCzrkdjService.selectDaCzrkdjList(null);
+        total = new PageInfo(daCzrkdjs).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaCzrkdj> czlists ;
+            if(i==1){
+                 czlists=daCzrkdjs;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                czlists = daCzrkdjService.selectDaCzrkdjList(null);
+            }
+            //逐个修改拼音
+            for(DaCzrkdj daCzrkdj:czlists){
+                boolean flag=false;
+                //拼音转换
+                if(daCzrkdj.getName() !=null&&!daCzrkdj.getName().trim().equals("")){
+                    daCzrkdj.setNameP(ChineseToPinyin.toPinyin(daCzrkdj.getName().trim()));
+                    flag=true;
+                }
+                if(daCzrkdj.getHzName() !=null&&!daCzrkdj.getName().trim().equals("")){
+                    daCzrkdj.setHzP(ChineseToPinyin.toPinyin(daCzrkdj.getHzName().trim()));
+                    flag=true;
+                }
+                if(daCzrkdj.getJhr1() !=null&&!daCzrkdj.getName().trim().equals("")){
+                    daCzrkdj.setJhr1P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr1().trim()));
+                    flag=true;
+                }
+                if(daCzrkdj.getJhr2()!=null&&!daCzrkdj.getName().trim().equals("")){
+                    daCzrkdj.setJhr2P(ChineseToPinyin.toPinyin(daCzrkdj.getJhr2().trim()));
+                    flag=true;
+                }
+                if(flag){
+                    daCzrkdjService.updateDaCzrkdj(daCzrkdj);
+                }
+            }
+        }
+
+        //出生医学证明
+        pageNum=1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaBirthDj> daBirthDjs = daBirthDjService.selectDaBirthDjList(null);
+        total = new PageInfo(daBirthDjs).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaBirthDj> birthlists ;
+            if(i==1){
+                birthlists=daBirthDjs;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                birthlists = daBirthDjService.selectDaBirthDjList(null);
+            }
+            //逐个修改拼音
+            for(DaBirthDj daBirthDj:birthlists){
+                boolean flag=false;
+                //拼音转换
+                if(daBirthDj.getName() !=null&&!daBirthDj.getName().trim().equals("")){
+                    daBirthDj.setNameP(ChineseToPinyin.toPinyin(daBirthDj.getName().trim()));
+                    flag=true;
+                }
+                if(daBirthDj.getfName() !=null&&!daBirthDj.getfName().trim().equals("")){
+                    daBirthDj.setfNameP(ChineseToPinyin.toPinyin(daBirthDj.getfName().trim()));
+                    flag=true;
+                }
+                if(daBirthDj.getmName() !=null&&!daBirthDj.getmName().trim().equals("")){
+                    daBirthDj.setmNameP(ChineseToPinyin.toPinyin(daBirthDj.getmName().trim()));
+                    flag=true;
+                }
+                if(flag){
+                    daBirthDjService.updateDaBirthDj(daBirthDj);
+                }
+            }
+        }
+
+        //迁移证
+        pageNum=1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaQyz> daQyzs = daQyzService.selectDaQyzList(null);
+        total = new PageInfo(daQyzs).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaQyz> qyzList ;
+            if(i==1){
+                qyzList=daQyzs;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                qyzList = daQyzService.selectDaQyzList(null);
+            }
+            //逐个修改拼音
+            for(DaQyz daQyz:qyzList){
+                boolean flag=false;
+                //拼音转换
+                if(daQyz.getName1() !=null&&!daQyz.getName1().trim().equals("")){
+                    daQyz.setName1P(ChineseToPinyin.toPinyin(daQyz.getName1().trim()));
+                    flag=true;
+                }
+                if(daQyz.getName2() !=null&&!daQyz.getName2().trim().equals("")){
+                    daQyz.setName2P(ChineseToPinyin.toPinyin(daQyz.getName2().trim()));
+                    flag=true;
+                }
+                if(daQyz.getName3() !=null&&!daQyz.getName3().trim().equals("")){
+                    daQyz.setName3P(ChineseToPinyin.toPinyin(daQyz.getName3().trim()));
+                    flag=true;
+                }
+                if(daQyz.getName4() !=null&&!daQyz.getName4().trim().equals("")){
+                    daQyz.setName4P(ChineseToPinyin.toPinyin(daQyz.getName4().trim()));
+                    flag=true;
+                }
+                if(flag){
+                    daQyzService.updateDaQyz(daQyz);
+                }
+            }
+        }
+
+        //一胎证明
+        pageNum=1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaYtzm> daYtzms = daYtzmService.selectDaYtzmList(null);
+        total = new PageInfo(daYtzms).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaYtzm> ytzmList ;
+            if(i==1){
+                ytzmList=daYtzms;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                ytzmList = daYtzmService.selectDaYtzmList(null);
+            }
+            //逐个修改拼音
+            for(DaYtzm daYtzm:ytzmList){
+                boolean flag=false;
+                //拼音转换
+                if(daYtzm.getmName() !=null&&!daYtzm.getmName().trim().equals("")){
+                    daYtzm.setmNameP(ChineseToPinyin.toPinyin(daYtzm.getmName().trim()));
+                    flag=true;
+                }
+
+                if(daYtzm.getwName() !=null&&!daYtzm.getwName().trim().equals("")){
+                    daYtzm.setwNameP(ChineseToPinyin.toPinyin(daYtzm.getwName().trim()));
+                    flag=true;
+                }
+
+                if(flag){
+                    daYtzmService.updateDaYtzm(daYtzm);
+                }
+            }
+        }
+        //转非
+        pageNum=1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaZfnyhkcg> daZfnyhkcgs = daZfnyhkcgService.selectDaZfnyhkcgList(null);
+        total = new PageInfo(daZfnyhkcgs).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaZfnyhkcg> zfnyhkcgList ;
+            if(i==1){
+                zfnyhkcgList=daZfnyhkcgs;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                zfnyhkcgList =daZfnyhkcgService.selectDaZfnyhkcgList(null);
+            }
+            //逐个修改拼音
+            for(DaZfnyhkcg daZfnyhkcg:zfnyhkcgList){
+                boolean flag=false;
+                //拼音转换
+                if(daZfnyhkcg.getName() !=null&&!daZfnyhkcg.getName().trim().equals("")){
+                    daZfnyhkcg.setNameP(ChineseToPinyin.toPinyin(daZfnyhkcg.getName().trim()));
+                    flag=true;
+                }
+                if(daZfnyhkcg.getName1() !=null&&!daZfnyhkcg.getName1().trim().equals("")){
+                    daZfnyhkcg.setName1P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName1().trim()));
+                    flag=true;
+                }
+                if(daZfnyhkcg.getName2() !=null&&!daZfnyhkcg.getName2().trim().equals("")){
+                    daZfnyhkcg.setName2P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName2().trim()));
+                    flag=true;
+                }
+                if(daZfnyhkcg.getName3() !=null&&!daZfnyhkcg.getName3().trim().equals("")){
+                    daZfnyhkcg.setName3P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName3().trim()));
+                    flag=true;
+                }
+                if(daZfnyhkcg.getName4() !=null&&!daZfnyhkcg.getName4().trim().equals("")){
+                    daZfnyhkcg.setName4P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName4().trim()));
+                    flag=true;
+                }
+                if(daZfnyhkcg.getName5() !=null&&!daZfnyhkcg.getName5().trim().equals("")){
+                    daZfnyhkcg.setName5P(ChineseToPinyin.toPinyin(daZfnyhkcg.getName5().trim()));
+                    flag=true;
+                }
+
+                if(flag){
+                    daZfnyhkcgService.updateDaZfnyhkcg(daZfnyhkcg);
+                }
+            }
+        }
+        //准迁证
+        pageNum=1;
+        PageHelper.startPage(pageNum, pageSize);
+        List<DaZqz> daZqzs = daZqzService.selectDaZqzList(null);
+        total = new PageInfo(daZqzs).getTotal();
+        pages = total%pageSize==0?total/pageSize:total/pageSize+1;
+        for(int i=pageNum;i<=pages.intValue();i++){
+            List<DaZqz> zqzList ;
+            if(i==1){
+                zqzList=daZqzs;
+            }else{
+                PageHelper.startPage(i, pageSize);
+                zqzList = daZqzService.selectDaZqzList(null);
+            }
+            //逐个修改拼音
+            for(DaZqz zqz:zqzList){
+                boolean flag=false;
+                //拼音转换
+                if(zqz.getName() !=null&&!zqz.getName().trim().equals("")){
+                    zqz.setNameP(ChineseToPinyin.toPinyin(zqz.getName().trim()));
+                    flag=true;
+                }
+                if(zqz.getName1() !=null&&!zqz.getName1().trim().equals("")){
+                    zqz.setName1P(ChineseToPinyin.toPinyin(zqz.getName1().trim()));
+                    flag=true;
+                }
+                if(zqz.getName2() !=null&&!zqz.getName2().trim().equals("")){
+                    zqz.setName2P(ChineseToPinyin.toPinyin(zqz.getName2().trim()));
+                    flag=true;
+                }
+                if(zqz.getName3() !=null&&!zqz.getName3().trim().equals("")){
+                    zqz.setName3P(ChineseToPinyin.toPinyin(zqz.getName3().trim()));
+                    flag=true;
+                }
+                if(zqz.getName4() !=null&&!zqz.getName4().trim().equals("")){
+                    zqz.setName4P(ChineseToPinyin.toPinyin(zqz.getName4().trim()));
+                    flag=true;
+                }
+
+                if(flag){
+                    daZqzService.updateDaZqz(zqz);
+                }
+            }
+        }
+
+        //执行完毕
+        System.out.println("TimeTask.updateDanganPinyin.over");
+    }
+
+    /**
+     * @param taskId
+     * @throws Exception
+     */
     public void clearThirdTaskResult(Long taskId) throws Exception {
         String result = CallThirdInterface.callThirdInterfaceClearByTaskId(url4, taskId);
         //! 解析JSON字符串,获取键对应的值

dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java

@@ -21,7 +21,7 @@ public class ChineseToPinyin {
             if (ch > 128) {
                 try {
                     String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch, format);
-                    if (pinyinArray != null) {
+                    if (pinyinArray != null && pinyinArray.length>0) {
                         sb.append(pinyinArray[0]);
                     } else {
                         sb.append(ch);

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

@@ -239,16 +239,16 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="birthNum != null">#{birthNum},</if>
-            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
+            <if test="name != null">#{name}, #{nameP} ,</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="sex != null">#{sex},</if>
             <if test="bornAddress != null">#{bornAddress},</if>
-            <if test="mName != null">#{mName},to_pinyin ( #{mName} ),</if>
+            <if test="mName != null">#{mName}, #{mNameP} ,</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},to_pinyin ( #{fName} ),</if>
+            <if test="fName != null">#{fName}, #{fNameP},</if>
             <if test="fAge != null">#{fAge},</if>
             <if test="fGj != null">#{fGj},</if>
             <if test="fNation != null">#{fNation},</if>
@@ -283,16 +283,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},name_p = to_pinyin ( #{name} ),</if>
+            <if test="name != null">name = #{name},name_p = #{nameP},</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},m_name_p = to_pinyin ( #{mName} ),</if>
+            <if test="mName != null">m_name = #{mName},m_name_p = #{mNameP} ,</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},f_name_p = to_pinyin ( #{fName} ),</if>
+            <if test="fName != null">f_name = #{fName},f_name_p =  #{fNameP} ,</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

@@ -141,7 +141,7 @@
             <if test="sljmsfzqm != null  and sljmsfzqm != ''">and sljmsfzqm = #{sljmsfzqm}</if>
             <if test="qfyj != null  and qfyj != ''">and qfyj = #{qfyj}</if>
             <if test="yxrq != null  and yxrq != ''">and yxrq = #{yxrq}</if>
-            <if test="picIds != null  and picIds != ''">and pic_ids =#{picIds}</if>
+            <if test="picIds != null  and picIds != ''">and pic_ids = #{picIds}</if>
             <if test="pictures != null  and pictures != ''">and pictures = #{pictures}</if>
             <if test="allPicIds != null  and allPicIds != ''">and all_pic_ids = #{allPicIds}</if>
             <if test="allPics != null  and allPics != ''">and all_pics = #{allPics}</if>
@@ -313,13 +313,14 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="relation != null">#{relation},</if>
-            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
+           <!-- <if test="name != null">#{name},to_pinyin ( #{name} ),</if>-->
+            <if test="name != null">#{name}, #{nameP},</if>
             <if test="otherName != null">#{otherName},</if>
             <if test="usedName != null">#{usedName},</if>
             <if test="sex != null">#{sex},</if>
-            <if test="jhr1 != null">#{jhr1},to_pinyin ( #{jhr1} ),</if>
+            <if test="jhr1 != null">#{jhr1}, #{jhr1P},</if>
             <if test="jhgx1 != null">#{jhgx1},</if>
-            <if test="jhr2 != null">#{jhr2},to_pinyin ( #{jhr2} ),</if>
+            <if test="jhr2 != null">#{jhr2},#{jhr2P},</if>
             <if test="jhgx2 != null">#{jhgx2},</if>
             <if test="gmcszqfrq != null">#{gmcszqfrq},</if>
             <if test="birthday != null">#{birthday},</if>
@@ -341,7 +342,7 @@
             <if test="hkdjsxbgjznrsjjblrz2 != null">#{hkdjsxbgjznrsjjblrz2},</if>
             <if test="jiguan != null">#{jiguan},</if>
             <if test="xzz != null">#{xzz},</if>
-            <if test="hzName != null">#{hzName},to_pinyin ( #{hzName} ),</if>
+            <if test="hzName != null">#{hzName}, #{hzP},</if>
             <if test="hb != null">#{hb},</if>
             <if test="djrq != null">#{djrq},</if>
             <if test="byzk != null">#{byzk},</if>
@@ -378,13 +379,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},name_p = to_pinyin ( #{name} ),</if>
+            <if test="name != null">name = #{name},name_p =  #{nameP} ,</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},jhr1_p = to_pinyin ( #{jhr1} ),</if>
+            <if test="jhr1 != null">jhr1 = #{jhr1},jhr1_p =  #{jhr1P},</if>
             <if test="jhgx1 != null">jhgx1 = #{jhgx1},</if>
-            <if test="jhr2 != null">jhr2 = #{jhr2},jhr2_p = to_pinyin ( #{jhr2} ),</if>
+            <if test="jhr2 != null">jhr2 = #{jhr2},jhr2_p = #{jhr2P},</if>
             <if test="jhgx2 != null">jhgx2 = #{jhgx2},</if>
             <if test="gmcszqfrq != null">gmcszqfrq = #{gmcszqfrq},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
@@ -406,7 +407,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},hz_p = to_pinyin ( #{hzName} ),</if>
+            <if test="hzName != null">hz_name = #{hzName},hz_p =  #{hzP},</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

@@ -252,16 +252,16 @@
             <if test="muPath != null">#{muPath},</if>
             <if test="fwUnit != null">#{fwUnit},</if>
             <if test="wjXh != null">#{wjXh},</if>
-            <if test="name1 != null">#{name1},to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">#{name1}, #{name1P} ,</if>
             <if test="sex1 != null">#{sex1},</if>
             <if test="cardId1 != null">#{cardId1},</if>
-            <if test="name2 != null">#{name2},to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">#{name2}, #{name2P} ,</if>
             <if test="sex2 != null">#{sex2},</if>
             <if test="cardId2 != null">#{cardId2},</if>
-            <if test="name3 != null">#{name3},to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">#{name3},#{name3P},</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="cardId3 != null">#{cardId3},</if>
-            <if test="name4 != null">#{name4},to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">#{name4},#{name4P},</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="cardId4 != null">#{cardId4},</if>
             <if test="qyReason != null">#{qyReason},</if>
@@ -296,16 +296,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}, name1_p = to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">name1 = #{name1}, name1_p =  #{name1P},</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
             <if test="cardId1 != null">card_id1 = #{cardId1},</if>
-            <if test="name2 != null">name2 = #{name2},name2_p = to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">name2 = #{name2},name2_p = #{name2P},</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
             <if test="cardId2 != null">card_id2 = #{cardId2},</if>
-            <if test="name3 != null">name3 = #{name3},name3_p = to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">name3 = #{name3},name3_p = #{name3P},</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="cardId3 != null">card_id3 = #{cardId3},</if>
-            <if test="name4 != null">name4 = #{name4},name4_p = to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = #{name4P},</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

@@ -216,10 +216,10 @@
             <if test="muPath != null">#{muPath},</if>
             <if test="year != null">#{year},</if>
             <if test="xh != null">#{xh},</if>
-            <if test="wName != null">#{wName},to_pinyin ( #{wName} ),</if>
+            <if test="wName != null">#{wName}, #{wNameP} ,</if>
             <if test="wUnit != null">#{wUnit},</if>
             <if test="wCardId != null">#{wCardId},</if>
-            <if test="mName != null">#{mName},to_pinyin ( #{mName} ),</if>
+            <if test="mName != null">#{mName}, #{mNameP} ,</if>
             <if test="mUnit != null">#{mUnit},</if>
             <if test="mCardId != null">#{mCardId},</if>
             <if test="syzh != null">#{syzh},</if>
@@ -256,10 +256,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},w_name_p = to_pinyin ( #{wName} ),</if>
+            <if test="wName != null">w_name = #{wName},w_name_p =  #{wNameP} ,</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},m_name_p = to_pinyin ( #{mName} ),</if>
+            <if test="mName != null">m_name = #{mName},m_name_p =  #{mNameP},</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

@@ -151,7 +151,7 @@
                  ))
                  )-->
                 and (
-                name_p LIKE #{name}
+                name_p  LIKE #{name}
                 or
                 name1_p LIKE #{name}
                 or
@@ -261,22 +261,22 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="num != null">#{num},</if>
-            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
+            <if test="name != null">#{name}, #{nameP} ,</if>
             <if test="address != null">#{address},</if>
             <if test="relation1 != null">#{relation1},</if>
-            <if test="name1 != null">#{name1},to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">#{name1},#{name1P},</if>
             <if test="sex1 != null">#{sex1},</if>
             <if test="relation2 != null">#{relation2},</if>
-            <if test="name2 != null">#{name2},to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">#{name2},#{name2P},</if>
             <if test="sex2 != null">#{sex2},</if>
             <if test="relation3 != null">#{relation3},</if>
-            <if test="name3 != null">#{name3},to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">#{name3},#{name3P},</if>
             <if test="sex3 != null">#{sex3},</if>
             <if test="relation4 != null">#{relation4},</if>
-            <if test="name4 != null">#{name4},to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">#{name4},#{name4P},</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="relation5 != null">#{relation5},</if>
-            <if test="name5 != null">#{name5},to_pinyin ( #{name5} ),</if>
+            <if test="name5 != null">#{name5},#{name5P},</if>
             <if test="sex5 != null">#{sex5},</if>
             <if test="jg1 != null">#{jg1},</if>
             <if test="jg2 != null">#{jg2},</if>
@@ -307,22 +307,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}, name_p = to_pinyin ( #{name} ),</if>
+            <if test="name != null">name = #{name}, name_p = #{nameP},</if>
             <if test="address != null">address = #{address},</if>
             <if test="relation1 != null">relation1 = #{relation1},</if>
-            <if test="name1 != null">name1 = #{name1},name1_p = to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">name1 = #{name1},name1_p = #{name1P},</if>
             <if test="sex1 != null">sex1 = #{sex1},</if>
             <if test="relation2 != null">relation2 = #{relation2},</if>
-            <if test="name2 != null">name2 = #{name2},name2_p = to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">name2 = #{name2},name2_p = #{name2P},</if>
             <if test="sex2 != null">sex2 = #{sex2},</if>
             <if test="relation3 != null">relation3 = #{relation3},</if>
-            <if test="name3 != null">name3 = #{name3},name3_p = to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">name3 = #{name3},name3_p = #{name3P},</if>
             <if test="sex3 != null">sex3 = #{sex3},</if>
             <if test="relation4 != null">relation4 = #{relation4},</if>
-            <if test="name4 != null">name4 = #{name4},name4_p = to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = #{name4P},</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
             <if test="relation5 != null">relation5 = #{relation5},</if>
-            <if test="name5 != null">name5 = #{name5},name5_p = to_pinyin ( #{name5} ),</if>
+            <if test="name5 != null">name5 = #{name5},name5_p = #{name5P},</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

@@ -168,7 +168,7 @@
                 or birth_date4 like concat('%', #{name}, '%')
                 )-->
                 and (
-                name_p LIKE #{name}
+                name_p  LIKE #{name}
                 or
                 name1_p LIKE #{name}
                 or
@@ -293,27 +293,27 @@
             <if test="muId != null">#{muId},</if>
             <if test="muPath != null">#{muPath},</if>
             <if test="num != null">#{num},</if>
-            <if test="name != null">#{name},to_pinyin ( #{name} ),</if>
+            <if test="name != null">#{name}, #{nameP} ,</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},to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">#{name1}, #{name1P} ,</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},to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">#{name2},#{name2P},</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},to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">#{name3},#{name3P},</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},to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">#{name4},#{name4P},</if>
             <if test="sex4 != null">#{sex4},</if>
             <if test="birthDate4 != null">#{birthDate4},</if>
             <if test="cardId4 != null">#{cardId4},</if>
@@ -348,27 +348,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}, name_p = to_pinyin ( #{name} ),</if>
+            <if test="name != null">name = #{name}, name_p =  #{nameP},</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},name1_p = to_pinyin ( #{name1} ),</if>
+            <if test="name1 != null">name1 = #{name1},name1_p =  #{name1P},</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},name2_p = to_pinyin ( #{name2} ),</if>
+            <if test="name2 != null">name2 = #{name2},name2_p =  #{name2P},</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},name3_p = to_pinyin ( #{name3} ),</if>
+            <if test="name3 != null">name3 = #{name3},name3_p =  #{name3P},</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},name4_p = to_pinyin ( #{name4} ),</if>
+            <if test="name4 != null">name4 = #{name4},name4_p = #{name4P},</if>
             <if test="sex4 != null">sex4 = #{sex4},</if>
             <if test="birthDate4 != null">birth_date4 = #{birthDate4},</if>
             <if test="cardId4 != null">card_id4 = #{cardId4},</if>