From d0850c1c55c5f709874cde1b5f292813fbd3af5e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 12:12:59 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index e924156..19d3e7e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZYearInfo;
-import com.ruoyi.domain.ZYearInfo;
import com.ruoyi.mapper.ZYearInfoMapper;
import com.ruoyi.service.ZYearInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +18,7 @@
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;
@@ -38,6 +38,9 @@
@Autowired
ZYearInfoServiceImpl zYearInfoService;
+ @Resource
+ ZYearInfoMapper zYearInfoMapper;
+
private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) {
LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
lqw.eq(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
@@ -56,6 +59,8 @@
.like(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
.like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
.like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
+ .like(StringUtils.isNotEmpty(zYearInfo.getNotice()),ZYearInfo::getNotice,zYearInfo.getNotice())
+ .like(StringUtils.isNotEmpty(zYearInfo.getRemark()),ZYearInfo::getRemark,zYearInfo.getRemark())
.between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime())
.orderByDesc(ZYearInfo::getCreateTime);
return lqw;
@@ -113,6 +118,21 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zYearInfoMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
+ public List<ZYearInfo> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZYearInfo zYearInfo = new ZYearInfo();
+ LambdaQueryWrapper<ZYearInfo> lqw = buildCondition(zYearInfo, userId);
+ return list(lqw);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1