zqy
3 天以前 b10524103480a6834a2e8d5662f009c745143cc4
zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java
@@ -45,36 +45,33 @@
    @Override
    public AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize) {
        System.out.println(peopleS.getModules().toString());
        for(String thi: peopleS.getModules()) {
            System.out.println("dsf4444");
            HashMap<String, Object> data = new HashMap<>();
            if (thi.equals("事纪")) {
                LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
                ;
                //按照,分割名称
                String[] pes = peopleS.getPeoples().split(",");
                // 后续条件用and连接
                for (String pe : pes) {
                    lqw.like(ZfEvent::getPeople, pe);
                }
                lqw.between(peopleS.getStartTime() != null && peopleS.getEndTime() != null, ZfEvent::getHappenTime, peopleS.getStartTime(), peopleS.getEndTime());
                if(peopleS.getHasAttachment().equals("是"))
                {
                    lqw.isNotNull(ZfEvent::getUrl);
                }
                if(peopleS.getHasAttachment().equals("是"))
                {
                    lqw.isNotNull(ZfEvent::getUrl);
                }
                Page<ZfEvent> zfEventPage = new Page<>(pageNum, pageSize);
                Page<ZfEvent> pageResult = zfEventService.page(zfEventPage, lqw);
                List<ZfEvent> beanRecords = pageResult.getRecords();//得到查询出来的数据
                System.out.println(beanRecords);
                System.out.println(beanRecords.size());
                List<zfEventdto> dtoResult = encapData(beanRecords, "事纪");
                System.out.println(dtoResult);
                data = MapUtils.getResult(pageResult, dtoResult);
                System.out.println(data);
            }
            //合并多个data