ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
@@ -26,6 +26,12 @@ /** 合同 */ private Integer contractId; /** 运维单位 */ private String unitName; /** 合同名称 */ private String contractName; /** 核算日期 */ private LocalDateTime calculateTime; ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
@@ -19,7 +19,7 @@ * @param <Q> 查询类 * @return */ public static <T extends AbsEntity, Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) { public static <T , Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) { Page<T> page = new Page<T>() .setCurrent(q.getPageNum()) .setSize(q.getPageSize()); ycl-server/src/main/java/com/ycl/platform/mapper/CalculateReportMapper.java
@@ -1,11 +1,14 @@ package com.ycl.platform.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.platform.domain.entity.CalculateReport; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.platform.domain.query.CalculateReportQuery; import com.ycl.platform.domain.vo.CalculateReportVO; import com.ycl.platform.domain.form.CalculateReportForm; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * 核算报告 Mapper 接口 @@ -16,4 +19,11 @@ @Mapper public interface CalculateReportMapper extends BaseMapper<CalculateReport> { /** * 核算报告分页 * * @param query * @param page */ void page(@Param("query") CalculateReportQuery query, IPage<CalculateReportVO> page); } ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -101,17 +101,9 @@ */ @Override public Result page(CalculateReportQuery query) { IPage<CalculateReport> page = new LambdaQueryChainWrapper<>(baseMapper) .orderByDesc(CalculateReport::getCreateTime) .page(PageUtil.getPage(query, CalculateReport.class)); List<CalculateReportVO> vos = page.getRecords().stream() .map( entity -> CalculateReportVO.getVoByEntity(entity, null) ) .collect(Collectors.toList()); return Result.ok().data(vos).total(page.getTotal()); IPage<CalculateReportVO> page = PageUtil.getPage(query, CalculateReportVO.class); baseMapper.page(query, page); return Result.ok().data(page.getRecords()).total(page.getTotal()); } /** ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
New file @@ -0,0 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.platform.mapper.CalculateReportMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CalculateReportVO"> <result column="id" property="id" /> <result column="create_time" property="createTime" /> <result column="unit_name" property="unitName" /> <result column="name" property="contractName" /> <result column="contract_id" property="contractId" /> <result column="calculate_time" property="calculateTime" /> <result column="deduct_money" property="deductMoney" /> <result column="which_year" property="whichYear" /> <result column="which_month" property="whichMonth" /> <result column="update_by" property="updateBy" /> </resultMap> <select id="page" resultMap="BaseResultMap"> SELECT tyu.unit_name, tc.name, tcr.id, tcr.deduct_money, tcr.create_time, tcr.update_time, tcr.calculate_time FROM t_calculate_report tcr INNER JOIN t_contract tc ON tcr.contract_id = tc.id INNER JOIN t_yw_unit tyu ON tyu.id = tc.unit_id <where> <if test="query.unitName != null and query.unitName != '' "> AND tyu.unit_name like concat('%', #{query.unitName}, '%') </if> </where> </select> </mapper>