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

fix 项目管理-上传

This commit is contained in:
renzexin 2024-08-16 10:10:06 +08:00
parent e2aeed72b2
commit fa5bc082a5
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java
View File

@ -60,4 +60,9 @@ public class ContractDTO {
* 备注 * 备注
*/ */
private String remark; private String remark;
private String mimeType;
private String fid;
private String realPath;
private String name;
} }

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

@ -107,6 +107,12 @@ public class WrkProjectContract extends BaseEntity {
*/ */
@TableField(exist = false) @TableField(exist = false)
private List<WrkAudit> audits; private List<WrkAudit> audits;
@TableField(value = "mime_type")
private String mimeType; private String mimeType;
@TableField(value = "fid")
private String fid;
@TableField(value = "real_path")
private String realPath;
@TableField(value = "name")
private String name;
} }

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

@ -12,9 +12,5 @@ import org.apache.ibatis.annotations.Select;
* @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);
} }

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

@ -7,8 +7,7 @@ import com.chushang.common.core.exception.utils.AssertUtil;
import com.chushang.common.mybatis.page.CommonParam; 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.oss.feign.RemoteOssService;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -17,8 +16,6 @@ import com.chushang.inspection.project.mapper.WrkProjectContractMapper;
import com.chushang.inspection.project.po.WrkProjectContract; import com.chushang.inspection.project.po.WrkProjectContract;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
/** /**
* @auther: zhao * @auther: zhao
* @date: 2024/6/15 10:51 * @date: 2024/6/15 10:51
@ -44,18 +41,13 @@ 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
// ); );
IPage<WrkProjectContract> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()); return new PageResult(page);
IPage<WrkProjectContract> resultPage = wrkProjectMapper.selectContractsWithAdditionalData(page, contract.getProjectId());
return new PageResult(resultPage);
// return new PageResult(page);
} }

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -201,6 +201,7 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
projectContract.setProjectEffect(projectEffect); projectContract.setProjectEffect(projectEffect);
Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
// Long deptId = 200L;
projectContract.setDeptId(deptId); projectContract.setDeptId(deptId);
// 新增合同的时候, 为待初审状态 // 新增合同的时候, 为待初审状态
projectContract.setAuditStatus(1); projectContract.setAuditStatus(1);