Commit 5b1762d7 authored by 李秀明's avatar 李秀明

fix: 人员出勤排序错误

parent 8cc0af05
...@@ -161,6 +161,19 @@ public class PluginInterceptor implements Interceptor { ...@@ -161,6 +161,19 @@ public class PluginInterceptor implements Interceptor {
field.set(boundSql, sql); field.set(boundSql, sql);
return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql); return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
} }
else if (
"com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper.selectStationAttendanceStatsPage".equals(id)
) {
String sortField = "";
if (parameter instanceof HashMap) {
sortField = ((HashMap<?, ?>) parameter).get("sortField").toString();
}
sql = sql.replace("@SORT_FIELD", sortField);
Field field = boundSql.getClass().getDeclaredField("sql");
ReflectionUtils.makeAccessible(field);
field.set(boundSql, sql);
return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
}
else { else {
return invocation.proceed(); return invocation.proceed();
} }
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
t2.NAME AS bizOrgName, t2.NAME AS bizOrgName,
CONCAT(t2.STATION_TYPE, '换流站') AS stationType, CONCAT(t2.STATION_TYPE, '换流站') AS stationType,
#{date} AS date, #{date} AS date,
IFNULL(t1.num, 0) AS signNum, CONVERT(IFNULL(t1.num, '0'), SIGNED) AS signNum,
(SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false) AS firefighterNum, (SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false) AS firefighterNum,
ROUND(ROUND(IFNULL(t1.num, 0) / (SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false), 4) * 100, 2) AS attendanceRate, ROUND(ROUND(IFNULL(t1.num, 0) / (SELECT COUNT(1) FROM cb_firefighters t WHERE t.BIZ_ORG_CODE LIKE CONCAT(t2.BIZ_ORG_CODE, '%') AND t.PEOPLE_TYPE = 1601 AND t.IS_DELETE = false), 4) * 100, 2) AS attendanceRate,
IF(IFNULL(t1.num, 0) >= #{targetPassNum}, '合格', '不合格') AS attendanceStatus IF(IFNULL(t1.num, 0) >= #{targetPassNum}, '合格', '不合格') AS attendanceStatus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment