diff --git a/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysUser.java b/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysUser.java index 8d784115..8a722074 100644 --- a/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysUser.java +++ b/jwtech-framework/src/main/java/com/jianwei/common/core/domain/entity/SysUser.java @@ -43,6 +43,8 @@ public class SysUser extends BaseEntity @Excel(name = "用户名称") private String nickName; + private String userType; + /** 用户邮箱 */ @Excel(name = "用户邮箱") private String email; diff --git a/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 2285b4b0..553e4dc0 100644 --- a/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -69,13 +69,13 @@ public class SysXzqhController extends BaseController if (userName.equals("admin")) { List list = sysXzqhService.list(); return AjaxResult.success(list); - }else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) { + }else if (xzqh.getLayer()==1) { String substring = xzqh.getXzqhdm().substring(0, 2); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", substring); List list = sysXzqhService.list(queryWrapper); return AjaxResult.success(list); - } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) { + } else if (xzqh.getLayer()==2) { String substring = xzqh.getXzqhdm().substring(0, 4); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", substring); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java index 94f1e302..ac39a195 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java @@ -5,6 +5,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.core.domain.entity.SysDept; @@ -15,6 +16,7 @@ import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; @@ -54,6 +56,9 @@ public class SpecialProjectFeasibilityController extends BaseController @Autowired private SpecialProjectFeasibilityService specialProjectFeasibilityService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + @Autowired private SysXzqhService sysXzqhService; @@ -146,7 +151,17 @@ public class SpecialProjectFeasibilityController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(specialProjectFeasibilityService.getById(id)); + SpecialProjectFeasibility byId = specialProjectFeasibilityService.getById(id); + + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode()).eq(SpecialProjectProposal::getProNo, byId.getProNo())); + + byId.setAdcd(one.getAdcd()); + byId.setProjectName(one.getProjectName()); + byId.setProjectType(one.getProjectType()); + + + return AjaxResult.success(byId); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java index 7bc82bad..2782f6bc 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java @@ -5,9 +5,11 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysDept; @@ -89,6 +91,13 @@ public class SpecialProjectInfoController extends BaseController { @ApiOperation("专题项目前期背景信息列表") public IPage list(@RequestBody SearchParam sp) { + if (ObjectUtil.isNull(sp.getData())) { + Page page = new Page<>(); + List list = specialProjectInfoService.list(); + page.setRecords(list); + page.setTotal(list.size()); + return page; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java index 00be4a1e..8113036b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java @@ -5,6 +5,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.core.domain.entity.SysDept; @@ -15,6 +16,8 @@ import com.kms.common.utils.BaseEntityUtils; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectFeasibility; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; @@ -54,6 +57,10 @@ public class SpecialProjectPreDesignController extends BaseController @Autowired private SpecialProjectPreDesignService specialProjectPreDesignService; + + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + @Autowired private SysDeptService sysDeptService; @@ -145,7 +152,15 @@ public class SpecialProjectPreDesignController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return AjaxResult.success(specialProjectPreDesignService.getById(id)); + SpecialProjectPreDesign byId = specialProjectPreDesignService.getById(id); + SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode()) + .eq(SpecialProjectProposal::getProNo, byId.getProNo())); + + byId.setProjectName(one.getProjectName()); + byId.setAdcd(one.getAdcd()); + + return AjaxResult.success(); } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java index e5a5143b..22b24b14 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.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; @@ -87,7 +89,7 @@ public class SpecialProjectBidInfo extends BaseEntity private String bidId; - + @TableField(exist = false) private String bidProjectName; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java index 348503a9..f3f7e7b1 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.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,11 +32,13 @@ public class SpecialProjectFeasibility extends BaseEntity /** 项目名称 */ @Excel(name = "项目名称") @ApiModelProperty("项目名称") + @TableField(exist = false) private String projectName; /** 项目类型 */ @Excel(name = "项目类型") @ApiModelProperty("项目类型") + @TableField(exist = false) private String projectType; /** 编制单位 */ @@ -114,6 +118,7 @@ public class SpecialProjectFeasibility extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + @TableField(exist = false) private String adcd; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java index 7fe140e9..67ab828c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java @@ -1,5 +1,6 @@ package com.kms.earlyStage.domain; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,6 +29,7 @@ public class SpecialProjectPreDesign extends BaseEntity /** 项目名称 */ @Excel(name = "项目名称") @ApiModelProperty("项目名称") + @TableField(exist = false) private String projectName; /** 建设性质 */ @@ -93,6 +95,7 @@ public class SpecialProjectPreDesign extends BaseEntity @ApiModelProperty("项目类型") private String projectType; + @TableField(exist = false) private String adcd; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java index aee4c2cf..88066c7f 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.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.SpecialProjectBidInfo; +import java.util.List; + /** * 招标计划基本信息Mapper接口 * @@ -13,4 +16,10 @@ import com.kms.earlyStage.domain.SpecialProjectBidInfo; @Repository public interface SpecialProjectBidInfoMapper extends BaseMapper { + List getList(@Param("proNo") String proNo, + @Param("isConsolidatedBidding") String isConsolidatedBidding, + @Param("value") String value, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java index 0e67d72a..3c25e7cd 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java @@ -20,6 +20,7 @@ public interface SpecialProjectInfoMapper extends BaseMapper List 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/SpecialProjectBidInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java index 856665f1..9996772b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java @@ -3,6 +3,8 @@ 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.ConditionView; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.uuid.UUID; import com.kms.earlyStage.domain.ProjectBidDetails; @@ -16,6 +18,8 @@ import com.kms.earlyStage.mapper.SpecialProjectBidInfoMapper; import com.kms.earlyStage.domain.SpecialProjectBidInfo; import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * 招标计划基本信息Service接口 @@ -24,7 +28,7 @@ import java.util.ArrayList; * @date 2023-09-08 */ @Service -public class SpecialProjectBidInfoService extends BaseService{ +public class SpecialProjectBidInfoService extends BaseService { @Autowired private SpecialProjectBidInfoMapper specialProjectBidInfoMapper; @@ -43,7 +47,6 @@ public class SpecialProjectBidInfoService extends BaseService sp) { + SpecialProjectBidInfo data = sp.getData(); + + ConditionView cv = sp.getCv(); + + Map params = sp.getParams(); + + List list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(), + (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/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java index c8f5759e..885e4128 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.service; +import cn.hutool.core.collection.CollectionUtil; +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; @@ -33,9 +35,17 @@ public class SpecialProjectInfoService extends BaseService params = sp.getParams(); + List list = null; + if (ObjectUtil.isNull(params)) { + list = specialProjectInfoMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), + data.getProjectType(),adcd,"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectInfoMapper.getXzqh(data.getId(),data.getProjectName(),data.getProNo(), + data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } + + - List list = specialProjectInfoMapper.getXzqh(data.getId(),data.getProjectName(), - data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); Page page = new Page<>(); page.setRecords(list); 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 c3216795..a399d867 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 @@ -1,5 +1,6 @@ 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; @@ -39,8 +40,17 @@ public class SpecialProjectProposalService extends BaseService params = sp.getParams(); - List list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(), - data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + List list = null; + if (ObjectUtil.isNull(params)) { + list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(), + data.getProjectType(),adcd,"create_time",sp.getPageNum(),sp.getPageSize()); + }else { + list = specialProjectProposalMapper.getXzqh(data.getId(),data.getProjectName(), + data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + } + + + Page page = new Page<>(); page.setRecords(list); diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml new file mode 100644 index 00000000..9cfb42f2 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml @@ -0,0 +1,53 @@ + + + + + + select + pp.project_name, + pp.project_code, + pp.project_type, + bi.* + + from bs_slgc_qqjd_pro_bid_info bi + left join bs_slgc_qqjd_spe_pro_proposal pp + on pp.pro_no = bi.pro_no and pp.project_code = bi.project_code + + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml index 17be4c72..42bf06e7 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml @@ -5,16 +5,16 @@ - select id, - project_name, - project_code, - adcd, - project_type, - compiling_unit, - PROJECT_INVESTMENT_ESTIMATE, - APPROVAL_OPINION, - create_time - from bs_slgc_qqjd_spe_pro_fea + select pf.id, + pp.project_name, + pp.project_code, + pp.adcd, + pp.project_type, + pf.compiling_unit, + pf.PROJECT_INVESTMENT_ESTIMATE, + pf.APPROVAL_OPINION, + pf.create_time + from bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code @@ -42,6 +42,6 @@ - order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize}; diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml index 5801fb98..c0970e32 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml @@ -42,6 +42,9 @@ and project_type=#{projectType} + + and pro_no=#{proNo} + order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 01f77acb..3a7617af 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -5,16 +5,17 @@ - select id, - project_name, - pro_no, - adcd, - CONSTRUCTION_NATURE, - CONSTRUCTION_LOCATION, - PROJECT_UNIT_NAME, - BRIEF_INTRODUCTION, - PROJECT_LAND_SITUATION - from bs_sgc_qqjd_spe_pro_des_app + select da.id, + pp.project_name, + da.pro_no, + pp.adcd, + da.CONSTRUCTION_NATURE, + da.CONSTRUCTION_LOCATION, + da.PROJECT_UNIT_NAME, + da.BRIEF_INTRODUCTION, + da.PROJECT_LAND_SITUATION, + da.project_code + from bs_sgc_qqjd_spe_pro_des_app da left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=da.pro_no and pp.project_code=da.project_code @@ -27,6 +28,7 @@ + @@ -39,6 +41,6 @@ - order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; + order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize};