Tenlion/btxtgxq-system-bigdata
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理请假后每日的得分问题

Browse Source
This commit is contained in:
TS-QD1 2023-10-20 18:30:53 +08:00
parent fb1a3d7613
commit 90ee454b5c
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/cm/bigdata/service/kpi/impl/KpiServiceImpl.java
View File

@ -134,17 +134,21 @@ public class KpiServiceImpl implements IKpiService {
}
} else {
// 开始时间不是当天
DateTime leaveTimeDateTime = DateTime.parse(leaveTime, DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD));
DateTime leaveTimeDateTime = DateTime.parse(leaveTime, DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS));
int leaveDayIndex = 0;
for (int i = 0; i < leaveTimeLong; i++) {
String newDateTime = leaveTimeDateTime.plusDays(i + 1).toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD));
String newDateTime = leaveTimeDateTime.plusDays(i + 1).toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS));
if (StringUtils.contains(newDateTime, date)) {
leaveDayIndex = i;
break;
}
}
if (leaveTimeLong - (leaveDayIndex + 1) < 1) {
leaveTimelongInDay = leaveTimeLong;
double dayLeaveTimeLong = leaveTimeLong - (leaveDayIndex + 1);
if (dayLeaveTimeLong == 0) {
isLeave = 0;
isLeaveSelf = 0;
} else if (dayLeaveTimeLong < 1) {
leaveTimelongInDay = dayLeaveTimeLong;
} else {
leaveTimelongInDay = 1;
}
@ -246,17 +250,21 @@ public class KpiServiceImpl implements IKpiService {
}
} else {
// 开始时间不是当天
DateTime leaveTimeDateTime = DateTime.parse(leaveTime, DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD));
DateTime leaveTimeDateTime = DateTime.parse(leaveTime, DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS));
int leaveDayIndex = 0;
for (int i = 0; i < leaveTimeLong; i++) {
String newDateTime = leaveTimeDateTime.plusDays(i + 1).toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD));
String newDateTime = leaveTimeDateTime.plusDays(i + 1).toString(DateTimeFormat.forPattern(ISystemConstant.DATE_FORMATTER_YYYY_MM_DD_HH_MM_SS));
if (StringUtils.contains(newDateTime, date)) {
leaveDayIndex = i;
break;
}
}
if (leaveTimeLong - (leaveDayIndex + 1) < 1) {
leaveTimelongInDay = leaveTimeLong;
double dayLeaveTimeLong = leaveTimeLong - (leaveDayIndex + 1);
if (dayLeaveTimeLong == 0) {
isLeave = 0;
isLeaveSelf = 0;
} else if (dayLeaveTimeLong < 1) {
leaveTimelongInDay = dayLeaveTimeLong;
} else {
leaveTimelongInDay = 1;
}

5
src/main/java/com/cm/bigdata/utils/KpiScoreUtil.java
View File

@ -30,8 +30,9 @@ public class KpiScoreUtil {
if (isLeave == 1) {
if (isLeaveSelf == 0) {
// 公假，不算矿工
signinScore += isSigninLate == 1 ? WGY_SIGNIN_SCORE / 2 : WGY_SIGNIN_SCORE;
signoutScore += isSignoutEarly == 1 ? WGY_SIGNOUT_SCORE / 2 : WGY_SIGNOUT_SCORE;
signinScore += WGY_SIGNIN_SCORE;
signoutScore += WGY_SIGNOUT_SCORE;
distanceScore += WGY_DISTANCE_SCORE;
} else {
// 私假，并且未超过上限
if (isLeaveSelfOverLimitInQuarter == 0) {

4
src/main/java/com/cm/bigdata/utils/KpiUtil.java
View File

@ -113,7 +113,7 @@ public class KpiUtil {
List<LeavePO> leavePOS = leaveService.listPOByUserIdsAndDay(userIds, day);
Map<String, LeavePO> leavePOMap = new HashMap<>();
leavePOS.forEach(leavePO -> {
leavePOMap.put(leavePO.getGmtCreate(), leavePO);
leavePOMap.put(leavePO.getCreator(), leavePO);
});
return leavePOMap;
}
@ -122,7 +122,7 @@ public class KpiUtil {
List<LeavePO> leavePOS = leaveService.listPOByUserIdAndDay(userId, day);
Map<String, LeavePO> leavePOMap = new HashMap<>();
leavePOS.forEach(leavePO -> {
leavePOMap.put(leavePO.getGmtCreate(), leavePO);
leavePOMap.put(leavePO.getCreator(), leavePO);
});
return leavePOMap;
}

4
src/main/resources/application.yml
View File

@ -21,14 +21,14 @@ spring:
datasource:
druid:
db1:
url: jdbc:mysql://192.168.0.151:3306/db_btgxq_bigdata?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
url: jdbc:mysql://127.0.0.1:3306/db_btgxq_bigdata?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
db-type: mysql
driver-class-name: com.mysql.jdbc.Driver
username: root
password: root
mapper-locations: classpath*:mybatis/mapper/**/*.xml
db2:
url: jdbc:mysql://192.168.0.151:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
url: jdbc:mysql://127.0.0.1:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
db-type: mysql
driver-class-name: com.mysql.jdbc.Driver
username: root