From f58fc027c527742e006264b4ac903cbc4bd07973 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 10:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 2d067fc..235c6e6 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
@@ -46,10 +46,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 鏈堝彴鍏ュ洯棰勭害淇℃伅琛⊿ervice瀹炵幇
@@ -211,7 +208,9 @@
queryWrapper
.selectAll(PlatformBooks.class)
.selectAs(PlatformJob::getStatus,PlatformBooks::getJobStatus)
+ .selectAs(SystemUser::getRealname,PlatformBooks::getEditUserName)
.leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId)
+ .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getEditDate)
.eq(pageWrap.getModel().getId() != null, PlatformBooks::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, PlatformBooks::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -401,6 +400,19 @@
platformBooks.setReasonId(null);
platformBooks.setInReason(null);
platformBooksMapper.updateById(platformBooks);
+
+
+
+ Map<String,Object> jsonMap = new HashMap<>();
+ String title = ApproveServiceImpl.creatPlatformBookNotice(platformBooks,jsonMap);
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getParam1,JSONObject.toJSONString(jsonMap))
+ .set(Notices::getTitle,title)
+ .eq(Notices::getObjType,Constants.noticesObjectType.reason)
+ .eq(Notices::getTitle,title)
+ .eq(Notices::getObjId,platformBooks.getId())
+ );
+
return platformBooks.getId();
}
--
Gitblit v1.9.3