Commit 5b411802 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents cdd9825d 62f36fd2
...@@ -316,7 +316,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -316,7 +316,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override @Override
public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) { public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) {
//获取当年所有假期配置表 //获取当年所有假期配置表
Date date = new Date(); //Date date = new Date();
List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda()); List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda());
Map<Date,String> holidayMap = new HashMap<>(); Map<Date,String> holidayMap = new HashMap<>();
if (Common.isNotNull(holidayInfos)){ if (Common.isNotNull(holidayInfos)){
...@@ -331,7 +331,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -331,7 +331,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override @Override
public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayCommon(TEmployeeInsuranceWorkDayVo vo) { public TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDayCommon(TEmployeeInsuranceWorkDayVo vo) {
//获取当年所有假期配置表 //获取当年所有假期配置表
Date date = new Date(); //Date date = new Date();
List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda()); List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda());
Map<Date,String> holidayMap = new HashMap<>(); Map<Date,String> holidayMap = new HashMap<>();
if (Common.isNotNull(holidayInfos)){ if (Common.isNotNull(holidayInfos)){
...@@ -393,9 +393,8 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -393,9 +393,8 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
@Override @Override
public TEmployeeInsuranceWorkDayVo getInitBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) { public TEmployeeInsuranceWorkDayVo getInitBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) {
//获取当年所有假期配置表 //获取当年所有假期配置表
Date date = new Date(); //Date date = new Date();
List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda() List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda());
.eq(THolidayInfo::getYear,DateUtil.getYear(date)));
Map<Date,String> holidayMap = new HashMap<>(); Map<Date,String> holidayMap = new HashMap<>();
if (Common.isNotNull(holidayInfos)){ if (Common.isNotNull(holidayInfos)){
for (THolidayInfo h:holidayInfos){ for (THolidayInfo h:holidayInfos){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment