liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改状态定时任务bug

This commit is contained in:
haozq 2025-02-08 14:08:20 +08:00
parent ee4ea188b9
commit da8aa4362a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java
View File

@ -136,7 +136,7 @@ public class LogAspect
sysLogsVo.setOperaUserName(username);
}
Long userId = SecurityUtils.getUserId();
if (userId!=null && userId!=0l) {
if (userId!=null && userId!=0L) {
sysLogsVo.setUserId(userId.toString());
}
sysLogsVo.setOperaUri(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));

8
bonus-modules/bonus-job/src/main/java/com/bonus/job/service/SysJobServiceImpl.java
View File

@ -377,9 +377,9 @@ public class SysJobServiceImpl implements ISysJobService {
} else if (date.compareTo(delayTime) > 0 && "2".equals(item.getIsCheck())) {
item.setCheckStatus("8");
} else if (date.compareTo(delayTime) <= 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("7");
} else if (date.compareTo(delayTime) > 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("3");
} else if (date.compareTo(delayTime) > 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("7");
}
} else {
//判断整改时间是否大于当前时间
@ -387,9 +387,9 @@ public class SysJobServiceImpl implements ISysJobService {
item.setCheckStatus("2");
} else if (date.compareTo(correctionTime) > 0 && "2".equals(item.getIsCheck())) {
item.setCheckStatus("6");
} else if (date.compareTo(correctionTime) <= 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("5");
} else if (date.compareTo(correctionTime) > 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("5");
} else if (date.compareTo(correctionTime) <= 0 && !"2".equals(item.getIsCheck())) {
item.setCheckStatus("1");
}
}

3
bonus-modules/bonus-project/src/main/resources/mapper/system/DeviceInformationMapper.xml
View File

@ -43,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pdi.device_phone AS devicePhone,
pdi.create_user AS createUser,
pdi.create_time AS createTime,
pdi.puid,pdi.type_code typeCode,
pdi.puid, pdi.device_status deviceStatus,
pdi.type_code typeCode,
pdi.ball_index as ballIndex,
if(ppi.pro_name IS NULL, '无', ppi.pro_name) AS proName
FROM