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/ZYearInfoServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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..a6f5504 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
@@ -17,8 +17,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -38,6 +40,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 +61,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 +120,12 @@
     }
 
     @Override
+    public AjaxResult listType() {
+        List<String> result = zYearInfoMapper.listType();
+        return AjaxResult.success(result);
+    }
+
+    @Override
     @Transactional
     public AjaxResult importExcel(MultipartFile file) {
 

--
Gitblit v1.9.1