@@ -21,6 +21,8 @@ public interface ContractsMapper extends BaseMapper<Contracts> {
List<ContractExportDto> findAllContracts(ContractRequest contractRequest);
- List<ContractExportDto> findAllErContracts();
+ List<ContractExportDto> findAllContracts();
+
+ List<ContractExportDto> findAllErContracts(ContractRequest contractRequest);
}
@@ -328,7 +328,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
/**
* 临修数据
*/
- List<ContractExportDto> contractTemList=contractsMapper.findAllErContracts();
+ List<ContractExportDto> contractTemList=contractsMapper.findAllErContracts(contractRequest);
* 数据合并
@@ -68,4 +68,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
List<Map<String, String>> exportLiftList(@Param("exportLiftList") List<String> ids);
@@ -493,7 +493,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
public List<Map<String, String>> exportList(List<String> ids) {
- return baseMapper.exportList(ids);
+ return baseMapper.List(ids);
public List<Map<String, String>> exportLiftList(List<String> ids) {
@@ -52,7 +52,7 @@
<!-- 根据项目、合同号、合同类型、合同状态查询合同管理列表-->
<select id="findByCondition"
- resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.ContractResponse"
+ resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.ContractResponse">
parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest">
SELECT
c.id AS id,