艰苦地区调整
This commit is contained in:
parent
e2ab5a1340
commit
e72c37a4c1
|
|
@ -466,10 +466,6 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
|
||||||
for(Map.Entry<Integer,List<JwCZInfoDetail>> entrySet : gwhgInfos.entrySet()){
|
for(Map.Entry<Integer,List<JwCZInfoDetail>> entrySet : gwhgInfos.entrySet()){
|
||||||
List<JwCZInfoDetail> values = entrySet.getValue();
|
List<JwCZInfoDetail> values = entrySet.getValue();
|
||||||
values.stream().forEach(value ->{
|
values.stream().forEach(value ->{
|
||||||
// TODO
|
|
||||||
if(entrySet.getKey().equals(109)){
|
|
||||||
System.out.println("-");
|
|
||||||
}
|
|
||||||
if( (value.getJwczksrq().before(endAttendance) || value.getJwczksrq().equals(endAttendance))
|
if( (value.getJwczksrq().before(endAttendance) || value.getJwczksrq().equals(endAttendance))
|
||||||
&& (value.getJwczjsrq().after(startAttendance) || value.getJwczjsrq().equals(startAttendance)) ){
|
&& (value.getJwczjsrq().after(startAttendance) || value.getJwczjsrq().equals(startAttendance)) ){
|
||||||
// 在考勤周期内的公务回国,计算国内工作天数
|
// 在考勤周期内的公务回国,计算国内工作天数
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue