监理月报

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<MonthlyReport> pageList = monthlyReportService.page(page, queryWrapper);
+        IPage<MonthlyReport> pageList = monthlyReportService.pageList(page, queryWrapper);
         return Result.success(pageList);
     }
 

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;
 }

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<MonthlyReport> {
 
+    Page<MonthlyReport> pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper<MonthlyReport> wrapper);
 }

src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/MonthlyReportMapper.xml

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.quality.mapper.MonthlyReportMapper">
 
+    <select id="pageList" resultType="com.zhgd.xmgl.modules.quality.entity.MonthlyReport">
+        select * from (select m.*, u.real_name createByName FROM monthly_report m LEFT JOIN system_user u ON m.create_by = u.user_id) a
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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<MonthlyReport> {
     Page<EngineeringPageDto> engineeringPageList(Map<String, Object> map);
 
     Page<ProjectPageDto> projectPageList(Map<String, Object> map);
+
+    Page<MonthlyReport> pageList(Page page, QueryWrapper<MonthlyReport> wrapper);
 }

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<MonthlyReportMapper, M
     public Page<ProjectPageDto> projectPageList(Map<String, Object> map) {
         return projectService.pageListForGov(map);
     }
+
+    @Override
+    public Page<MonthlyReport> pageList(Page page, QueryWrapper<MonthlyReport> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
 }