Skip to content

夏齐 / hzbdcsyn

Go to a project
Toggle navigation
Toggle navigation pinning
d4d17f61 by zenglele
Options

修改

1 parent 2d47b366
Inline Side-by-side
Showing 3 changed files with 21 additions and 6 deletions
...@@ -315,10 +315,15 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -315,10 +315,15 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
315 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC")); 315 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC"));
316 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL")); 316 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL"));
317 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH")); 317 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH"));
318 if(map.get("ZTS")!=null){ 318 String ISDZ=regBusBdcqzsdjxxMapper.selectIsDz(ywh);
319 documentMap.put("fj", "业务号："+ywh+";"+map.get("ZTS")); 319 if(ISDZ.equals("1")&&map.get("ZTS")!=null&&map.get("FJ")!=null){
320 }else{ 320 documentMap.put("fj", "业务号："+ywh+";"+map.get("FJ")+";"+map.get("ZTS"));
321 }else if(map.get("FJ")!=null){
321 documentMap.put("fj", "业务号："+ywh+";"+map.get("FJ")); 322 documentMap.put("fj", "业务号："+ywh+";"+map.get("FJ"));
323 }else if(map.get("ZTS")!=null){
324 documentMap.put("fj", "业务号："+ywh+";"+map.get("ZTS"));
325 }else if(map.get("ZTS")==null&&map.get("FJ")==null){
326 documentMap.put("fj", "业务号："+ywh+";");
322 } 327 }
323 documentMap.put("qx", "汉台区"); 328 documentMap.put("qx", "汉台区");
324 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH")); 329 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH"));
...@@ -549,8 +554,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -549,8 +554,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
549 } else { 554 } else {
550 hashMap.put("QLQTZK", qlqtzk); 555 hashMap.put("QLQTZK", qlqtzk);
551 } 556 }
557 if(StringUtils.isNotBlank((String)map.get("FJ"))) {
552 hashMap.put("FJ", (String) map.get("FJ")); 558 hashMap.put("FJ", (String) map.get("FJ"));
553 } 559 }
560 }
554 list.add(hashMap); 561 list.add(hashMap);
555 } 562 }
556 } 563 }
...@@ -612,8 +619,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -612,8 +619,10 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
612 } else { 619 } else {
613 hashMap.put("QLQTZK", qlqtzk); 620 hashMap.put("QLQTZK", qlqtzk);
614 } 621 }
622 if(StringUtils.isNotBlank((String)map.get("FJ"))) {
615 hashMap.put("FJ", (String) map.get("FJ")); 623 hashMap.put("FJ", (String) map.get("FJ"));
616 } 624 }
625 }
617 list.add(hashMap); 626 list.add(hashMap);
618 } 627 }
619 } 628 }
...@@ -703,9 +712,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -703,9 +712,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
703 map.put("ZTS", "本次登记包含"+list.size()+"(套、间)"); 712 map.put("ZTS", "本次登记包含"+list.size()+"(套、间)");
704 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH")); 713 Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
705 if(qrlInfoMap!=null){ 714 if(qrlInfoMap!=null){
715 if(StringUtils.isNotBlank((String)map.get("FJ"))){
706 String FJ=(String)map.get("FJ"); 716 String FJ=(String)map.get("FJ");
707 map.put("ZJH",FJ.replace("&ldquo;", "“").replace("&rdquo;", "”")); 717 map.put("FJ",FJ.replace("&ldquo;", "“").replace("&rdquo;", "”"));
708 /* map.put("ZJH",qrlInfoMap.get("ZJH"));*/ 718 }
719 map.put("ZJH",qrlInfoMap.get("ZJH"));
709 } 720 }
710 return map; 721 return map;
711 } 722 }
......
...@@ -88,6 +88,6 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> { ...@@ -88,6 +88,6 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> {
88 88
89 Map getHInfo(@Param("bdcdyh")String bdcdyh); 89 Map getHInfo(@Param("bdcdyh")String bdcdyh);
90 90
91 91 String selectIsDz(@Param("ywh")String ywh);
92 92
93 } 93 }
......
...@@ -224,4 +224,8 @@ ...@@ -224,4 +224,8 @@
224 <select id="getHInfo" resultType="java.util.Map"> 224 <select id="getHInfo" resultType="java.util.Map">
225 select * from reg_base_h c where bdcdyh=#{bdcdyh} and islogout='0' and del_flag='0' 225 select * from reg_base_h c where bdcdyh=#{bdcdyh} and islogout='0' and del_flag='0'
226 </select> 226 </select>
227
228 <select id="selectIsDz" resultType="java.lang.String">
229 select ISDZ from reg_bus_sz where ywh=#{ywh} and del_flag='0'
230 </select>
227 </mapper> 231 </mapper>
......