2d47b366 by zenglele

修改

1 parent 6447f4bb
...@@ -318,7 +318,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -318,7 +318,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
318 if(map.get("ZTS")!=null){ 318 if(map.get("ZTS")!=null){
319 documentMap.put("fj", "业务号:"+ywh+";"+map.get("ZTS")); 319 documentMap.put("fj", "业务号:"+ywh+";"+map.get("ZTS"));
320 }else{ 320 }else{
321 documentMap.put("fj", "业务号:"+ywh); 321 documentMap.put("fj", "业务号:"+ywh+";"+map.get("FJ"));
322 } 322 }
323 documentMap.put("qx", "汉台区"); 323 documentMap.put("qx", "汉台区");
324 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH")); 324 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH"));
...@@ -549,6 +549,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -549,6 +549,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
549 } else { 549 } else {
550 hashMap.put("QLQTZK", qlqtzk); 550 hashMap.put("QLQTZK", qlqtzk);
551 } 551 }
552 hashMap.put("FJ", (String) map.get("FJ"));
552 } 553 }
553 list.add(hashMap); 554 list.add(hashMap);
554 } 555 }
...@@ -611,6 +612,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -611,6 +612,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
611 } else { 612 } else {
612 hashMap.put("QLQTZK", qlqtzk); 613 hashMap.put("QLQTZK", qlqtzk);
613 } 614 }
615 hashMap.put("FJ", (String) map.get("FJ"));
614 } 616 }
615 list.add(hashMap); 617 list.add(hashMap);
616 } 618 }
...@@ -701,7 +703,9 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -701,7 +703,9 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
701 map.put("ZTS", "本次登记包含"+list.size()+"(套、间)"); 703 map.put("ZTS", "本次登记包含"+list.size()+"(套、间)");
702 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH")); 704 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
703 if(qrlInfoMap!=null){ 705 if(qrlInfoMap!=null){
704 map.put("ZJH",qrlInfoMap.get("ZJH")); 706 String FJ=(String)map.get("FJ");
707 map.put("ZJH",FJ.replace("&ldquo;", "“").replace("&rdquo;", "”"));
708 /* map.put("ZJH",qrlInfoMap.get("ZJH"));*/
705 } 709 }
706 return map; 710 return map;
707 } 711 }
......