|
@@ -166,14 +166,25 @@ public class enterprisetarget extends Controller {
|
|
|
public String selectList() throws YosException {
|
|
public String selectList() throws YosException {
|
|
|
ArrayList<Long> sys_enterpriseids = new ArrayList<>();
|
|
ArrayList<Long> sys_enterpriseids = new ArrayList<>();
|
|
|
StringBuffer where = new StringBuffer(" 1=1 ");
|
|
StringBuffer where = new StringBuffer(" 1=1 ");
|
|
|
|
|
+ StringBuffer where1 = new StringBuffer(" 1=1 ");
|
|
|
if (!content_where.getStringValue("year").isEmpty()) {
|
|
if (!content_where.getStringValue("year").isEmpty()) {
|
|
|
where.append(" and(");
|
|
where.append(" and(");
|
|
|
where.append("year ='").append(content_where.getString("year")).append("' ");
|
|
where.append("year ='").append(content_where.getString("year")).append("' ");
|
|
|
where.append(")");
|
|
where.append(")");
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
if (!content_where.getStringValue("sys_enterpriseid").isEmpty()) {
|
|
if (!content_where.getStringValue("sys_enterpriseid").isEmpty()) {
|
|
|
sys_enterpriseids.add(content_where.getLong("sys_enterpriseid"));
|
|
sys_enterpriseids.add(content_where.getLong("sys_enterpriseid"));
|
|
|
}
|
|
}
|
|
|
|
|
+ if (content_where.containsKey("tablefilter")) {
|
|
|
|
|
+ if(content_where.getJSONObject("tablefilter").containsKey("enterprisename")){
|
|
|
|
|
+ if(StringUtils.isNotBlank(content_where.getJSONObject("tablefilter").getStringValue("enterprisename"))){
|
|
|
|
|
+ where1.append(" and(");
|
|
|
|
|
+ where1.append(" t1.enterprisename like '%").append(content_where.getJSONObject("tablefilter").getStringValue("enterprisename")).append("%' ");
|
|
|
|
|
+ where1.append(")");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
long totalPage = 0;
|
|
long totalPage = 0;
|
|
|
long totalRows = 0;
|
|
long totalRows = 0;
|
|
@@ -191,6 +202,7 @@ public class enterprisetarget extends Controller {
|
|
|
|
|
|
|
|
SQLFactory sqlFactory = new SQLFactory(this, "企业-业绩目标完成列表");
|
|
SQLFactory sqlFactory = new SQLFactory(this, "企业-业绩目标完成列表");
|
|
|
sqlFactory.addParameter_SQL("where", where);
|
|
sqlFactory.addParameter_SQL("where", where);
|
|
|
|
|
+ sqlFactory.addParameter_SQL("where1", where1);
|
|
|
sqlFactory.addParameter_in("sys_enterpriseids", sys_enterpriseids);
|
|
sqlFactory.addParameter_in("sys_enterpriseids", sys_enterpriseids);
|
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
sqlFactory.addParameter("siteid", siteid);
|
|
|
String sql = sqlFactory.getSQL();
|
|
String sql = sqlFactory.getSQL();
|