From 5321434d86e07cc45e4fed0e6bc853b3ec8bf7f2 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 17:05:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-shan?= =?UTF-8?q?gchuan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/po/WrkProjectContract.java | 2 ++ .../project/mapper/WrkProjectMapper.java | 9 +++++++++ .../service/WrkProjectContractService.java | 19 +++++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java index f25d15d..d831e44 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java @@ -107,4 +107,6 @@ public class WrkProjectContract extends BaseEntity { */ @TableField(exist = false) private List audits; + + private String mimeType; } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java index 10e3538..001a53a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java @@ -1,11 +1,20 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chushang.inspection.project.po.WrkProject; +import com.chushang.inspection.project.po.WrkProjectContract; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @auther: zhao * @date: 2024/6/15 10:51 */ public interface WrkProjectMapper extends BaseMapper { + @Select("select wrk.*,file.mime_type as mimeType from \n" + + "tb_inspection.wrk_project_contract wrk \n" + + "left join tb_file.tb_file_source_info file on wrk.remark = file.fid \n" + + " where wrk.project_id = #{projectId}") + IPage selectContractsWithAdditionalData(IPage page, @Param("projectId") Long projectId); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java index ef7e3e1..8df98a4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java @@ -8,7 +8,9 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.inspection.project.dto.PageAuditDTO; +import com.chushang.inspection.project.mapper.WrkProjectMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.mapper.WrkProjectContractMapper; @@ -42,13 +44,18 @@ public class WrkProjectContractService extends ServiceImpl queryWrapper = WrapperUtils.builder(contract, commonParam); - IPage page = this.page( - new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), - queryWrapper - ); - return new PageResult(page); +// LambdaQueryWrapper queryWrapper = WrapperUtils.builder(contract, commonParam); +// IPage page = this.page( +// new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), +// queryWrapper +// ); + IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()); + IPage resultPage = wrkProjectMapper.selectContractsWithAdditionalData(page, contract.getProjectId()); + return new PageResult(resultPage); +// return new PageResult(page); }