841303dd by 夏齐

首次提交

1 parent fa591ecb
...@@ -319,10 +319,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -319,10 +319,7 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
319 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC")); 319 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC"));
320 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL")); 320 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL"));
321 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH")); 321 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH"));
322 String ISDZ=regBusBdcqzsdjxxMapper.selectIsDz(ywh); 322 if(map.get("FJ")!=null){
323 if(ISDZ.equals("1")&&map.get("ZTS")!=null&&map.get("FJ")!=null){
324 documentMap.put("fj", "业务号:"+ywh+";"+map.get("FJ")+";"+map.get("ZTS"));
325 }else if(map.get("FJ")!=null){
326 documentMap.put("fj", "业务号:"+ywh+";"+map.get("FJ")); 323 documentMap.put("fj", "业务号:"+ywh+";"+map.get("FJ"));
327 }else if(map.get("ZTS")!=null){ 324 }else if(map.get("ZTS")!=null){
328 documentMap.put("fj", "业务号:"+ywh+";"+map.get("ZTS")); 325 documentMap.put("fj", "业务号:"+ywh+";"+map.get("ZTS"));
...@@ -533,39 +530,51 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen ...@@ -533,39 +530,51 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
533 for (int k = 0; k < zsbh.length; k++) { 530 for (int k = 0; k < zsbh.length; k++) {
534 String qlr[] = allQlrmc.split(","); 531 String qlr[] = allQlrmc.split(",");
535 String zjh[] = allZjh.split(","); 532 String zjh[] = allZjh.split(",");
536 String qlbl[] = allQlbl.split(","); 533 Map hashMap = new HashMap(map);
534
535 if(StringUtils.isNotBlank(allGyfs)){
537 String gyfs[] = allGyfs.split(","); 536 String gyfs[] = allGyfs.split(",");
537 hashMap.put("GYFS", gyfs[k]);
538 if("2".equals(gyfs[k])){
539 if(StringUtils.isNotBlank(allQlbl)){
540 String qlbl[] = allQlbl.split(",");
541 hashMap.put("QLBL", qlbl[k]);
542 }
543 }
544 }
538 545
539 Map hashMap = new HashMap(map);
540 hashMap.put("QLRMC", qlr[k]); 546 hashMap.put("QLRMC", qlr[k]);
541 hashMap.put("BH", zsbh[k]); 547 hashMap.put("BH", zsbh[k]);
542 hashMap.put("ZJH", zjh[k]); 548 hashMap.put("ZJH", zjh[k]);
543 hashMap.put("QLBL", qlbl[k]);
544 hashMap.put("GYFS", gyfs[k]);
545 549
546 List list1 = Arrays.asList(qlr); 550 List list1 = Arrays.asList(qlr);
547 List arrList = new ArrayList(list1); 551 List arrList = new ArrayList(list1);
548 arrList.remove(qlr[k]); 552 arrList.remove(qlr[k]);
549 String gyr = StringUtils.join(arrList.toArray(), ","); 553 String gyr = StringUtils.join(arrList.toArray(), ",");
554 String qlqtzkNew=qlqtzk;
550 if (StringUtils.isNotBlank(qlqtzk)) { 555 if (StringUtils.isNotBlank(qlqtzk)) {
551 if(((String)map.get("BDCDYH")).contains("GX") || ((String)map.get("ZL")).contains("柴房") ){ 556 if(((String)map.get("BDCDYH")).contains("GX") || ((String)map.get("ZL")).contains("柴房") ){
552 qlqtzk=qlqtzk.substring(qlqtzk.indexOf(";")+1); 557 qlqtzkNew=qlqtzk.substring(qlqtzk.indexOf(";")+1);
558 }
559 String[] qlzkInfo = qlqtzkNew.split(";");
560 if("1003".equals(map.get("DJLX")) || "1004".equals(map.get("DJLX")) || "416".equals(map.get("DJLX"))){
561 if(((String)map.get("BDCDYH")).contains("GX") || ((String)map.get("ZL")).contains("柴房") ){
562 qlqtzkNew=qlzkInfo[0]+";"+qlzkInfo[1]+";"+qlzkInfo[2]+";"+qlzkInfo[3]+";"+qlzkInfo[4]+";"+qlzkInfo[5]+";共有情况: " + hashMap.get("GYQK");
563 }else{
564 qlqtzkNew=qlzkInfo[0]+";"+qlzkInfo[1]+";"+qlzkInfo[2]+";"+qlzkInfo[3]+";"+qlzkInfo[4]+";"+qlzkInfo[5]+";"+qlzkInfo[6]+";共有情况: " + hashMap.get("GYQK");
553 } 565 }
554 String[] qlzkInfo = qlqtzk.split(";");
555 if("1003".equals(map.get("DJLX")) || "1004".equals(map.get("DJLX"))){
556 qlqtzk=qlzkInfo[0]+";"+qlzkInfo[1]+";"+qlzkInfo[2]+";"+qlzkInfo[3]+";"+qlzkInfo[4]+";"+qlzkInfo[5]+";"+qlzkInfo[6]+";共有情况: " + hashMap.get("GYQK");
557 }else{ 566 }else{
558 for (int j = 0; j < qlzkInfo.length; j++) { 567 for (int j = 0; j < qlzkInfo.length; j++) {
559 if (qlzkInfo[j].contains("共有情况")) { 568 if (qlzkInfo[j].contains("共有情况")) {
560 qlzkInfo[j] = "共有情况: " + hashMap.get("GYQK"); 569 qlzkInfo[j] = "共有情况: " + hashMap.get("GYQK");
561 } 570 }
562 } 571 }
563 qlqtzk=StringUtils.join(qlzkInfo, ";"); 572 qlqtzkNew=StringUtils.join(qlzkInfo, ";");
564 } 573 }
565 if (arrList != null && arrList.size() > 0) { 574 if (arrList != null && arrList.size() > 0) {
566 hashMap.put("QLQTZK", qlqtzk + ";共有人:" + gyr); 575 hashMap.put("QLQTZK", qlqtzkNew + ";共有人:" + gyr);
567 } else { 576 } else {
568 hashMap.put("QLQTZK", qlqtzk); 577 hashMap.put("QLQTZK", qlqtzkNew);
569 } 578 }
570 if(StringUtils.isNotBlank((String)map.get("FJ"))) { 579 if(StringUtils.isNotBlank((String)map.get("FJ"))) {
571 hashMap.put("FJ", (String) map.get("FJ")); 580 hashMap.put("FJ", (String) map.get("FJ"));
......