From 29fc101ccd5165a1c3d762ba3a240b1a0ab4ddfe Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 10 九月 2024 13:08:27 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index e47c027..e9b3d38 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -18,6 +18,7 @@
 import com.doumee.dao.business.join.ApproveJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.system.join.NoticesJoinMapper;
 import com.doumee.dao.web.reqeust.ConfirmTaskDTO;
 import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO;
 import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO;
@@ -51,6 +52,9 @@
 
     @Autowired
     private PlatformBooksMapper platformBooksMapper;
+
+    @Autowired
+    private NoticesJoinMapper noticesJoinMapper;
 
     @Autowired
     private ApproveTemplMapper approveTemplMapper;
@@ -159,10 +163,24 @@
                 .eq(pageWrap.getModel().getPlateNum() != null, PlatformBooks::getPlateNum, pageWrap.getModel().getPlateNum())
                 .eq(pageWrap.getModel().getDriverPhone() != null, PlatformBooks::getDriverPhone, pageWrap.getModel().getDriverPhone())
                 .ge(pageWrap.getModel().getQueryDate() != null, PlatformBooks::getCreateDate, pageWrap.getModel().getQueryDate())
+                .ge(pageWrap.getModel().getArriveDateStart() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDateStart()))
+                .le(pageWrap.getModel().getArriveDateEnd() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDateEnd()))
                 .orderByDesc(PlatformBooks::getCreateDate)
         ;
-        return PageData.from(platformBooksMapper.selectPage(page, queryWrapper));
+        PageData<PlatformBooks> pageData = PageData.from(platformBooksMapper.selectPage(page, queryWrapper));
+        for (PlatformBooks platformBooks:pageData.getRecords()) {
+            if(Constants.equalsInteger(platformBooks.getStatus(),Constants.ONE)){
+                String auditName = approveService.getApproveUserName(platformBooks.getId(),Constants.approveObjectType.reason);
+                platformBooks.setAuditName(auditName);
+            }
+        }
+
+        return pageData;
     }
+
+
+
+
 
     @Override
     public long count(PlatformBooks platformBooks) {
@@ -236,6 +254,7 @@
         platformBooks.setIsdeleted(Constants.ZERO);
         platformBooks.setStatus(Constants.ZERO);
         platformBooks.setDriverId(platformBooksApplyDTO.getUserId());
+        platformBooks.setEditDate(new Date());
         platformBooksMapper.insert(platformBooks);
 
         //鍒涘缓瀹℃壒娴佷俊鎭�

--
Gitblit v1.9.3