|
@@ -212,8 +212,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -236,8 +239,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -254,8 +260,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -272,15 +281,21 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(statisticaldimension)){
|
|
|
if(isJSONArray(statisticaldimension)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(statisticaldimension);
|
|
|
- where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -447,8 +462,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -471,8 +489,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -489,8 +510,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -507,15 +531,21 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(statisticaldimension)){
|
|
|
if(isJSONArray(statisticaldimension)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(statisticaldimension);
|
|
|
- where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -674,8 +704,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -698,8 +731,11 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -716,8 +752,10 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|
|
@@ -734,15 +772,21 @@ public class personnelstatistics extends Controller {
|
|
|
if(StringUtils.isNotBlank(statisticaldimension)){
|
|
|
if(isJSONArray(statisticaldimension)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(statisticaldimension);
|
|
|
- where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1= where1+ " and (t1.class in"+jsonArrayResult+" or t1.subclass in"+jsonArrayResult+")";
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(sa_accountclassids)){
|
|
|
if(isJSONArray(sa_accountclassids)){
|
|
|
JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
|
|
|
- where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
- where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ if(!jsonArrayResult.isEmpty()){
|
|
|
+ where1=where1+ " and t1.sa_accountclassid in"+jsonArrayResult;
|
|
|
+ where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
sqlFactory.addParameter_SQL("where1",where1);
|