From df78e9074d62a146d68752d65a65baf8d6efa66f Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期一, 21 八月 2023 22:59:57 +0800 Subject: [PATCH] 652487 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java index 650daf0..084bf4c 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java @@ -14,12 +14,14 @@ import com.ruoyi.domain.ZSecret; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZSecretMapper; +import com.ruoyi.service.ZHonorService; import com.ruoyi.service.ZSecretService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -39,6 +41,9 @@ @Autowired ZSecretServiceImpl zSecretService; + @Resource + ZSecretMapper zSecretMapper; + private LambdaQueryWrapper<ZSecret> uniqueCondition(ZSecret zSecret) { LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>(); lqw.eq(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType()) @@ -57,7 +62,11 @@ lqw.eq(userId != null, ZSecret::getUserId, userId) .like(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType()) .like(StringUtils.isNotEmpty(zSecret.getAccNo()), ZSecret::getAccNo, zSecret.getAccNo()) + .like(StringUtils.isNotEmpty(zSecret.getRemark()), ZSecret::getRemark, zSecret.getRemark()) + .like(StringUtils.isNotEmpty(zSecret.getLocation()), ZSecret::getLocation, zSecret.getLocation()) .eq(zSecret.getIsFinger()!=null,ZSecret::getIsFinger,zSecret.getIsFinger()) + .eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate()) + .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace()) .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime()) .orderByDesc(ZSecret::getCreateTime); return lqw; @@ -115,6 +124,23 @@ } @Override + public List<ZSecret> selectByCondition() { + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + ZSecret zSecret = new ZSecret(); + + LambdaQueryWrapper<ZSecret> lqw = buildCondition(zSecret, userId); + return list(lqw); + + } + + @Override + public AjaxResult listType() { + List<String> result = zSecretMapper.listType(); + return AjaxResult.success(result); + } + + @Override @Transactional public AjaxResult importExcel(MultipartFile file) { -- Gitblit v1.9.1