From e0c2fafede344bb33d5aef75af8eefb3a1f9b89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 25 Apr 2022 16:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/attend/cmd/GetKQReportCmd.java | 50 +++++++++---------- .../impl/RemoteAttend4SalaryServiceImpl.java | 8 +-- .../impl/AttendQuoteDataServiceImpl.java | 2 +- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/com/engine/salary/remote/attend/cmd/GetKQReportCmd.java b/src/com/engine/salary/remote/attend/cmd/GetKQReportCmd.java index 0ed754b2e..632802719 100644 --- a/src/com/engine/salary/remote/attend/cmd/GetKQReportCmd.java +++ b/src/com/engine/salary/remote/attend/cmd/GetKQReportCmd.java @@ -257,31 +257,31 @@ public class GetKQReportCmd extends AbstractCommonCommand> { sql = backFields + sqlFrom + sqlWhere + groupBy; - if (pageIndex > 0 && pageSize > 0) { - if (rs.getDBType().equals("oracle")) { - sql = " select * from (select " + sql+") t "+orderBy; - sql = "select * from ( select row_.*, rownum rownum_ from ( " + sql + " ) row_ where rownum <= " - + (pageIndex * pageSize) + ") where rownum_ > " + ((pageIndex - 1) * pageSize); - } else if (rs.getDBType().equals("mysql")) { - sql = " select * from (select " + sql+") t "+orderBy; - sql = "select t1.* from (" + sql + ") t1 limit " + ((pageIndex - 1) * pageSize) + "," + pageSize; - } else { - orderBy = " order by dsporder asc, lastname asc "; - descOrderBy = " order by dsporder desc, lastname desc "; - if (pageIndex > 1) { - int topSize = pageSize; - if (pageSize * pageIndex > count) { - topSize = count - (pageSize * (pageIndex - 1)); - } - sql = " select top " + topSize + " * from ( select top " + topSize + " * from ( select top " - + (pageIndex * pageSize) + sql + orderBy+ " ) tbltemp1 " + descOrderBy + ") tbltemp2 " + orderBy; - } else { - sql = " select top " + pageSize + sql+orderBy; - } - } - } else { +// if (pageIndex > 0 && pageSize > 0) { +// if (rs.getDBType().equals("oracle")) { +// sql = " select * from (select " + sql+") t "+orderBy; +// sql = "select * from ( select row_.*, rownum rownum_ from ( " + sql + " ) row_ where rownum <= " +// + (pageIndex * pageSize) + ") where rownum_ > " + ((pageIndex - 1) * pageSize); +// } else if (rs.getDBType().equals("mysql")) { +// sql = " select * from (select " + sql+") t "+orderBy; +// sql = "select t1.* from (" + sql + ") t1 limit " + ((pageIndex - 1) * pageSize) + "," + pageSize; +// } else { +// orderBy = " order by dsporder asc, lastname asc "; +// descOrderBy = " order by dsporder desc, lastname desc "; +// if (pageIndex > 1) { +// int topSize = pageSize; +// if (pageSize * pageIndex > count) { +// topSize = count - (pageSize * (pageIndex - 1)); +// } +// sql = " select top " + topSize + " * from ( select top " + topSize + " * from ( select top " +// + (pageIndex * pageSize) + sql + orderBy+ " ) tbltemp1 " + descOrderBy + ") tbltemp2 " + orderBy; +// } else { +// sql = " select top " + pageSize + sql+orderBy; +// } +// } +// } else { sql = " select " + sql; - } +// } Map flowData = kqReportBiz.getFlowData(params,user); rs.execute(sql); while (rs.next()) { @@ -424,14 +424,12 @@ public class GetKQReportCmd extends AbstractCommonCommand> { } Map detialDatas = kqReportBiz.getDetialDatas(id,fromDate,toDate,user); -// new KQLog().info("id:"+id+":detialDatas:"+detialDatas); isEnd = false; for(String date=fromDate; !isEnd;) { if(date.equals(toDate)) isEnd = true; if(DateUtil.compDate(today, date)>0){ data.put(date,""); }else{ -// new KQLog().info("id:date:"+(id+"|"+date)+":detialDatas.get:"+detialDatas.get(id+"|"+date)); data.put(date,detialDatas.get(id+"|"+date)==null?SystemEnv.getHtmlLabelName(26593, user.getLanguage()):detialDatas.get(id+"|"+date)); } cal.setTime(DateUtil.parseToDate(date)); diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java index 891c21824..ad8f79af1 100644 --- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java +++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java @@ -20,8 +20,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt @Override public List> getColumns() { Map paramsMap = new HashMap(); - paramsMap.put("pageIndex", 1); - paramsMap.put("pageSize", 10); +// paramsMap.put("pageIndex", 1); +// paramsMap.put("pageSize", 10); paramsMap.put("typeselect", "6"); paramsMap.put("viewScope", "3"); paramsMap.put("isNoAccount", "1"); @@ -71,8 +71,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt ValidUtil.doValidator(attend4Salary); Map paramsMap = new HashMap(); - paramsMap.put("pageIndex", 1); - paramsMap.put("pageSize", 500); +// paramsMap.put("pageIndex", 1); +// paramsMap.put("pageSize", 500); paramsMap.put("typeselect", "6"); paramsMap.put("fromDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getBeginDate())); paramsMap.put("toDate", SalaryDateUtil.getFormatLocalDate(attend4Salary.getEndDate())); diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 52369e79e..43722d16f 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -397,7 +397,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa } /** - * 获取考勤模块数据 todo + * 获取考勤模块数据 * * @param attendCycleRange * @param employeeIds