fa591ecb by 夏齐

首次提交

1 parent efff58d3
......@@ -282,7 +282,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
jsonMap.put("categoryId", bdcqzslc);
documentMap.put("bdcqzh",zsbh);
documentMap.put("gyqk", map.get("GYQK")==null ? "": (String) map.get("GYQK"));
if("2".equals(map.get("GYFS"))){
documentMap.put("gyqk", map.get("GYQK")==null ? "": map.get("GYQK")+"比例:"+map.get("QLBL")+"%");
}else{
documentMap.put("gyqk", map.get("GYQK")==null ? "": (String) map.get("GYQK"));
}
documentMap.put("qllx", map.get("QLLX")==null ? "": (String) map.get("QLLX"));
documentMap.put("qlxz", map.get("QLXZ")==null ? "": (String) map.get("QLXZ"));
documentMap.put("yt", map.get("YT")==null ? "": (String) map.get("YT"));
......@@ -522,14 +526,23 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
if (qrlInfoMap != null) {
String allQlrmc = (String) qrlInfoMap.get("QLRMC");
String allZjh = (String) qrlInfoMap.get("ZJH");
String allQlbl = (String) qrlInfoMap.get("QLBL");
String allGyfs = (String) qrlInfoMap.get("GYFS");
if (StringUtils.isNotBlank(allQlrmc)) {
for (int k = 0; k < zsbh.length; k++) {
String qlr[] = allQlrmc.split(",");
String zjh[] = allZjh.split(",");
String qlbl[] = allQlbl.split(",");
String gyfs[] = allGyfs.split(",");
Map hashMap = new HashMap(map);
hashMap.put("QLRMC", qlr[k]);
hashMap.put("BH", zsbh[k]);
hashMap.put("ZJH", zjh[k]);
hashMap.put("QLBL", qlbl[k]);
hashMap.put("GYFS", gyfs[k]);
List list1 = Arrays.asList(qlr);
List arrList = new ArrayList(list1);
arrList.remove(qlr[k]);
......
......@@ -161,7 +161,7 @@
and c.dbsj is not null
</select>
<select id="getQlrInfoByYwh" resultType="java.util.Map">
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
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
</select>
<select id="getQlrInfoByYwhAndqlr" resultType="java.lang.String">
select zjh from reg_bus_qlr c where ywh =#{ywh} and qlrmc=#{qlrmc} and del_flag='0' and qszt='1' order by sxh
......