|
@@ -297,9 +297,15 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
|
|
String date = DateUtil.format(new Date(tbDingApply.getApplyTime()),
|
|
String date = DateUtil.format(new Date(tbDingApply.getApplyTime()),
|
|
SystemConstant.DEFAULT_DATE_YMD_S_QUERY_PATTERN);
|
|
SystemConstant.DEFAULT_DATE_YMD_S_QUERY_PATTERN);
|
|
String[] strs = date.split("-");
|
|
String[] strs = date.split("-");
|
|
- tbDing = tbDingService.getOne(
|
|
|
|
- new QueryWrapper<TBDing>().lambda().eq(TBDing::getSopNo, tbDingApply.getSopNo())
|
|
|
|
- .eq(TBDing::getSignYear, strs[0]).eq(TBDing::getSignDate, strs[1]));
|
|
|
|
|
|
+ QueryWrapper<TBDing> tbDingQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ tbDingQueryWrapper.lambda().eq(TBDing::getSopNo, tbDingApply.getSopNo())
|
|
|
|
+ .eq(TBDing::getSignYear, strs[0]).eq(TBDing::getSignDate, strs[1]);
|
|
|
|
+ if (tbDingApply.getType() == InOutTypeEnum.IN) {
|
|
|
|
+ tbDingQueryWrapper.lambda().isNull(TBDing::getSignInTime);
|
|
|
|
+ } else {
|
|
|
|
+ tbDingQueryWrapper.lambda().isNull(TBDing::getSignOutTime);
|
|
|
|
+ }
|
|
|
|
+ tbDing = tbDingService.getOne(tbDingQueryWrapper);
|
|
} else {
|
|
} else {
|
|
tbDing = tbDingService.getById(tbDingApply.getDingId());
|
|
tbDing = tbDingService.getById(tbDingApply.getDingId());
|
|
}
|
|
}
|