cucu业绩目标回款明细增加查询4级区域

src/custom/restcontroller/webmanage/sale/salestarget_cucu/SQL/回款明细.sql

@@ -182,6 +182,14 @@ from sys_enterprise t1
          left join sa_agents t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
          left join sys_enterprise_tradefield t3 on t1.sys_enterpriseid = t3.sys_enterpriseid and t1.siteid = t3.siteid
          left join (select t1.sa_saleareaid, t3.areaname areaname1, t2.areaname areaname2, t1.areaname areaname3
+                    from sa_salearea t1
+                             inner join sa_salearea t2
+                                        on t1.siteid = t2.siteid and t1.parentid = t2.sa_saleareaid and t2.level = 3
+                             inner join sa_salearea t3
+                                        on t1.siteid = t2.siteid and t2.parentid = t3.sa_saleareaid and t3.level = 2
+                    where t1.siteid = $siteid$
+                    union all
+                    select t1.sa_saleareaid, t3.areaname areaname1, t2.areaname areaname2, t1.areaname areaname3
                     from sa_salearea t1
                              inner join sa_salearea t2
                                         on t1.siteid = t2.siteid and t1.parentid = t2.sa_saleareaid and t2.level = 2

src/custom/restcontroller/webmanage/sale/salestarget_cucu/performancetargetboard.java

@@ -466,14 +466,8 @@ public class performancetargetboard extends Controller {
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t2.status ='").append(whereObject.getString("status")).append("' ");
             }
-            if (whereObject.containsKey("areaname2") && !"".equals(whereObject.getString("areaname2"))) {
-                where.append(" and t4.areaname2 ='").append(whereObject.getString("areaname2")).append("' ");
-            }
             if (whereObject.containsKey("areaname3") && !"".equals(whereObject.getString("areaname3"))) {
-                where.append(" and t4.areaname3 ='").append(whereObject.getString("areaname3")).append("' ");
-            }
-            if (whereObject.containsKey("province") && !"".equals(whereObject.getString("province"))) {
-                where.append(" and t1.province ='").append(whereObject.getString("province")).append("' ");
+                where.append(" and (t4.areaname3 ='").append(whereObject.getString("areaname3")).append("' or t4.areaname2 ='").append(whereObject.getString("areaname3")).append("' )");
             }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "回款明细");