From d7dca690cedd12e271f0ee0b9050679d73796f5c Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 06 一月 2025 09:28:10 +0800 Subject: [PATCH] 1 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 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 4265e5c..548644c 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; @@ -82,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()) ); @@ -156,13 +157,18 @@ @Override public YwPatrolPoint getDetail(Integer id) { YwPatrolPoint ywPatrolPoint = ywPatrolPointMapper.selectById(id); + if(Objects.isNull(ywPatrolPoint)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); + } Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id) - .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE).last(" limit 1")); - if(Objects.nonNull(multifile)){ + .eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE.getKey()).orderByDesc(Multifile::getId).last(" limit 1")); + if(Objects.nonNull(multifile) && StringUtils.isNotBlank(multifile.getFileurl())){ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode(); ywPatrolPoint.setFileFullUrl(path + multifile.getFileurl()); + ywPatrolPoint.setFileUrl(multifile.getFileurl()); } + return ywPatrolPoint; } -- Gitblit v1.9.3