From 09d4d080c38c207aabc0e4af71bf7ca6c21de027 Mon Sep 17 00:00:00 2001 From: hansha Date: Wed, 25 Dec 2024 11:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=A3=E6=A1=88=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E6=8B=BC=E9=9F=B3=E8=BD=AC=E6=8D=A2=E2=80=94?= =?UTF-8?q?=E2=80=94=E4=B9=8B=E5=89=8D=E5=9C=A8mysql=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E4=B8=8D=E6=94=AF=E6=8C=81=E7=B9=81=E4=BD=93=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/da/dangan/domain/DaBirthDj.java | 36 +++ .../java/com/da/dangan/domain/DaCzrkdj.java | 48 ++++ .../main/java/com/da/dangan/domain/DaQyz.java | 49 ++++ .../java/com/da/dangan/domain/DaYtzm.java | 24 ++ .../java/com/da/dangan/domain/DaZfnyhkcg.java | 72 +++++ .../main/java/com/da/dangan/domain/DaZqz.java | 60 ++++ .../service/impl/DaBirthDjServiceImpl.java | 28 +- .../service/impl/DaCzrkdjServiceImpl.java | 27 ++ .../dangan/service/impl/DaQyzServiceImpl.java | 28 +- .../service/impl/DaYtzmServiceImpl.java | 16 ++ .../service/impl/DaZfnyhkcgServiceImpl.java | 40 +++ .../dangan/service/impl/DaZqzServiceImpl.java | 34 +++ .../java/com/da/dangan/timetask/TimeTask.java | 263 ++++++++++++++++++ .../com/da/dangan/util/ChineseToPinyin.java | 2 +- .../mapper/dangan/DaBirthDjMapper.xml | 12 +- .../mapper/dangan/DaCzrkdjMapper.xml | 19 +- .../resources/mapper/dangan/DaQyzMapper.xml | 16 +- .../resources/mapper/dangan/DaYtzmMapper.xml | 8 +- .../mapper/dangan/DaZfnyhkcgMapper.xml | 26 +- .../resources/mapper/dangan/DaZqzMapper.xml | 22 +- 20 files changed, 773 insertions(+), 57 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java index 8a5f649..142332e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaBirthDj.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index 322244e..8523a4c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java index 3b8776e..99367a7 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaQyz.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java index c9b3042..b2ba64b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaYtzm.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java index 962fa9b..9fa1c49 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZfnyhkcg.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java index 243d39a..e049aae 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaZqz.java +++ b/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; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java index 12865f5..8ec2fe8 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java index d3789c1..4ea147e 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java index 16b801b..8fa7737 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java index 91bacd8..6a818eb 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java index 50ceba0..5d53e4c 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java index 0e9f1e3..ef97535 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java @@ -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); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java b/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java index b436110..6ae9928 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/timetask/TimeTask.java +++ b/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; @@ -459,7 +462,267 @@ public class TimeTask { System.out.println("---------------------------------------调用upload_api上传接口异常:" + result); } } + + /** + * 繁体字不能识别拼音，更改代码后，更新所有数据的拼音 + */ + public void updateDanganPinyin(){ + //查询total数 + Long total; + Integer pageNum; + Integer pageSize = 1000; + Long pages=0L; + + //常住人口登记 + pageNum = 1; + PageHelper.startPage(pageNum, pageSize); + List 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 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 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 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 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 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 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 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 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 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 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 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字符串,获取键对应的值 diff --git a/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java b/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java index 0b06c8a..8328c1b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/util/ChineseToPinyin.java +++ b/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); diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 3438b63..70f0d5c 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -239,16 +239,16 @@ #{muId}, #{muPath}, #{birthNum}, - #{name},to_pinyin ( #{name} ), + #{name}, #{nameP} , #{birthday}, #{sex}, #{bornAddress}, - #{mName},to_pinyin ( #{mName} ), + #{mName}, #{mNameP} , #{mAge}, #{mGj}, #{mNation}, #{mCardId}, - #{fName},to_pinyin ( #{fName} ), + #{fName}, #{fNameP}, #{fAge}, #{fGj}, #{fNation}, @@ -283,16 +283,16 @@ mu_id = #{muId}, mu_path = #{muPath}, birth_num = #{birthNum}, - name = #{name},name_p = to_pinyin ( #{name} ), + name = #{name},name_p = #{nameP}, birthday = #{birthday}, sex = #{sex}, born_address = #{bornAddress}, - m_name = #{mName},m_name_p = to_pinyin ( #{mName} ), + m_name = #{mName},m_name_p = #{mNameP} , m_age = #{mAge}, m_gj = #{mGj}, m_nation = #{mNation}, m_card_id = #{mCardId}, - f_name = #{fName},f_name_p = to_pinyin ( #{fName} ), + f_name = #{fName},f_name_p = #{fNameP} , f_age = #{fAge}, f_gj = #{fGj}, f_nation = #{fNation}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index b73d8f0..1d26ea8 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -141,7 +141,7 @@ and sljmsfzqm = #{sljmsfzqm} and qfyj = #{qfyj} and yxrq = #{yxrq} - and pic_ids =#{picIds} + and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} and all_pics = #{allPics} @@ -313,13 +313,14 @@ #{muId}, #{muPath}, #{relation}, - #{name},to_pinyin ( #{name} ), + + #{name}, #{nameP}, #{otherName}, #{usedName}, #{sex}, - #{jhr1},to_pinyin ( #{jhr1} ), + #{jhr1}, #{jhr1P}, #{jhgx1}, - #{jhr2},to_pinyin ( #{jhr2} ), + #{jhr2},#{jhr2P}, #{jhgx2}, #{gmcszqfrq}, #{birthday}, @@ -341,7 +342,7 @@ #{hkdjsxbgjznrsjjblrz2}, #{jiguan}, #{xzz}, - #{hzName},to_pinyin ( #{hzName} ), + #{hzName}, #{hzP}, #{hb}, #{djrq}, #{byzk}, @@ -378,13 +379,13 @@ mu_id = #{muId}, mu_path = #{muPath}, relation = #{relation}, - name = #{name},name_p = to_pinyin ( #{name} ), + name = #{name},name_p = #{nameP} , other_name = #{otherName}, used_name = #{usedName}, sex = #{sex}, - jhr1 = #{jhr1},jhr1_p = to_pinyin ( #{jhr1} ), + jhr1 = #{jhr1},jhr1_p = #{jhr1P}, jhgx1 = #{jhgx1}, - jhr2 = #{jhr2},jhr2_p = to_pinyin ( #{jhr2} ), + jhr2 = #{jhr2},jhr2_p = #{jhr2P}, jhgx2 = #{jhgx2}, gmcszqfrq = #{gmcszqfrq}, birthday = #{birthday}, @@ -406,7 +407,7 @@ hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2}, jiguan = #{jiguan}, xzz = #{xzz}, - hz_name = #{hzName},hz_p = to_pinyin ( #{hzName} ), + hz_name = #{hzName},hz_p = #{hzP}, hb = #{hb}, djrq = #{djrq}, byzk = #{byzk}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index 14112d4..ca155ce 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -252,16 +252,16 @@ #{muPath}, #{fwUnit}, #{wjXh}, - #{name1},to_pinyin ( #{name1} ), + #{name1}, #{name1P} , #{sex1}, #{cardId1}, - #{name2},to_pinyin ( #{name2} ), + #{name2}, #{name2P} , #{sex2}, #{cardId2}, - #{name3},to_pinyin ( #{name3} ), + #{name3},#{name3P}, #{sex3}, #{cardId3}, - #{name4},to_pinyin ( #{name4} ), + #{name4},#{name4P}, #{sex4}, #{cardId4}, #{qyReason}, @@ -296,16 +296,16 @@ mu_path = #{muPath}, fw_unit = #{fwUnit}, wj_xh = #{wjXh}, - name1 = #{name1}, name1_p = to_pinyin ( #{name1} ), + name1 = #{name1}, name1_p = #{name1P}, sex1 = #{sex1}, card_id1 = #{cardId1}, - name2 = #{name2},name2_p = to_pinyin ( #{name2} ), + name2 = #{name2},name2_p = #{name2P}, sex2 = #{sex2}, card_id2 = #{cardId2}, - name3 = #{name3},name3_p = to_pinyin ( #{name3} ), + name3 = #{name3},name3_p = #{name3P}, sex3 = #{sex3}, card_id3 = #{cardId3}, - name4 = #{name4},name4_p = to_pinyin ( #{name4} ), + name4 = #{name4},name4_p = #{name4P}, sex4 = #{sex4}, card_id4 = #{cardId4}, qy_reason = #{qyReason}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml index 00e1f9b..140ee70 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml @@ -216,10 +216,10 @@ #{muPath}, #{year}, #{xh}, - #{wName},to_pinyin ( #{wName} ), + #{wName}, #{wNameP} , #{wUnit}, #{wCardId}, - #{mName},to_pinyin ( #{mName} ), + #{mName}, #{mNameP} , #{mUnit}, #{mCardId}, #{syzh}, @@ -256,10 +256,10 @@ mu_path = #{muPath}, year = #{year}, xh = #{xh}, - w_name = #{wName},w_name_p = to_pinyin ( #{wName} ), + w_name = #{wName},w_name_p = #{wNameP} , w_unit = #{wUnit}, w_card_id = #{wCardId}, - m_name = #{mName},m_name_p = to_pinyin ( #{mName} ), + m_name = #{mName},m_name_p = #{mNameP}, m_unit = #{mUnit}, m_card_id = #{mCardId}, syzh = #{syzh}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml index 216b040..0857e7b 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml +++ b/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 @@ #{muId}, #{muPath}, #{num}, - #{name},to_pinyin ( #{name} ), + #{name}, #{nameP} , #{address}, #{relation1}, - #{name1},to_pinyin ( #{name1} ), + #{name1},#{name1P}, #{sex1}, #{relation2}, - #{name2},to_pinyin ( #{name2} ), + #{name2},#{name2P}, #{sex2}, #{relation3}, - #{name3},to_pinyin ( #{name3} ), + #{name3},#{name3P}, #{sex3}, #{relation4}, - #{name4},to_pinyin ( #{name4} ), + #{name4},#{name4P}, #{sex4}, #{relation5}, - #{name5},to_pinyin ( #{name5} ), + #{name5},#{name5P}, #{sex5}, #{jg1}, #{jg2}, @@ -307,22 +307,22 @@ mu_id = #{muId}, mu_path = #{muPath}, num = #{num}, - name = #{name}, name_p = to_pinyin ( #{name} ), + name = #{name}, name_p = #{nameP}, address = #{address}, relation1 = #{relation1}, - name1 = #{name1},name1_p = to_pinyin ( #{name1} ), + name1 = #{name1},name1_p = #{name1P}, sex1 = #{sex1}, relation2 = #{relation2}, - name2 = #{name2},name2_p = to_pinyin ( #{name2} ), + name2 = #{name2},name2_p = #{name2P}, sex2 = #{sex2}, relation3 = #{relation3}, - name3 = #{name3},name3_p = to_pinyin ( #{name3} ), + name3 = #{name3},name3_p = #{name3P}, sex3 = #{sex3}, relation4 = #{relation4}, - name4 = #{name4},name4_p = to_pinyin ( #{name4} ), + name4 = #{name4},name4_p = #{name4P}, sex4 = #{sex4}, relation5 = #{relation5}, - name5 = #{name5},name5_p = to_pinyin ( #{name5} ), + name5 = #{name5},name5_p = #{name5P}, sex5 = #{sex5}, jg1 = #{jg1}, jg2 = #{jg2}, diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index 0d9863d..8c2371c 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/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 @@ #{muId}, #{muPath}, #{num}, - #{name},to_pinyin ( #{name} ), + #{name}, #{nameP} , #{cardId}, #{address}, #{djJg}, #{relation1}, - #{name1},to_pinyin ( #{name1} ), + #{name1}, #{name1P} , #{sex1}, #{birthDate1}, #{cardId1}, #{relation2}, - #{name2},to_pinyin ( #{name2} ), + #{name2},#{name2P}, #{sex2}, #{birthDate2}, #{cardId2}, #{relation3}, - #{name3},to_pinyin ( #{name3} ), + #{name3},#{name3P}, #{birthDate3}, #{sex3}, #{cardId3}, #{relation4}, - #{name4},to_pinyin ( #{name4} ), + #{name4},#{name4P}, #{sex4}, #{birthDate4}, #{cardId4}, @@ -348,27 +348,27 @@ mu_id = #{muId}, mu_path = #{muPath}, num = #{num}, - name = #{name}, name_p = to_pinyin ( #{name} ), + name = #{name}, name_p = #{nameP}, card_id = #{cardId}, address = #{address}, dj_jg = #{djJg}, relation1 = #{relation1}, - name1 = #{name1},name1_p = to_pinyin ( #{name1} ), + name1 = #{name1},name1_p = #{name1P}, sex1 = #{sex1}, birth_date1 = #{birthDate1}, card_id1 = #{cardId1}, relation2 = #{relation2}, - name2 = #{name2},name2_p = to_pinyin ( #{name2} ), + name2 = #{name2},name2_p = #{name2P}, sex2 = #{sex2}, birth_date2 = #{birthDate2}, card_id2 = #{cardId2}, relation3 = #{relation3}, - name3 = #{name3},name3_p = to_pinyin ( #{name3} ), + name3 = #{name3},name3_p = #{name3P}, birth_date3 = #{birthDate3}, sex3 = #{sex3}, card_id3 = #{cardId3}, relation4 = #{relation4}, - name4 = #{name4},name4_p = to_pinyin ( #{name4} ), + name4 = #{name4},name4_p = #{name4P}, sex4 = #{sex4}, birth_date4 = #{birthDate4}, card_id4 = #{cardId4},