异常考勤审核bug fix

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

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -293,8 +294,12 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
         if (dingExceptionApprove == DingExceptionApproveEnum.PASS) {
             TBDing tbDing = null;
             if (Objects.isNull(tbDingApply.getDingId())) {
+                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()));
+                        new QueryWrapper<TBDing>().lambda().eq(TBDing::getSopNo, tbDingApply.getSopNo())
+                                .eq(TBDing::getSignYear, strs[0]).eq(TBDing::getSignDate, strs[1]));
             } else {
                 tbDing = tbDingService.getById(tbDingApply.getDingId());
             }

sop-common/src/main/java/com/qmth/sop/common/contant/SystemConstant.java

@@ -86,6 +86,7 @@ public class SystemConstant {
     public static final String DEFAULT_DATE_DAY_PATTERN = "MM月dd日";
     public static final String DEFAULT_DATE_YEAR_PATTERN = "YYYY年";
     public static final String DEFAULT_DATE_YMD_S_PATTERN = "yyyy年MM月dd日";
+    public static final String DEFAULT_DATE_YMD_S_QUERY_PATTERN = "yyyy年-MM月dd日";
     public static final String JSON_PREFIX = ".json";
     public static final String XLSX_PREFIX = ".xlsx";
     public static final String XLS_PREFIX = "xls";