liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

假期额度间隔时长新增直接取工龄、优化取卡逻辑

Browse Source
main
liuliang 6 months ago
parent a4ef470a28
commit 909cbe0a6a
6 changed files with 159 additions and 32 deletions
Show Stats Download Patch File Download Diff File

13
src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java
Unescape Escape View File

@ -605,6 +605,12 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
beforeScheduleMap.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){ beforeScheduleMap.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){
scheduleMap.put("ksdk",CheckBoxEnum.UNCHECKED.getKey()); scheduleMap.put("ksdk",CheckBoxEnum.UNCHECKED.getKey());
} }
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(beforejssj)) == 0 && ifWorkClassSegment(beforeScheduleMap.get("bdlx").toString()) &&
scheduleMap.get("jsdk").equals(CheckBoxEnum.UNCHECKED.getKey()) && scheduleMap.get("ksdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&
beforeScheduleMap.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){
int thdkfzs = DateUtil.getBetWeenMinutes(Utils.getjssjTime(beforeScheduleMap,analysisDate),Utils.getjssjTime(scheduleMap,analysisDate))+Integer.valueOf(beforeScheduleMap.get("thdkfzs").toString());
beforeScheduleMap.put("thdkfzs",thdkfzs);
}
} }
if (afterScheduleMap != null){ if (afterScheduleMap != null){
@ -620,6 +626,13 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
afterScheduleMap.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey())){ afterScheduleMap.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey())){
scheduleMap.put("jsdk",CheckBoxEnum.UNCHECKED.getKey()); scheduleMap.put("jsdk",CheckBoxEnum.UNCHECKED.getKey());
} }
if (DateUtil.getTime(jssj).compareTo(DateUtil.getTime(afterkssj)) == 0 && ifWorkClassSegment(afterScheduleMap.get("bdlx").toString()) &&
scheduleMap.get("ksdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&scheduleMap.get("jsdk").equals(CheckBoxEnum.UNCHECKED.getKey()) &&
afterScheduleMap.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey())){
int tqdkfzs = DateUtil.getBetWeenMinutes(Utils.getkssjTime(scheduleMap,analysisDate),Utils.getkssjTime(afterScheduleMap,analysisDate))+Integer.valueOf(afterScheduleMap.get("tqdkfzs").toString());
afterScheduleMap.put("tqdkfzs",tqdkfzs);
}
} }
} }
} }

6
src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
Unescape Escape View File

