diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java index 5e67111..57f6562 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java @@ -60,4 +60,9 @@ public class ContractDTO { * 备注 */ private String remark; + private String mimeType; + private String fid; + private String realPath; + private String name; + } 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 d831e44..453249a 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,6 +107,12 @@ public class WrkProjectContract extends BaseEntity { */ @TableField(exist = false) private List audits; - + @TableField(value = "mime_type") private String mimeType; + @TableField(value = "fid") + private String fid; + @TableField(value = "real_path") + private String realPath; + @TableField(value = "name") + private String name; } 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 001a53a..46c7ff8 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 @@ -12,9 +12,5 @@ import org.apache.ibatis.annotations.Select; * @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 8df98a4..65878cd 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 @@ -7,8 +7,7 @@ import com.chushang.common.core.exception.utils.AssertUtil; 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 com.chushang.oss.feign.RemoteOssService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,8 +16,6 @@ import com.chushang.inspection.project.mapper.WrkProjectContractMapper; import com.chushang.inspection.project.po.WrkProjectContract; import org.springframework.transaction.annotation.Transactional; -import java.util.Collections; - /** * @auther: zhao * @date: 2024/6/15 10:51 @@ -44,18 +41,13 @@ 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 -// ); - 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); + LambdaQueryWrapper 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); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index 218e028..ef31cde 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -201,6 +201,7 @@ public class WrkProjectService extends ServiceImpl projectContract.setProjectEffect(projectEffect); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); +// Long deptId = 200L; projectContract.setDeptId(deptId); // 新增合同的时候, 为待初审状态 projectContract.setAuditStatus(1);