diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdBidFileController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdBidFileController.java index e17edd57..1363b38b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdBidFileController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdBidFileController.java @@ -3,12 +3,15 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,11 @@ public class BsSlgcQqjdBidFileController extends BaseController @Autowired private BsSlgcQqjdBidFileService bsSlgcQqjdBidFileService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + + + /** * 查询招标文件列表 */ @@ -75,7 +83,13 @@ public class BsSlgcQqjdBidFileController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(bsSlgcQqjdBidFileService.getById(id)); + BsSlgcQqjdBidFile byId = bsSlgcQqjdBidFileService.getById(id); + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProjectCode, byId.getProCode()) + .eq(SpecialProjectProposal::getProNo, byId.getProNo())); + + byId.setBidProjectName(one.getProjectName()); + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdContractFulfillingNoticeController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdContractFulfillingNoticeController.java index 2afdad5d..519674aa 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdContractFulfillingNoticeController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/BsSlgcQqjdContractFulfillingNoticeController.java @@ -3,12 +3,15 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,9 @@ public class BsSlgcQqjdContractFulfillingNoticeController extends BaseController @Autowired private BsSlgcQqjdContractFulfillingNoticeService bsSlgcQqjdContractFulfillingNoticeService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询项目合同及履行公示详情列表 */ @@ -75,7 +81,14 @@ public class BsSlgcQqjdContractFulfillingNoticeController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(bsSlgcQqjdContractFulfillingNoticeService.getById(id)); + BsSlgcQqjdContractFulfillingNotice byId = bsSlgcQqjdContractFulfillingNoticeService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProjectCode, byId.getProCode()) + .eq(SpecialProjectProposal::getProNo, byId.getProNo())); + + byId.setBidProjectName(one.getProjectName()); + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidNoticeController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidNoticeController.java index 14a6aa46..5afb2a85 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidNoticeController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidNoticeController.java @@ -3,12 +3,15 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,9 @@ public class ProjectBidNoticeController extends BaseController @Autowired private ProjectBidNoticeService projectBidNoticeService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询招标公告列表 */ @@ -75,7 +81,15 @@ public class ProjectBidNoticeController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(projectBidNoticeService.getById(id)); + ProjectBidNotice byId = projectBidNoticeService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode()) + .eq(SpecialProjectProposal::getProNo, byId.getProNo())); + + byId.setBidProjectName(one.getProjectName()); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidPrequController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidPrequController.java index 5405359d..227933c5 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidPrequController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidPrequController.java @@ -3,12 +3,16 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; +import com.sun.tools.internal.ws.wsdl.parser.W3CAddressingExtensionHandler; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +49,9 @@ public class ProjectBidPrequController extends BaseController @Autowired private ProjectBidPrequService projectBidPrequService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询资格预审公告列表 */ @@ -75,7 +82,13 @@ public class ProjectBidPrequController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(projectBidPrequService.getById(id)); + ProjectBidPrequ byId = projectBidPrequService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode())); + byId.setBidProjectName(one.getProjectName()); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidResultController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidResultController.java index 05ac42ef..7ee2a981 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidResultController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidResultController.java @@ -3,12 +3,15 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,9 @@ public class ProjectBidResultController extends BaseController @Autowired private ProjectBidResultService projectBidResultService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询中标结果列表 */ @@ -75,7 +81,13 @@ public class ProjectBidResultController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(projectBidResultService.getById(id)); + ProjectBidResult byId = projectBidResultService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode())); + byId.setBidProjectName(one.getProjectName()); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java index 30ec0a84..c6f7414d 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/ProjectBidWiningController.java @@ -4,18 +4,18 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; import com.kms.common.utils.BaseEntityUtils; -import com.kms.earlyStage.domain.ProjectBidDetails; -import com.kms.earlyStage.domain.ProjectBidWinner; -import com.kms.earlyStage.domain.SpecialProjectBidInfo; +import com.kms.earlyStage.domain.*; import com.kms.earlyStage.domain.vo.BidInfoVO; import com.kms.earlyStage.domain.vo.BidWinnerVO; import com.kms.earlyStage.mapper.ProjectBidWinnerMapper; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator; @@ -35,7 +35,6 @@ import com.jianwei.common.mybaitsplus.BeanToWrapper; import com.jianwei.common.annotation.Log; import com.jianwei.common.core.domain.AjaxResult; import com.jianwei.common.enums.BusinessType; -import com.kms.earlyStage.domain.ProjectBidWining; import com.kms.earlyStage.service.ProjectBidWiningService; @@ -56,6 +55,9 @@ public class ProjectBidWiningController extends BaseController @Autowired private ProjectBidWinnerMapper projectBidWinnerMapper; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询中标候选人公示基本信息列表 */ @@ -86,7 +88,12 @@ public class ProjectBidWiningController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(projectBidWiningService.getById(id)); + ProjectBidWining byId = projectBidWiningService.getById(id); + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode())); + byId.setBidProjectName(one.getProjectName()); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java index c19c6f53..0ea3e418 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -11,9 +12,11 @@ import com.kms.common.utils.BaseEntityUtils; import com.kms.earlyStage.domain.ProjectBidDetails; +import com.kms.earlyStage.domain.SpecialProjectProposal; import com.kms.earlyStage.domain.vo.BidInfoVO; import com.kms.earlyStage.mapper.ProjectBidDetailsMapper; import com.kms.earlyStage.service.ProjectBidDetailsService; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +55,9 @@ public class SpecialProjectBidInfoController extends BaseController @Autowired private ProjectBidDetailsMapper projectBidDetailsMapper; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + /** * 查询招标计划基本信息列表 */ @@ -82,7 +88,13 @@ public class SpecialProjectBidInfoController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(specialProjectBidInfoService.getById(id)); + SpecialProjectBidInfo byId = specialProjectBidInfoService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode())); + byId.setBidProjectName(one.getProjectName()); + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdBidFile.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdBidFile.java index 44f9b801..a247b800 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdBidFile.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdBidFile.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 BsSlgcQqjdBidFile extends BaseEntity /** 招标项目名称 */ @Excel(name = "招标项目名称") @ApiModelProperty("招标项目名称") + @TableField(exist = false) private String bidProjectName; /** 标段名称 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdContractFulfillingNotice.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdContractFulfillingNotice.java index 8b8926a9..d7b2bee5 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdContractFulfillingNotice.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdContractFulfillingNotice.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 BsSlgcQqjdContractFulfillingNotice extends BaseEntity /** 招标项目名称 */ @Excel(name = "招标项目名称") @ApiModelProperty("招标项目名称") + @TableField(exist = false) private String bidProjectName; /** 标段名称 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.java index dbe00dae..d7dc18b8 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidNotice.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; @@ -35,6 +37,7 @@ public class ProjectBidNotice extends BaseEntity /** 投资项目名称 */ @Excel(name = "投资项目名称") @ApiModelProperty("投资项目名称") + @TableField(exist = false) private String investProjectName; /** 招标项目名称 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java index b4239852..adcf0e0c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidResult.java @@ -2,6 +2,8 @@ package com.kms.earlyStage.domain; import java.math.BigDecimal; 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; @@ -41,6 +43,7 @@ public class ProjectBidResult extends BaseEntity /** 招标项目名称 */ @Excel(name = "招标项目名称") @ApiModelProperty("招标项目名称") + @TableField(exist = false) private String bidProjectName; /** 标段（包）名称 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWining.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWining.java index f2c12955..d965ff15 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWining.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWining.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; @@ -40,6 +42,7 @@ public class ProjectBidWining extends BaseEntity /** 招标项目名称 */ @Excel(name = "招标项目名称") @ApiModelProperty("招标项目名称") + @TableField(exist = false) private String bidProjectName; /** 标段（包）名称 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdBidFileMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdBidFileMapper.java index 7db40131..5250191c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdBidFileMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdBidFileMapper.java @@ -1,9 +1,12 @@ 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.BsSlgcQqjdBidFile; +import java.util.List; + /** * 招标文件Mapper接口 * @@ -13,4 +16,10 @@ import com.kms.earlyStage.domain.BsSlgcQqjdBidFile; @Repository public interface BsSlgcQqjdBidFileMapper extends BaseMapper { + List getList(@Param("bidProjectName") String bidProjectName, + @Param("proCode") String proCode, + @Param("proNo") String proNo, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java index d8ae6061..59a3469b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/BsSlgcQqjdContractFulfillingNoticeMapper.java @@ -1,9 +1,12 @@ 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.BsSlgcQqjdContractFulfillingNotice; +import java.util.List; + /** * 项目合同及履行公示详情Mapper接口 * @@ -13,4 +16,9 @@ import com.kms.earlyStage.domain.BsSlgcQqjdContractFulfillingNotice; @Repository public interface BsSlgcQqjdContractFulfillingNoticeMapper extends BaseMapper { + List getList(@Param("proNo") String proNo, + @Param("proCode") String proCode, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidNoticeMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidNoticeMapper.java index 56b3d338..d876b93c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidNoticeMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidNoticeMapper.java @@ -1,9 +1,13 @@ package com.kms.earlyStage.mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.earlyStage.domain.ProjectBidNotice; +import java.util.List; + /** * 招标公告Mapper接口 * @@ -13,4 +17,9 @@ import com.kms.earlyStage.domain.ProjectBidNotice; @Repository public interface ProjectBidNoticeMapper extends BaseMapper { + List getList(@Param("proNo") String proNo, + @Param("projectCode") String projectCode, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java index 7e615ba7..7ee0f980 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java @@ -1,9 +1,12 @@ 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.ProjectBidResult; +import java.util.List; + /** * 中标结果Mapper接口 * @@ -13,4 +16,9 @@ import com.kms.earlyStage.domain.ProjectBidResult; @Repository public interface ProjectBidResultMapper extends BaseMapper { + List getList(@Param("proNo") String proNo, + @Param("projectCode") String projectCode, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidWiningMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidWiningMapper.java index 2e6beda9..9087eeff 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidWiningMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidWiningMapper.java @@ -1,9 +1,12 @@ 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.ProjectBidWining; +import java.util.List; + /** * 中标候选人公示基本信息Mapper接口 * @@ -13,4 +16,10 @@ import com.kms.earlyStage.domain.ProjectBidWining; @Repository public interface ProjectBidWiningMapper extends BaseMapper { + List getList( + @Param("proNo") String proNo, + @Param("projectCode") String projectCode, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdBidFileService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdBidFileService.java index ca8c1172..b1814dcb 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdBidFileService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdBidFileService.java @@ -1,10 +1,17 @@ package com.kms.earlyStage.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.BsSlgcQqjdBidFileMapper; import com.kms.earlyStage.domain.BsSlgcQqjdBidFile; +import java.util.List; +import java.util.Map; + /** * 招标文件Service接口 * @@ -12,6 +19,27 @@ import com.kms.earlyStage.domain.BsSlgcQqjdBidFile; * @date 2023-12-04 */ @Service -public class BsSlgcQqjdBidFileService extends BaseService{ +public class BsSlgcQqjdBidFileService extends BaseService { + + @Autowired + private BsSlgcQqjdBidFileMapper bsSlgcQqjdBidFileMapper; + + public IPage selectPage(SearchParam sp) { + BsSlgcQqjdBidFile data = sp.getData(); + Map params = sp.getParams(); + + List list = + bsSlgcQqjdBidFileMapper.getList(data.getBidProjectName(),data.getProCode(), + data.getProNo(),(String)params.get("orderBy"), sp.getPageNum(),sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + page.setTotal(list.size()); + + return page; + + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java index 4c4cd740..4b6d8c07 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/BsSlgcQqjdContractFulfillingNoticeService.java @@ -1,10 +1,17 @@ package com.kms.earlyStage.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.BsSlgcQqjdContractFulfillingNoticeMapper; import com.kms.earlyStage.domain.BsSlgcQqjdContractFulfillingNotice; +import java.util.List; +import java.util.Map; + /** * 项目合同及履行公示详情Service接口 * @@ -14,4 +21,26 @@ import com.kms.earlyStage.domain.BsSlgcQqjdContractFulfillingNotice; @Service public class BsSlgcQqjdContractFulfillingNoticeService extends BaseService{ + + @Autowired + private BsSlgcQqjdContractFulfillingNoticeMapper bsSlgcQqjdContractFulfillingNoticeMapper; + + public IPage selectPage(SearchParam sp) { + + BsSlgcQqjdContractFulfillingNotice data = sp.getData(); + + Map params = sp.getParams(); + + List list = + bsSlgcQqjdContractFulfillingNoticeMapper.getList(data.getProNo(),data.getProCode() + ,(String) params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + page.setTotal(list.size()); + + return page; + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidNoticeService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidNoticeService.java index ca88e376..b387d316 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidNoticeService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidNoticeService.java @@ -1,10 +1,17 @@ package com.kms.earlyStage.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.ProjectBidNoticeMapper; import com.kms.earlyStage.domain.ProjectBidNotice; +import java.util.List; +import java.util.Map; + /** * 招标公告Service接口 * @@ -12,6 +19,25 @@ import com.kms.earlyStage.domain.ProjectBidNotice; * @date 2023-09-11 */ @Service -public class ProjectBidNoticeService extends BaseService{ +public class ProjectBidNoticeService extends BaseService { + + @Autowired + private ProjectBidNoticeMapper projectBidNoticeMapper; + + public IPage selectPage(SearchParam sp) { + ProjectBidNotice data = sp.getData(); + + Map params = sp.getParams(); + List list = projectBidNoticeMapper.getList(data.getProNo(),data.getProjectCode(), + (String) params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + page.setTotal(list.size()); + + return page; + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidResultService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidResultService.java index 27d67bc0..44f005ea 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidResultService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidResultService.java @@ -1,10 +1,19 @@ package com.kms.earlyStage.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.ConditionView; +import com.jianwei.common.core.domain.SearchParam; +import lombok.experimental.Accessors; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.ProjectBidResultMapper; import com.kms.earlyStage.domain.ProjectBidResult; +import java.util.List; +import java.util.Map; + /** * 中标结果Service接口 * @@ -14,4 +23,25 @@ import com.kms.earlyStage.domain.ProjectBidResult; @Service public class ProjectBidResultService extends BaseService{ + @Autowired + private ProjectBidResultMapper projectBidResultMapper; + + public IPage selectPage(SearchParam sp) { + ProjectBidResult data = sp.getData(); + + Map params = sp.getParams(); + + ConditionView cv = sp.getCv(); + + List list = projectBidResultMapper.getList(data.getProNo(),data.getProjectCode(), + (String)params.get("orderBy"), sp.getPageNum(),sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + + page.setTotal(list.size()); + + return page; + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidWiningService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidWiningService.java index 9ecad27a..5c86a8f2 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidWiningService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidWiningService.java @@ -2,6 +2,9 @@ package com.kms.earlyStage.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +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.utils.uuid.UUID; import com.kms.earlyStage.domain.ProjectBidDetails; import com.kms.earlyStage.domain.ProjectBidWinner; @@ -14,6 +17,9 @@ import com.jianwei.common.core.service.BaseService; import com.kms.earlyStage.mapper.ProjectBidWiningMapper; import com.kms.earlyStage.domain.ProjectBidWining; +import java.util.List; +import java.util.Map; + /** * 中标候选人公示基本信息Service接口 * @@ -21,7 +27,7 @@ import com.kms.earlyStage.domain.ProjectBidWining; * @date 2023-09-11 */ @Service -public class ProjectBidWiningService extends BaseService{ +public class ProjectBidWiningService extends BaseService { @Autowired private ProjectBidWiningMapper projectBidWiningMapper; @@ -75,4 +81,21 @@ public class ProjectBidWiningService extends BaseService sp) { + ProjectBidWining data = sp.getData(); + Map params = sp.getParams(); + + List list = projectBidWiningMapper.getList(data.getProNo(),data.getProjectCode(), + (String) params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + + Page page = new Page<>(); + + page.setRecords(list); + + page.setTotal(list.size()); + + return page; + + } } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdBidFileMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdBidFileMapper.xml new file mode 100644 index 00000000..1ef5e1ac --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdBidFileMapper.xml @@ -0,0 +1,51 @@ + + + + + + select + project_name, + bf.* + + from bs_slgc_qqjd_bid_file bf + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bf.pro_no and pp.project_code = bf.pro_code + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml new file mode 100644 index 00000000..7ade863c --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/BsSlgcQqjdContractFulfillingNoticeMapper.xml @@ -0,0 +1,46 @@ + + + + + + select + project_name, + bn.* + + from bs_slgc_qqjd_contract_fulfilling_notice bn + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bn.pro_no and pp.project_code = bn.pro_code + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidNoticeMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidNoticeMapper.xml new file mode 100644 index 00000000..e81d1206 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidNoticeMapper.xml @@ -0,0 +1,48 @@ + + + + + + select + project_name, + bn.* + + from bs_slgc_qqjd_pro_bid_notice bn + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bn.pro_no and pp.project_code = bn.project_code + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidResultMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidResultMapper.xml new file mode 100644 index 00000000..4713451f --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidResultMapper.xml @@ -0,0 +1,47 @@ + + + + + + select + project_name, + br.* + + from bs_slgc_qqjd_pro_bid_result br + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = br.pro_no and pp.project_code = br.project_code + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml new file mode 100644 index 00000000..3f2a5228 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidWiningMapper.xml @@ -0,0 +1,43 @@ + + + + + + select + project_name, + bw.* + + from bs_slgc_qqjd_pro_bid_winning bw + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bw.pro_no and pp.project_code = bw.project_code + + + + + + + + + + + + + + + + +