chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 项目管理-shangchuan

This commit is contained in:
renzexin 2024-08-15 17:05:37 +08:00
parent e6e997b179
commit 5321434d86
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java
View File

@ -107,4 +107,6 @@ public class WrkProjectContract extends BaseEntity {
*/ */
@TableField(exist = false) @TableField(exist = false)
private List<WrkAudit> audits; private List<WrkAudit> audits;
private String mimeType;
} }

9
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java
View File

@ -1,11 +1,20 @@
package com.chushang.inspection.project.mapper; package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.WrkProject;
import com.chushang.inspection.project.po.WrkProjectContract;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* @auther: zhao * @auther: zhao
* @date: 2024/6/15 10:51 * @date: 2024/6/15 10:51
*/ */
public interface WrkProjectMapper extends BaseMapper<WrkProject> { public interface WrkProjectMapper extends BaseMapper<WrkProject> {
@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<WrkProjectContract> selectContractsWithAdditionalData(IPage<WrkProjectContract> page, @Param("projectId") Long projectId);
} }

19
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java
View File

@ -8,7 +8,9 @@ import com.chushang.common.mybatis.page.CommonParam;
import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.PageResult;
import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.common.mybatis.utils.WrapperUtils;
import com.chushang.inspection.project.dto.PageAuditDTO; import com.chushang.inspection.project.dto.PageAuditDTO;
import com.chushang.inspection.project.mapper.WrkProjectMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chushang.inspection.project.mapper.WrkProjectContractMapper; import com.chushang.inspection.project.mapper.WrkProjectContractMapper;
@ -42,13 +44,18 @@ public class WrkProjectContractService extends ServiceImpl<WrkProjectContractMap
// return pageList(contract, commonParam); // return pageList(contract, commonParam);
// } // }
@Autowired
private WrkProjectMapper wrkProjectMapper;
public PageResult pageList(WrkProjectContract contract, CommonParam commonParam) { public PageResult pageList(WrkProjectContract contract, CommonParam commonParam) {
LambdaQueryWrapper<WrkProjectContract> queryWrapper = WrapperUtils.builder(contract, commonParam); // LambdaQueryWrapper<WrkProjectContract> queryWrapper = WrapperUtils.builder(contract, commonParam);
IPage<WrkProjectContract> page = this.page( // IPage<WrkProjectContract> page = this.page(
new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), // new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
queryWrapper // queryWrapper
); // );
return new PageResult(page); IPage<WrkProjectContract> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit());
IPage<WrkProjectContract> resultPage = wrkProjectMapper.selectContractsWithAdditionalData(page, contract.getProjectId());
return new PageResult(resultPage);
// return new PageResult(page);
} }