diff --git a/build/classes/rush/BureauAction.class b/build/classes/rush/BureauAction.class index d0c8fa4..21914c8 100644 Binary files a/build/classes/rush/BureauAction.class and b/build/classes/rush/BureauAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html index 3feb1e3..9074086 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/bureau/recording.html @@ -10,15 +10,15 @@ - - - - 查询 导出 diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class index d0c8fa4..21914c8 100644 Binary files a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class and b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/rush/BureauAction.class differ diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini index a32184d..9b86022 100644 --- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini +++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini @@ -1,3 +1,3 @@ #save ini -#Tue Nov 14 23:19:56 CST 2023 +#Wed Nov 22 00:59:05 CST 2023 deploystamp=1612237236000 diff --git a/resource/html/bureau/recording.html b/resource/html/bureau/recording.html index 3feb1e3..9074086 100644 --- a/resource/html/bureau/recording.html +++ b/resource/html/bureau/recording.html @@ -10,15 +10,15 @@ - - - - 查询 导出 diff --git a/src/rush/BureauAction.java b/src/rush/BureauAction.java index 1c08925..a9e62b8 100644 --- a/src/rush/BureauAction.java +++ b/src/rush/BureauAction.java @@ -41,11 +41,15 @@ public class BureauAction { String typeSql = ""; String phoneSql = ""; String empnoSql = ""; - String manyiSql = ""; - String companySql = ""; + //String manyiSql = ""; + StringBuffer manyiSql = new StringBuffer(); + // String companySql = ""; + StringBuffer companySql = new StringBuffer(); String custnameSql=""; - String diquSql=""; - String problemSql=""; + StringBuffer diquSql = new StringBuffer(); + //String diquSql=""; + StringBuffer problemSql = new StringBuffer(); + //String problemSql=""; String callstateSql=""; String pinjie=""; String noRight=" CRM_SM_TEL_RECORD s "; @@ -155,16 +159,55 @@ public class BureauAction { empnoSql = " and c.AGENTID like '%" + empno + "%'"; } if (manyi != null) { - if (manyi.equals("4")) { - manyiSql = " and c.satisfaction is null "; - } else { - manyiSql = " and c.satisfaction = '" + manyi + "'"; + String[] manyiArrray = manyi.split(","); + if(manyi.contains("4")){ + if(manyiArrray.length==1) { + manyiSql.append(" and c.satisfaction is null ") ; + } + if(manyiArrray.length>1&manyiArrray.length<4){ + manyiSql.append(" and ( c.satisfaction in ("); + for(int i=0;i records = (List) map.get("records"); for (Map m : records) { m.put("path", "http://10.1.1.54:8082" + m.get("path")); @@ -232,20 +294,20 @@ public class BureauAction { List returns = DbHelper.getDbService().queryMapListById("orgname.getOrgListByUser", params); StringBuffer sb = new StringBuffer(); - StringBuffer sj = new StringBuffer(); + // StringBuffer sj = new StringBuffer(); if (returns.size() != 0) { sb.append("(s.ORGID in ("); - sj.append(" or d.city_name in ("); + // sj.append(" or d.city_name in ("); for (int i = 0; i < returns.size(); i++) { sb.append("'" + returns.get(i).get("text") + "'"); - sj.append("'" + returns.get(i).get("text") + "'"); + // sj.append("'" + returns.get(i).get("text") + "'"); if (i < returns.size() - 1) { sb.append(","); - sj.append(","); + // sj.append(","); } } sb.append(") or s.ORGNAME is null ) "); - sj.append(") "); + // sj.append(") "); } else { sb.append("1=2"); } @@ -256,7 +318,7 @@ public class BureauAction { "s.QUESTION_ANSWER,s.CUSTOMER_NAME,s.CUSTOMER_TAX_ID,s.tel ,s.MOBILE caller_phone,s.PERSON_TEL, s.question_content," + "s.CONTACT,s.TEL_DATE ,s.TEL_PERSON,s.ENTRY_PERSON ,'播放' AS play ,'下载' as down FROM " + "CALLSYS_TRECORDFAILINFO c left join tel_dic_city d on c.calleeno=d.callee_no " + - "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID where c.CALLERNO='12366' and " + sb.toString()+sj; + "LEFT JOIN CRM_SM_TEL_RECORD s ON c.CALLID = s.CALLID where c.CALLERNO='12366' and " + sb.toString(); String timeSql = ""; String typeSql = ""; @@ -295,6 +357,7 @@ public class BureauAction { } Map map = DbHelper.getDbService().queryPageMapList(sql + timeSql + typeSql + phoneSql + empnoSql + companySql + manyiSql+diquSql, params); + System.out.println(sql + timeSql + typeSql + phoneSql + empnoSql + companySql + manyiSql+diquSql); List records = (List) map.get("records"); for (Map m : records) { m.put("path", "http://10.1.1.54:8082" + m.get("path"));