qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考勤

This commit is contained in:
钱涛 2022-04-25 16:20:57 +08:00
parent 12efa69503
commit e0c2fafede
3 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/com/engine/salary/remote/attend/cmd/GetKQReportCmd.java
View File

@ -257,31 +257,31 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
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<String,Object> flowData = kqReportBiz.getFlowData(params,user);
rs.execute(sql);
while (rs.next()) {
@ -424,14 +424,12 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
}
Map<String,Object> 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));

8
src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
View File

@ -20,8 +20,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
@Override
public List<Map<String, String>> getColumns() {
Map<String, Object> paramsMap = new HashMap<String, Object>();
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<String, Object> paramsMap = new HashMap<String, Object>();
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()));

2
src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
View File

@ -397,7 +397,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
}
/**
* 获取考勤模块数据 todo
* 获取考勤模块数据
*
* @param attendCycleRange
* @param employeeIds