@ -46,9 +46,9 @@ public class AttendanceanalysisAction {
log.info("********AttendanceanalysisAction start********"); log.info("********AttendanceanalysisAction start********");
Map<String,Object> paramMap = ParamUtil.request2Map(request); Map<String,Object> paramMap = ParamUtil.request2Map(request);
// Map<String,Object> paramMap = Maps.newHashMap(); // Map<String,Object> paramMap = Maps.newHashMap();
// paramMap.put("startDate","2024-09-16"); // paramMap.put("startDate","2024-10-18");
// paramMap.put("endDate","2024-09-16"); // paramMap.put("endDate","2024-10-18");
// paramMap.put("userIds","23"); // paramMap.put("userIds","22");
String startDate = Util.null2String(paramMap.get("startDate")); String startDate = Util.null2String(paramMap.get("startDate"));
String startBeforeDate = DateUtil.beforeDay(startDate,2); String startBeforeDate = DateUtil.beforeDay(startDate,2);

8
src/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.java
Unescape Escape View File

@ -44,6 +44,7 @@ public class VocationCmd extends AbstractCommonCommand<Map<String,Object>> {
String ljcrglyfslwz = Util.null2String(vocation.get("ljcrglyfslwz")); String ljcrglyfslwz = Util.null2String(vocation.get("ljcrglyfslwz"));
String lsgldw = Util.null2String(vocation.get("lsgldw")); String lsgldw = Util.null2String(vocation.get("lsgldw"));
String jzrqzd = Util.null2String(vocation.get("jzrqzd")); String jzrqzd = Util.null2String(vocation.get("jzrqzd"));
String jgsc = Util.null2String(vocation.get("jgsc"));
String qsrqValue = Util.null2String(userMap.get(qsrq)); String qsrqValue = Util.null2String(userMap.get(qsrq));
String yjzdValue = Util.null2String(userMap.get(yjzd)); String yjzdValue = Util.null2String(userMap.get(yjzd));
String ljcrglyfslwzValue = Util.null2String(userMap.get(ljcrglyfslwz)); String ljcrglyfslwzValue = Util.null2String(userMap.get(ljcrglyfslwz));
@ -85,10 +86,15 @@ public class VocationCmd extends AbstractCommonCommand<Map<String,Object>> {
vocation.put("qsrqValue",qsrqValue); vocation.put("qsrqValue",qsrqValue);
vocation.put("yjzdValue",yjzdValue); vocation.put("yjzdValue",yjzdValue);
vocation.put("ljcrglyfslwzValue",ljcrglyfslwzValue); vocation.put("ljcrglyfslwzValue",ljcrglyfslwzValue);
if (!"".equals(lsgldw) && !"".equals(ljcrglyfslwzValue) && "0".equals(lsgldw)){ if (!"".equals(lsgldw) && !"".equals(ljcrglyfslwzValue) && "0".equals(lsgldw) && !"0".equals(jgsc)){
//当累计单位为年时 //当累计单位为年时
vocation.put("ljcrglyfslwzValue",Math.round(Double.valueOf(ljcrglyfslwzValue)*12)); vocation.put("ljcrglyfslwzValue",Math.round(Double.valueOf(ljcrglyfslwzValue)*12));
} }
if ("0".equals(jgsc)){
//起算日期与当前日期间隔不取
vocation.put("ljcrglyfslwzValue","0");
}
vocation.put("zyzValue",getUserIds(vocation)); vocation.put("zyzValue",getUserIds(vocation));
} }
log.debug("VocationCmd params: [{}]",params); log.debug("VocationCmd params: [{}]",params);

53
src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
Unescape Escape View File

@ -64,6 +64,8 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
String wscl = Util.null2String(vocationList.get(0).get("wscl")); String wscl = Util.null2String(vocationList.get(0).get("wscl"));
//首次获得额度控制生效日期 //首次获得额度控制生效日期
String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq")); String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
if ("".equals(qsrq)){ if ("".equals(qsrq)){
return Maps.newHashMap(); return Maps.newHashMap();
@ -143,6 +145,11 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]); int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]);
allMonths = Double.valueOf(ljcrglyfslwz).intValue(); allMonths = Double.valueOf(ljcrglyfslwz).intValue();
int intervalYear = allMonths / 12+betweenYear; int intervalYear = allMonths / 12+betweenYear;
if (jgscsf.equals("2")){
//直接取工龄
intervalYear = allMonths / 12;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, intervalYear, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, intervalYear, yjzd,userId);
double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
int days = 0; int days = 0;
@ -168,6 +175,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq); betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue(); allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
if (jgscsf.equals("2")){
allMonths = Double.valueOf(ljcrglyfslwz).intValue();
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId);
int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1; int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
if (days <0){ if (days <0){
@ -188,6 +198,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq); betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue(); allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
if (jgscsf.equals("2")){
allMonths = Double.valueOf(ljcrglyfslwz).intValue();
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId);
double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -199,7 +212,7 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl); restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl);
} else if (edyxq.equals(StartingUnitEnum.NATURAL_WEEK.getKey())){ } else if (edyxq.equals(StartingUnitEnum.NATURAL_WEEK.getKey())){
//起自然周 //自然周
int dayOfWeek = TimeUtil.getDayOfWeek(releaseDate); int dayOfWeek = TimeUtil.getDayOfWeek(releaseDate);
if (dayOfWeek == 0){ if (dayOfWeek == 0){
dayOfWeek = 7; dayOfWeek = 7;
@ -216,6 +229,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
betweenDays = 0; betweenDays = 0;
} }
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId);
double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -243,6 +259,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
betweenDays=0; betweenDays=0;
} }
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId);
int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1; int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
if (days <0){ if (days <0){
@ -256,6 +275,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
//自然天 //自然天
betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq)+1; betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq)+1;
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
} }
@ -292,6 +314,8 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts"))); int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts")));
//执行发放的时间点 //执行发放的时间点
String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj")); String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue(); int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
@ -319,14 +343,29 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
endYearMonth = endYearMonth+seniority; endYearMonth = endYearMonth+seniority;
int beginYear = beginYearMonth/12; int beginYear = beginYearMonth/12;
int endYear = endYearMonth/12; int endYear = endYearMonth/12;
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//残年分割日期 //残年分割日期
String divideTime = DateUtil.beforeMonth(qsrq,seniority); String divideTime = DateUtil.beforeMonth(qsrq,seniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2]; divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
endYear = beginYear+1;
//分割日期
int month = DateUtil.getBetWeenMonths(qsrq,sxrq);
if (month < 0){
month = 0;
}
int historySeniority = seniority-month;
divideTime = DateUtil.beforeMonth(qsrq,historySeniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//当前后额定可休时长一样时，代表没有残年情况 //当前后额定可休时长一样时，代表没有残年情况
if (beginEdktsc == endEdktsc){ if (beginEdktsc == endEdktsc){
@ -381,6 +420,10 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
} }
beginYearMonth = beginYearMonth+seniority; beginYearMonth = beginYearMonth+seniority;
int beginYear = beginYearMonth/12; int beginYear = beginYearMonth/12;
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId); Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc"))); double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
int days = 0; int days = 0;

