修改了一个bug

feige

4 天以前 92756a19ca99f2cade8a7e3ff46e08f47bf31cbc

修改了一个bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/peopleSearchController.java

New file
@@ -0,0 +1,36 @@
package com.ruoyi.web.controller.zhang;

import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.peopleSea;
import com.ruoyi.service.PeopleSearchService;
import com.ruoyi.service.PhyscialService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;

@RestController
@RequestMapping("/zPeopleSearch")
public class peopleSearchController extends BaseController {

    @Autowired
    private PeopleSearchService peopleSearchService;


    @GetMapping("/all")
    public AjaxResult listAll(peopleSea peopleSea){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        System.out.println(peopleSearchService);
        System.out.println(peopleSea);

        return peopleSearchService.selectDataList(peopleSea, pageNum, pageSize);
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZProperty.java

@@ -48,7 +48,8 @@
     */
    @Excel(name = "财产类别")
    private String type;

    @Excel(name = "价值区间")
    private String valueRange;
    /**
     * 收支名称
     */

 zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java

@@ -52,7 +52,8 @@
    /** 存放地址 */
    @Excel(name = "存放地址")
    private String address;

    @Excel(name = "价值区间")
    private String valueRange;
    @Excel(name="备注")
    private String remark;


 zhang-content/src/main/java/com/ruoyi/domain/dto/zfEventdto.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.domain.dto;

import lombok.Data;

import java.util.Date;

@Data
public class zfEventdto {
    private String module;
    private String name;
    private Integer id;
    private Date createTime;
}

 zhang-content/src/main/java/com/ruoyi/domain/peopleSea.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.domain;

import lombok.Data;

import java.util.Date;

@Data
public class peopleSea {
    private String[] modules;

//    private String module;
    private Date startTime;
    private Date endTime;
    private String peoples;
}

 zhang-content/src/main/java/com/ruoyi/service/PeopleSearchService.java

New file
@@ -0,0 +1,9 @@
package com.ruoyi.service;

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.peopleSea;

public interface PeopleSearchService {

    AjaxResult selectDataList(peopleSea peopleS, Integer pageNum, Integer pageSize);
}

 zhang-content/src/main/java/com/ruoyi/service/impl/PeopleSearchServiceImpl.java

New file
@@ -0,0 +1,101 @@
package com.ruoyi.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;

import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.domain.peopleSea;
import com.ruoyi.service.PeopleSearchService;
import com.ruoyi.service.ZfEventService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

@Service
public class PeopleSearchServiceImpl implements PeopleSearchService {

    @Autowired
    private ZfEventService zfEventService;


    private LambdaQueryWrapper<peopleSea> buildCondition(peopleSea peops) {

        return null;
//        if(peops.getModule().equals("事纪")) {
//            LambdaQueryWrapper<> lqw = new LambdaQueryWrapper<>();
//            lqw.orderByDesc(ZfEquipment::getHappenTime);
//            lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
//            lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
//            lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
//            lqw.like(StringUtils.isNotEmpty(zfEquipment.getLocation()), ZfEquipment::getLocation, zfEquipment.getLocation());
//            lqw.like(StringUtils.isNotEmpty(zfEquipment.getRemark()), ZfEquipment::getRemark, zfEquipment.getRemark());
//            lqw.eq(zfEquipment.getHappenTime() != null, ZfEquipment::getHappenTime, zfEquipment.getHappenTime());
//
//            lqw.between(peops.getStartTime() != null && peops.getEndTime() != null, peopleSea::getStartTime, zfEquipment.getHappenStartTime(), zfEquipment.getHappenEndTime());
//
//        } return lqw;
    }

    @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());

                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
            return AjaxResult.success(data);

        }

        return null;
    }
    public List<zfEventdto> encapData(List<ZfEvent> lis, String module)
    {
        List<zfEventdto> daoRes = new ArrayList<>() ;
        for(ZfEvent obj : lis)
        {
            zfEventdto atd = new zfEventdto();
            atd.setId(obj.getId());
            atd.setModule(module);
            atd.setName(obj.getPeople());
            atd.setCreateTime(obj.getHappenTime());
            daoRes.add(atd);
        }
        return daoRes;
    }
}