张氏APP 后台
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zqy
2024-06-23 a69aafe60ce001834b981778f12fd74d4af77e23 
 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;


@@ -37,6 +37,9 @@




    @Autowired


    ZYearInfoServiceImpl zYearInfoService;




    @Resource


    ZYearInfoMapper zYearInfoMapper;




    private LambdaQueryWrapper<ZYearInfo> uniqueCondition(ZYearInfo zYearInfo) {


        LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();


@@ -57,6 +60,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 +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) {