37
src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java
Unescape Escape View File

@ -65,6 +65,8 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
String wscl = Util.null2String(vocationList.get(0).get("wscl")); String wscl = Util.null2String(vocationList.get(0).get("wscl"));
//首次获得额度控制生效日期 //首次获得额度控制生效日期
String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq")); String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
if ("".equals(qsrq)){ if ("".equals(qsrq)){
return Maps.newHashMap(); return Maps.newHashMap();
@ -159,6 +161,9 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
} }
}else if (edyxq.equals(StartingUnitEnum.STARTING_YEAR.getKey())){ }else if (edyxq.equals(StartingUnitEnum.STARTING_YEAR.getKey())){
int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]); int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]);
if (jgscsf.equals("2")){
betweenYear = Double.valueOf(ljcrglyfslwz).intValue() / 12;
}
Map<String,Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList,betweenYear,yjzd,userId); Map<String,Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList,betweenYear,yjzd,userId);
int occurMonths = DateUtil.getTime(releaseDate).getMonthValue(); int occurMonths = DateUtil.getTime(releaseDate).getMonthValue();
int StartMonths = DateUtil.getTime(qsrq).getMonthValue(); int StartMonths = DateUtil.getTime(qsrq).getMonthValue();
@ -210,6 +215,8 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts"))); int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts")));
//执行发放的时间点 //执行发放的时间点
String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj")); String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue(); int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
@ -234,16 +241,32 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
endYearMonth = endYearMonth+seniority; endYearMonth = endYearMonth+seniority;
int beginYear = beginYearMonth/12; int beginYear = beginYearMonth/12;
int endYear = endYearMonth/12; int endYear = endYearMonth/12;
int endYearRemainder = endYearMonth%12;
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//残年分割日期 //残年分割日期
String divideTime = DateUtil.beforeMonth(qsrq,seniority); String divideTime = DateUtil.beforeMonth(qsrq,seniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2]; divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
divideTime = DateUtil.nextMonth(divideTime,1,DateUtil.yyyyMM)+"-01"; divideTime = DateUtil.nextMonth(divideTime,1,DateUtil.yyyyMM)+"-01";
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
endYear = beginYear+1;
//分割日期
int month = DateUtil.getBetWeenMonths(qsrq,sxrq);
if (month < 0){
month = 0;
}
int historySeniority = seniority-month;
divideTime = DateUtil.beforeMonth(qsrq,historySeniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
int divideTimeMonths = DateUtil.getTime(divideTime).getMonthValue(); int divideTimeMonths = DateUtil.getTime(divideTime).getMonthValue();
if (beginEdktsc == endEdktsc){ if (beginEdktsc == endEdktsc){
@ -292,6 +315,10 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
} }
beginYearMonth = beginYearMonth+seniority; beginYearMonth = beginYearMonth+seniority;
int beginYear = beginYearMonth/12; int beginYear = beginYearMonth/12;
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId); Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
restTime = getRestTime(releaseDateMonths,beginYearmap); restTime = getRestTime(releaseDateMonths,beginYearmap);
} }

66
src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
Unescape Escape View File

@ -54,10 +54,6 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
String dzqsrq = Util.null2String(vocationList.get(0).get("dzqsrq")); String dzqsrq = Util.null2String(vocationList.get(0).get("dzqsrq"));
//分割日期 //分割日期
String fgrq = Util.null2String(vocationList.get(0).get("fgrq")); String fgrq = Util.null2String(vocationList.get(0).get("fgrq"));
//提前执行发放操作的天数
String dqtqffts = Util.null2String(vocationList.get(0).get("dqtqffts"));
//执行发放的时间点
String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
//入职当期额度按比例折算 //入职当期额度按比例折算
String rzdqedablzs = Util.null2String(vocationList.get(0).get("rzdqedablzs")); String rzdqedablzs = Util.null2String(vocationList.get(0).get("rzdqedablzs"));
//首次获得额度按比例折算 //首次获得额度按比例折算
@ -70,6 +66,8 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
String wscl = Util.null2String(vocationList.get(0).get("wscl")); String wscl = Util.null2String(vocationList.get(0).get("wscl"));
//首次获得额度控制生效日期 //首次获得额度控制生效日期
String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq")); String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
if ("".equals(qsrq)){ if ("".equals(qsrq)){
return Maps.newHashMap(); return Maps.newHashMap();
@ -128,11 +126,6 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
} }
insertHoliDayParam.put("sxrq", divideTime); insertHoliDayParam.put("sxrq", divideTime);
// dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
// //已存在数据且不覆盖
// if (dataList.size()>0 && !"1".equals(cover)) {
// return insertHoliDayParam;
// }
} }
insertHoliDayParam.put("ktsc", restTime); insertHoliDayParam.put("ktsc", restTime);
} else if (allMonths >= 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) { } else if (allMonths >= 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) {
@ -156,6 +149,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
//起算年 //起算年
allMonths = Double.valueOf(ljcrglyfslwz).intValue(); allMonths = Double.valueOf(ljcrglyfslwz).intValue();
int intervalYear = allMonths / 12+betweenYear; int intervalYear = allMonths / 12+betweenYear;
if (jgscsf.equals("2")){
intervalYear = allMonths / 12;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, intervalYear, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, intervalYear, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
} else if (edyxq.equals(StartingUnitEnum.NATURAL_MONTH.getKey())){ } else if (edyxq.equals(StartingUnitEnum.NATURAL_MONTH.getKey())){
@ -165,6 +161,10 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
betweenMonth = 0; betweenMonth = 0;
} }
allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue(); allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
if (jgscsf.equals("2")){
allMonths = Double.valueOf(ljcrglyfslwz).intValue();
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -173,6 +173,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
//起算月 //起算月
betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq); betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue(); allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
if (jgscsf.equals("2")){
allMonths = Double.valueOf(ljcrglyfslwz).intValue();
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -183,6 +186,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
betweenDays = 0; betweenDays = 0;
} }
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -193,6 +199,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
betweenDays=0; betweenDays=0;
} }
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
@ -200,6 +209,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
//自然天 //自然天
betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq); betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq);
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays; allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
if (jgscsf.equals("2")){
allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30;
}
Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays, yjzd,userId); Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays, yjzd,userId);
restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0; restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
} }
@ -233,6 +245,8 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
String yjzd = Util.null2String(vocationList.get(0).get("yjzdValue")); String yjzd = Util.null2String(vocationList.get(0).get("yjzdValue"));
//尾数处理 //尾数处理
String wscl = Util.null2String(vocationList.get(0).get("wscl")); String wscl = Util.null2String(vocationList.get(0).get("wscl"));
//间隔时长算法
String jgscsf = Util.null2String(vocationList.get(0).get("jgsc"));
int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue(); int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
@ -248,15 +262,32 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
endYearMonth = endYearMonth+seniority; endYearMonth = endYearMonth+seniority;
int beginYear = beginYearMonth/12; int beginYear = beginYearMonth/12;
int endYear = endYearMonth/12; int endYear = endYearMonth/12;
int endYearRemainder = endYearMonth%12;
//残年分割日期
String divideTime = DateUtil.beforeMonth(qsrq,seniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
endYear = beginYear+1;
//分割日期
int month = DateUtil.getBetWeenMonths(qsrq,sxrq);
if (month < 0){
month = 0;
}
int historySeniority = seniority-month<0?0:seniority-month;
divideTime = DateUtil.beforeMonth(qsrq,historySeniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId); Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId); Map<String,Object> endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc"))); double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc"))); double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//残年分割日期
String divideTime = DateUtil.beforeMonth(qsrq,seniority);
divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR); int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
if (beginEdktsc == endEdktsc){ if (beginEdktsc == endEdktsc){
@ -294,12 +325,19 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
}else { }else {
//不折算 //不折算
int beginYear = 0;
if (jgscsf.equals("2")){
//直接取工龄字段
beginYear = seniority/12;
}else {
//起算日期与当前日期间隔+工龄字段
int beginYearMonth = DateUtil.getBetWeenMonths(qsrq,sxrq); int beginYearMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
if (beginYearMonth < 0){ if (beginYearMonth < 0){
beginYearMonth = 0; beginYearMonth = 0;
} }
beginYearMonth = beginYearMonth+seniority; beginYearMonth = beginYearMonth+seniority;
int beginYear = beginYearMonth/12; beginYear = beginYearMonth/12;
}
Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId); Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);
double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc"))); double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
restTime=beginEdktsc; restTime=beginEdktsc;

Write Preview
Loading…
Cancel
Save