Skip to content

夏齐 / hzbdcsyn

Go to a project
Toggle navigation
Toggle navigation pinning
fa591ecb by 夏齐
Options

首次提交

1 parent efff58d3
Inline Side-by-side
Showing 2 changed files with 15 additions and 2 deletions
...@@ -282,7 +282,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -282,7 +282,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
282 jsonMap.put("categoryId", bdcqzslc); 282 jsonMap.put("categoryId", bdcqzslc);
283 283
284 documentMap.put("bdcqzh",zsbh); 284 documentMap.put("bdcqzh",zsbh);
285 documentMap.put("gyqk", map.get("GYQK")==null ? "": (String) map.get("GYQK")); 285 if("2".equals(map.get("GYFS"))){
286 documentMap.put("gyqk", map.get("GYQK")==null ? "": map.get("GYQK")+"比例："+map.get("QLBL")+"%");
287 }else{
288 documentMap.put("gyqk", map.get("GYQK")==null ? "": (String) map.get("GYQK"));
289 }
286 documentMap.put("qllx", map.get("QLLX")==null ? "": (String) map.get("QLLX")); 290 documentMap.put("qllx", map.get("QLLX")==null ? "": (String) map.get("QLLX"));
287 documentMap.put("qlxz", map.get("QLXZ")==null ? "": (String) map.get("QLXZ")); 291 documentMap.put("qlxz", map.get("QLXZ")==null ? "": (String) map.get("QLXZ"));
288 documentMap.put("yt", map.get("YT")==null ? "": (String) map.get("YT")); 292 documentMap.put("yt", map.get("YT")==null ? "": (String) map.get("YT"));
...@@ -522,14 +526,23 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -522,14 +526,23 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
522 if (qrlInfoMap != null) { 526 if (qrlInfoMap != null) {
523 String allQlrmc = (String) qrlInfoMap.get("QLRMC"); 527 String allQlrmc = (String) qrlInfoMap.get("QLRMC");
524 String allZjh = (String) qrlInfoMap.get("ZJH"); 528 String allZjh = (String) qrlInfoMap.get("ZJH");
529 String allQlbl = (String) qrlInfoMap.get("QLBL");
530 String allGyfs = (String) qrlInfoMap.get("GYFS");
531
525 if (StringUtils.isNotBlank(allQlrmc)) { 532 if (StringUtils.isNotBlank(allQlrmc)) {
526 for (int k = 0; k < zsbh.length; k++) { 533 for (int k = 0; k < zsbh.length; k++) {
527 String qlr[] = allQlrmc.split(","); 534 String qlr[] = allQlrmc.split(",");
528 String zjh[] = allZjh.split(","); 535 String zjh[] = allZjh.split(",");
536 String qlbl[] = allQlbl.split(",");
537 String gyfs[] = allGyfs.split(",");
538
529 Map hashMap = new HashMap(map); 539 Map hashMap = new HashMap(map);
530 hashMap.put("QLRMC", qlr[k]); 540 hashMap.put("QLRMC", qlr[k]);
531 hashMap.put("BH", zsbh[k]); 541 hashMap.put("BH", zsbh[k]);
532 hashMap.put("ZJH", zjh[k]); 542 hashMap.put("ZJH", zjh[k]);
543 hashMap.put("QLBL", qlbl[k]);
544 hashMap.put("GYFS", gyfs[k]);
545
533 List list1 = Arrays.asList(qlr); 546 List list1 = Arrays.asList(qlr);
534 List arrList = new ArrayList(list1); 547 List arrList = new ArrayList(list1);
535 arrList.remove(qlr[k]); 548 arrList.remove(qlr[k]);
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 and c.dbsj is not null 161 and c.dbsj is not null
162 </select> 162 </select>
163 <select id="getQlrInfoByYwh" resultType="java.util.Map"> 163 <select id="getQlrInfoByYwh" resultType="java.util.Map">
164 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh 164 select wm_concat(qlrmc) as qlrmc,wm_concat(zjh) as zjh,wm_concat(qlbl) as qlbl,wm_concat(gyfs) as gyfs from reg_bus_qlr c where ywh =#{ywh} and del_flag='0' and qszt='1' order by sxh
165 </select> 165 </select>
166 <select id="getQlrInfoByYwhAndqlr" resultType="java.lang.String"> 166 <select id="getQlrInfoByYwhAndqlr" resultType="java.lang.String">
167 select zjh from reg_bus_qlr c where ywh =#{ywh} and qlrmc=#{qlrmc} and del_flag='0' and qszt='1' order by sxh 167 select zjh from reg_bus_qlr c where ywh =#{ywh} and qlrmc=#{qlrmc} and del_flag='0' and qszt='1' order by sxh
......