‘linchangsheng’ преди 5 месеца
родител
ревизия
29c4da774d
променени са 1 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 4 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

+ 4 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -1492,13 +1492,16 @@ public class AgreementLogic {
                 .count() > 0) {
             leLetterService.lambdaUpdate().eq(LeLetter::getStatus, LetterStatusEnum.SEND.getKey())
                     .le(LeLetter::getSendTime, DateUtil.offsetDay(new Date(),-1*leConfig.getDayNum()))
+                    .set(LeLetter::getExamineStatus, "OK")
+                    .set(LeLetter::getExamineTime, new Date())
+                    .set(LeLetter::getExamineName, "审批截止时间已到自动批复")
                     .set(LeLetter::getStatus,LetterStatusEnum.EXECUTED.getKey()).update();
         }
 
         if (leConfig.getIsDay().equals(IsYesNoEnum.YES.getKey())) {
 
             List<LeLetterItem> letterItems = leLetterItemService.lambdaQuery().eq(LeLetterItem::getWebsitAppeal, "AP")
-                    .isNull(LeLetterItem::getExamineStatus)
+                    .and(item -> item.isNull(LeLetterItem::getExamineStatus).or().eq(LeLetterItem::getExamineStatus,""))
                     .le(LeLetterItem::getCreateTime, DateUtil.offsetDay(new Date(), -1 * leConfig.getCoreNum()))
                     .list();