zqy
3 天以前 ee02f5032743f3c0bd217cb6cf8ba03ee663c629
zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -5,9 +5,10 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.domain.peopleSea;
import com.ruoyi.domain.PeopleSea;
import com.ruoyi.service.PeopleSearchService;
import com.ruoyi.service.ZfEventService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,7 @@
    private ZfEventService zfEventService;
    private LambdaQueryWrapper<peopleSea> buildCondition(peopleSea peops) {
    private LambdaQueryWrapper<PeopleSea> buildCondition(PeopleSea peops) {
        return null;
//        if(peops.getModule().equals("事纪")) {
@@ -44,7 +45,7 @@
    @Override
    public AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize) {
    public AjaxResult selectDataList(PeopleSea peopleS, Integer pageNum, Integer pageSize) {
        System.out.println(peopleS.getModules().toString());
        for(String thi: peopleS.getModules()) {
@@ -62,9 +63,21 @@
                for (String pe : pes) {
                    lqw.like(ZfEvent::getPeople, pe);
                }
                lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
                peopleS.setIsHIde("否");
                lqw.eq(!StringUtils.isEmpty(peopleS.getIsHIde()), ZfEvent::getIsHide, "否");
                Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
                lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
                if(peopleS.getHasAttachment()!=null&&peopleS.getHasAttachment().equals("是"))
                {
                    System.out.println("not null!");
                    lqw.isNotNull(ZfEvent::getUrl).and(r->r.apply("url!=''"));
                }else
                {
                    lqw.eq(!StringUtils.isEmpty(peopleS.getHasAttachment()), ZfEvent::getUrl, "");
                }
              //  if(peopleS.getIsHIde()!=null)
               Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
                Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);
                List<ZfEvent> beanRecords = pageResult.getRecords();//得到查询出来的数据