统计单位截取

src/main/java/com/founder/khtj/service/impl/IRycjtjServiceImpl.java

@@ -58,6 +58,9 @@ public class IRycjtjServiceImpl implements IRycjtjService {
             }else{//直接从具体单位——>人的采集信息
                 lrdwdm = code.substring(0, 12);
             }
+            if (unitcode.equals(code)){
+                lrdwdm = lrdwdm+"00";
+            }
             filterMap.put("lrdwdm",lrdwdm);
             List<RstBean> zycs = khtjDao.getZwzltjListrst(filterMap);
             if(zycs!=null&&zycs.size()>0){
@@ -183,20 +186,22 @@ public class IRycjtjServiceImpl implements IRycjtjService {
         List<UnitCodeBean> unitCodeBean=new ArrayList<UnitCodeBean>();
         Map<String, String> filterMap = new HashMap<String, String>();
         filterMap.put("code",unitcode);
-        if("0000000000".equals(unitcode.substring(2,12))){
-            if("460000000000".equals(unitcode)){
-                filterMap.put("sqlwhere","(pid='469000000000' or pid='46000000000' or pid='460000000000' or pid like '%#N/A%') and code<>'469000000000' and code<>'460000000001' and code<>'460000000000' AND (isparent='TRUE' OR isparent='true')");
-            }else{
-                filterMap.put("sqlwhere","(pid='"+unitcode+"' or pid like '#N/A') AND (isparent='TRUE' OR isparent='true')");
-            }
-        }else{
-            filterMap.put("sqlwhere","pid='"+unitcode+"'");
-        }
+//        if("0000000000".equals(unitcode.substring(2,12))){
+//            if("460000000000".equals(unitcode)){
+//                filterMap.put("sqlwhere","(pid='469000000000' or pid='46000000000' or pid='460000000000' or pid like '%#N/A%') and code<>'469000000000' and code<>'460000000001' and code<>'460000000000' AND (isparent='TRUE' OR isparent='true')");
+//            }else{
+//                filterMap.put("sqlwhere","(pid='"+unitcode+"' or pid like '#N/A') AND (isparent='TRUE' OR isparent='true')");
+//            }
+//        }else{
+//            filterMap.put("sqlwhere","pid='"+unitcode+"' or code ='"+unitcode+"'");
+            filterMap.put("sqlwhere","code like '"+getTjdw(unitcode)+"'");
+//        }
         unitCodeBean = khtjDao.getUnitCodeList(filterMap);
-        if(unitCodeBean==null||unitCodeBean.size()<=0){
+         if(unitCodeBean==null||unitCodeBean.size()<=0){
             filterMap.put("sqlwhere","code='"+unitcode+"'");
             unitCodeBean = khtjDao.getUnitCodeList(filterMap);
         }
+
         return unitCodeBean;
     }
 
@@ -208,11 +213,11 @@ public class IRycjtjServiceImpl implements IRycjtjService {
         }else{
             //根据统计单位代码进行判断
             if (tjdw.substring(2, 12).equals("0000000000")) {//省
-                result = tjdw.substring(0, 2) + "__%";
+                result = tjdw.substring(0, 2) + "__%00000000";
             } else if (tjdw.substring(4, 12).equals("00000000")) {//市
-                result = tjdw.substring(0, 4) + "__%";
+                result = tjdw.substring(0, 4) + "__%000000";
             }else if(tjdw.substring(6, 12).equals("000000")){ //县
-                result = tjdw.substring(0, 6) + "__%";
+                result = tjdw.substring(0, 6) + "__%0000";
             }else{//直接从具体单位——>人的采集信息
                 result = tjdw;
             }