1564894

whywhyo

2023-08-14 0dc7b41e2530e7ea13066d2f17dc8bb24e4bd2dd

 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;
@@ -37,6 +39,9 @@

    @Autowired
    ZYearInfoServiceImpl zYearInfoService;

    @Resource
    ZYearInfoMapper zYearInfoMapper;

    private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) {
        LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
@@ -57,6 +62,7 @@
                .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;
@@ -114,6 +120,12 @@
    }

    @Override
    public AjaxResult listType() {
        List<String> result = zYearInfoMapper.listType();
        return AjaxResult.success(result);
    }

    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {