wangliang 1 年之前
父節點
當前提交
6391175e34

+ 9 - 3
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -297,9 +297,15 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
                 String date = DateUtil.format(new Date(tbDingApply.getApplyTime()),
                         SystemConstant.DEFAULT_DATE_YMD_S_QUERY_PATTERN);
                 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 {
                 tbDing = tbDingService.getById(tbDingApply.getDingId());
             }