diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidPrequ.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidPrequ.java index ad72a224..22dcb446 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidPrequ.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidPrequ.java @@ -1,6 +1,8 @@ package com.kms.earlyStage.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,6 +32,7 @@ public class ProjectBidPrequ extends BaseEntity /** 招标项目名称 */ @Excel(name = "招标项目名称") @ApiModelProperty("招标项目名称") + @TableField(exist = false) private String bidProjectName; /** 资格预审文件获取开始时间 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidPrequMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidPrequMapper.java index 8afe384b..d690a82a 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidPrequMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidPrequMapper.java @@ -1,9 +1,13 @@ package com.kms.earlyStage.mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.earlyStage.domain.ProjectBidPrequ; +import java.util.Date; +import java.util.List; + /** * 资格预审公告Mapper接口 * @@ -13,4 +17,10 @@ import com.kms.earlyStage.domain.ProjectBidPrequ; @Repository public interface ProjectBidPrequMapper extends BaseMapper { + List getList(@Param("proNo") String proNo, + @Param("projectCode") String projectCode, + @Param("fileGainTime") Date fileGainTime, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java index 976c2c7b..99cc96fd 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java @@ -21,6 +21,7 @@ public interface SpecialProjectProposalMapper extends BaseMapper getXzqh(@Param("id") String id, @Param("projectName") String projectName, + @Param("proNo") String proNo, @Param("projectType") String projectType, @Param("adcd") String adcd, @Param("orderBy") String orderBy, diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidPrequService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidPrequService.java index 80e29e72..20c581f2 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidPrequService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidPrequService.java @@ -1,15 +1,20 @@ package com.kms.earlyStage.service; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.mybaitsplus.BeanToWrapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.ProjectBidPrequMapper; import com.kms.earlyStage.domain.ProjectBidPrequ; +import java.util.List; +import java.util.Map; + /** * 资格预审公告Service接口 * @@ -17,12 +22,30 @@ import com.kms.earlyStage.domain.ProjectBidPrequ; * @date 2023-09-11 */ @Service -public class ProjectBidPrequService extends BaseService{ - public IPage selectPage(SearchParam sp){ - QueryWrapper qw =BeanToWrapper.getWrapper(sp); -// qw.like("project","项目"); +public class ProjectBidPrequService extends BaseService { + + @Autowired + private ProjectBidPrequMapper projectBidPrequMapper; + + + public IPage selectPage(SearchParam sp) { + ProjectBidPrequ data = sp.getData(); + + Map params = sp.getParams(); + List list = null; + if (ObjectUtil.isNull(params)) { + list = projectBidPrequMapper.getList(data.getProNo(), data.getProjectCode(), data.getFileGainTime() + , "create_time", sp.getPageNum(), sp.getPageSize()); + }else { + list = projectBidPrequMapper.getList(data.getProNo(), data.getProjectCode(), data.getFileGainTime() + , (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); + } + + Page page = new Page<>(); - return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()), qw); + page.setRecords(list); + page.setTotal(list.size()); + return page; } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index a399d867..9eb2580a 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java @@ -42,10 +42,10 @@ public class SpecialProjectProposalService extends BaseService list = null; if (ObjectUtil.isNull(params)) { - list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(), + list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), data.getProjectType(),adcd,"create_time",sp.getPageNum(),sp.getPageSize()); }else { - list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(), + list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidPrequMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidPrequMapper.xml new file mode 100644 index 00000000..f987273c --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidPrequMapper.xml @@ -0,0 +1,45 @@ + + + + + + select + project_name, + bp.* + + from bs_slgc_qqjd_pro_bid_prequ bp + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bp.pro_no and pp.project_code = bp.project_code + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml index 9cfb42f2..82df59e5 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml @@ -6,7 +6,7 @@ select - pp.project_name, + project_name, pp.project_code, pp.project_type, bi.* diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml index 44b546fd..fd579a17 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml @@ -54,6 +54,9 @@ and project_type=#{projectType} + + and pro_no=#{proNo} + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};