From e6c44608f25355eda2c86b3e1356682996194a64 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 22 五月 2024 18:05:59 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index d1351e6..c5113c3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -10,6 +11,8 @@
import com.doumee.dao.business.HiddenDangerMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.service.business.HiddenDangerService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,9 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 闅愭偅淇℃伅琛⊿ervice瀹炵幇
@@ -36,6 +37,10 @@
@Autowired
private HiddenDangerMapper hiddenDangerMapper;
+ @Autowired
+ private MultifileMapper multifileMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private MemberMapper memberMapper;
@@ -82,9 +87,67 @@
@Override
public HiddenDanger findById(Integer id) {
- return hiddenDangerMapper.selectById(id);
- }
+ MPJLambdaWrapper<HiddenDanger> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(HiddenDanger.class)
+ .selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName)
+ .select("t1.name", HiddenDanger::getMemberName)
+ .select("t1.phone",HiddenDanger::getMemberPhone)
+ .select("t2.name",HiddenDanger::getCheckorName)
+ .select("t3.phone",HiddenDanger::getCheckorPhone)
+ .select("t4.company_name_path",HiddenDanger::getCompanyName);
+ queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
+ .leftJoin("company t4 on t1.company_id=t4.id")
+ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId);
+ queryWrapper
+ .eq(HiddenDanger::getId, id).last("limit 1");
+ HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,queryWrapper);
+ if(model ==null || Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ initFiles(model);
+ return model;
+ }
+ private void initFiles(HiddenDanger unionChange) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, unionChange.getId() )
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.HIDDEN_DANGER_SUBMIT.getKey()
+ ,Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey()
+ ,Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey()}))
+ .eq(Multifile::getIsdeleted,Constants.ZERO));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.HIDDEN_DANGER_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HIDDEN_DANGER_SUBMIT.getKey())){
+ //鐜板満鎯呭喌
+ if(unionChange.getSubmitFileList() == null){
+ unionChange.setSubmitFileList(new ArrayList<>());
+ }
+ unionChange.getSubmitFileList().add(f);
+ }
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HIDDEN_DANGER_DEAL_BEFORE.getKey())){
+ //澶勭悊鍓嶉檮浠�
+ if(unionChange.getDealBeforeFileList() == null){
+ unionChange.setDealBeforeFileList(new ArrayList<>());
+ }
+ unionChange.getDealBeforeFileList().add(f);
+ }
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey())){
+ //澶勭悊鍚庨檮浠�
+ if(unionChange.getDealAfterFileList() == null){
+ unionChange.setDealAfterFileList(new ArrayList<>());
+ }
+ unionChange.getDealAfterFileList().add(f);
+ }
+ }
+ }
+ }
@Override
public HiddenDanger findOne(HiddenDanger hiddenDanger) {
QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
@@ -134,6 +197,7 @@
.eq(pageWrap.getModel().getChecklInfo() != null, HiddenDanger::getChecklInfo, pageWrap.getModel().getChecklInfo())
.eq(pageWrap.getModel().getCheckUserId() != null, HiddenDanger::getCheckUserId, pageWrap.getModel().getCheckUserId())
.eq(pageWrap.getModel().getAreaName() != null, HiddenDanger::getAreaName, pageWrap.getModel().getAreaName())
+
.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), Empower::getCreateDate,pageWrap.getModel().getQueryStartTime())
@@ -147,7 +211,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(hiddenDangerMapper.selectPage(page, queryWrapper));
+ return PageData.from(hiddenDangerMapper.selectJoinPage(page,HiddenDanger.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3