From c462126d2eaf08e95c7bbb7f5db0a1a826356a75 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 28 十一月 2024 15:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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..0674afb 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwPatrolPointMapper;
import com.doumee.dao.business.model.Category;
@@ -65,13 +66,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();
@@ -80,7 +83,7 @@
@Override
public void deleteById(Integer id, LoginUserInfo user) {
ywPatrolPointMapper.update(new UpdateWrapper<YwPatrolPoint>().lambda().set(YwPatrolPoint::getIsdeleted,Constants.ONE)
- .set(YwPatrolPoint::getEditDate," now() ")
+ .set(YwPatrolPoint::getEditDate, DateUtil.getCurrDateTime())
.set(YwPatrolPoint::getEditor,user.getId())
.eq(YwPatrolPoint::getId,user.getId())
);
@@ -123,13 +126,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 +162,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