diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java index 6646ef0..874e401 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/MonthlyReportController.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; import com.zhgd.xmgl.modules.quality.service.IMonthlyReportService; @@ -66,7 +65,7 @@ public class MonthlyReportController { if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { queryWrapper.lambda().eq(MonthlyReport::getEngineeringSn, StrUtil.EMPTY); } - IPage pageList = monthlyReportService.page(page, queryWrapper); + IPage pageList = monthlyReportService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java index 79aefe8..8246235 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java @@ -291,4 +291,10 @@ public class MonthlyReport implements Serializable { @Excel(name = "项目sn", width = 15) @ApiModelProperty(value = "项目sn") private String projectSn; + /** + * 创建人姓名 + */ + @Excel(name = "创建人姓名", width = 15) + @ApiModelProperty(value = "创建人姓名") + private String createByName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java index 9990fa8..79fa9b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/MonthlyReportMapper.java @@ -1,8 +1,12 @@ package com.zhgd.xmgl.modules.quality.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.quality.entity.MonthlyReport; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @Description: 监理月报 @@ -13,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MonthlyReportMapper extends BaseMapper { + Page pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml index bf8ff83..a921e05 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml @@ -2,4 +2,8 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java index 9c1ae41..8c7e676 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IMonthlyReportService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.quality.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; @@ -19,4 +20,6 @@ public interface IMonthlyReportService extends IService { Page engineeringPageList(Map map); Page projectPageList(Map map); + + Page pageList(Page page, QueryWrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java index 990056e..e1ae562 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.quality.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; @@ -39,4 +40,9 @@ public class MonthlyReportServiceImpl extends ServiceImpl projectPageList(Map map) { return projectService.pageListForGov(map); } + + @Override + public Page pageList(Page page, QueryWrapper wrapper) { + return baseMapper.pageList(page, wrapper); + } }