From 57552bf3ffb83ba2e1096d374f11be6133db1615 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 10:52:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
index 948ccf5..4265e5c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
@@ -65,13 +65,15 @@
ywPatrolPointMapper.insert(ywPatrolPoint);
- if(Objects.nonNull(ywPatrolPoint.getMultifile())){
- ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
- ywPatrolPoint.getMultifile().setCreateDate(new Date());
- ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
- ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
- ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
- multifileMapper.insert(ywPatrolPoint.getMultifile());
+ if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ multifile.setObjId(ywPatrolPoint.getId());
+ multifile.setFileurl(ywPatrolPoint.getFileUrl());
+ multifileMapper.insert(multifile);
}
return ywPatrolPoint.getId();
@@ -123,13 +125,15 @@
.eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE.getKey())
);
- if(Objects.nonNull(ywPatrolPoint.getMultifile())){
- ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
- ywPatrolPoint.getMultifile().setCreateDate(new Date());
- ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
- ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
- ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
- multifileMapper.insert(ywPatrolPoint.getMultifile());
+ if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ multifile.setObjId(ywPatrolPoint.getId());
+ multifile.setFileurl(ywPatrolPoint.getFileUrl());
+ multifileMapper.insert(multifile);
}
}
@@ -157,8 +161,7 @@
if(Objects.nonNull(multifile)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
- multifile.setFileurlFull(path + multifile.getFileurl());
- ywPatrolPoint.setMultifile(multifile);
+ ywPatrolPoint.setFileFullUrl(path + multifile.getFileurl());
}
return ywPatrolPoint;
}
--
Gitblit v1.9.3