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

人员标识-fixBug

This commit is contained in:
Harryxzy 2022-11-07 16:51:29 +08:00
parent 3cefcb0305
commit 16b1617ba5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/engine/bjcj220907/service/impl/EmployeeIdentifiedServiceImpl.java
View File

@ -72,7 +72,7 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
baseBean.writeLog(info.getXm() + "的入职日期获取失败");
return false;
}
// 判断cal的月份是否和nextNextMonthCal在同一个月
// 判断cal是否和nextNextMonthCal在同一个月或者之后
if (checkMonth(cal, nextNextMonthCal)) {
info.setRz(1);
flag = true;
@ -86,7 +86,7 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
baseBean.writeLog(info.getXm() + "的转正日期获取失败");
return false;
}
// 判断cal的月份是否和nextNextMonthCal在同一个月
// 判断cal是否和nextNextMonthCal在同一个月或者之后
if (checkMonth(cal, nextNextMonthCal)) {
info.setZz(1);
flag = true;
@ -100,7 +100,7 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
baseBean.writeLog(info.getXm() + "的调动日期获取失败");
return false;
}
// 判断cal的月份是否和nextNextMonthCal在同一个月
// 判断cal是否和nextNextMonthCal在同一个月或者之后
if (checkMonth(cal, nextNextMonthCal)) {
info.setDd(1);
flag = true;
@ -181,13 +181,19 @@ public class EmployeeIdentifiedServiceImpl extends Service implements EmployeeId
}
/**
* @description 判断cal的月份是否和nextNextMonthCal在同一个月
* @description 判断cal是否和nextNextMonthCal在同一个月或者之后
* @return null
* @author Harryxzy
* @date 2022/11/1 15:10
*/
private boolean checkMonth(Calendar cal,Calendar nextNextMonthCal){
return cal.get(Calendar.MONTH) == nextNextMonthCal.get(Calendar.MONTH);
Calendar countCal = Calendar.getInstance();
countCal.setTime(nextNextMonthCal.getTime());
countCal.set(Calendar.DATE,1);
if(cal.getTime().after(countCal.getTime()) || (cal.getTime().compareTo(countCal.getTime())==0) ){
return true;
}
return false;
}
/**