From 314e4523368f7ad2e91919da77cdc8cd4ace7b24 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Sun, 25 Jun 2023 17:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E7=BA=A7=E6=9D=A1=E7=BA=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/GovBusinessStripManage.java | 15 +++++------ .../mapper/ProvincialGovBusinessStripMapper.java | 15 +++++++++++ .../mapper/ProvincialGovBusinessStripMapper.xml | 5 ++++ .../model/entity/ProvincialGovBusinessStrip.java | 29 ++++++++++++++++++++++ .../IProvincialGovBusinessStripService.java | 16 ++++++++++++ .../ProvincialGovBusinessStripServiceImpl.java | 21 ++++++++++++++++ .../performance/manage/OrgSelfAppraisalManage.java | 5 ++-- .../model/dto/ProjectCollectionSaveDTO.java | 9 +++++++ .../projectlib/model/entity/ProjectCollection.java | 13 ++++++++-- .../projectlib/model/vo/ProjectCollectionVO.java | 9 +++++++ 10 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/ProvincialGovBusinessStrip.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IProvincialGovBusinessStripService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/ProvincialGovBusinessStripServiceImpl.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java index 9235fd7..ded0c81 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java @@ -1,10 +1,13 @@ package com.ningdatech.pmapi.organization.manage; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.pmapi.organization.entity.GovBusinessStrip; +import com.ningdatech.pmapi.organization.model.entity.ProvincialGovBusinessStrip; import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO; import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO; import com.ningdatech.pmapi.organization.service.IGovBusinessStripService; +import com.ningdatech.pmapi.organization.service.IProvincialGovBusinessStripService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -25,6 +28,7 @@ public class GovBusinessStripManage { private final IGovBusinessStripService iGovBusinessStripService; + private final IProvincialGovBusinessStripService provincialGovBusinessStripService; public List getChildOrganizationList(String parentCode) { if (Objects.isNull(parentCode)) { @@ -44,15 +48,12 @@ public class GovBusinessStripManage { } public List getProvincialGovBusinessStripList(String businessStripName) { - List provincialGovBusinessStripVOList = new ArrayList<>(); - ProvincialGovBusinessStripVO provincialGovBusinessStripVO = new ProvincialGovBusinessStripVO(); - provincialGovBusinessStripVO.setBusinessStripCode("test_provincial_manage_org_code"); - provincialGovBusinessStripVO.setBusinessStripName("测试省局条线主管单位"); - provincialGovBusinessStripVOList.add(provincialGovBusinessStripVO); + List strips = provincialGovBusinessStripService.list(Wrappers.lambdaQuery(ProvincialGovBusinessStrip.class) + .orderByAsc(ProvincialGovBusinessStrip::getBusinessStripName)); - provincialGovBusinessStripVOList = provincialGovBusinessStripVOList.stream() + return strips.stream() .filter(b -> StringUtils.isBlank(businessStripName) || b.getBusinessStripName().contains(businessStripName)) + .map(p -> BeanUtil.copyProperties(p,ProvincialGovBusinessStripVO.class)) .collect(Collectors.toList()); - return provincialGovBusinessStripVOList; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.java new file mode 100644 index 0000000..8d05229 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.java @@ -0,0 +1,15 @@ +package com.ningdatech.pmapi.organization.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.pmapi.organization.model.entity.ProvincialGovBusinessStrip; + +/** + *

+ * Mapper 接口 + *

+ * @author zpf + * @since 2023-06-25 + */ +public interface ProvincialGovBusinessStripMapper extends BaseMapper { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.xml new file mode 100644 index 0000000..482a0ea --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/ProvincialGovBusinessStrip.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/ProvincialGovBusinessStrip.java new file mode 100644 index 0000000..696c0ef --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/ProvincialGovBusinessStrip.java @@ -0,0 +1,29 @@ +package com.ningdatech.pmapi.organization.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Liuxinxin + * @since 2023-03-08 + */ +@TableName("nd_provincial_gov_business_strip") +@Data +@ApiModel(value = "省级条线实体", description = "省级条线实体") +public class ProvincialGovBusinessStrip { + + @ApiModelProperty("主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("条线code") + private String businessStripCode; + + @ApiModelProperty("条线名称") + private String businessStripName; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IProvincialGovBusinessStripService.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IProvincialGovBusinessStripService.java new file mode 100644 index 0000000..f48f69b --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IProvincialGovBusinessStripService.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.organization.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.pmapi.organization.model.entity.ProvincialGovBusinessStrip; + +/** + *

+ * 服务类 + *

+ * + * @author zpf + * @since 2023-03-08 + */ +public interface IProvincialGovBusinessStripService extends IService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/ProvincialGovBusinessStripServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/ProvincialGovBusinessStripServiceImpl.java new file mode 100644 index 0000000..6978215 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/ProvincialGovBusinessStripServiceImpl.java @@ -0,0 +1,21 @@ +package com.ningdatech.pmapi.organization.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.pmapi.organization.mapper.ProvincialGovBusinessStripMapper; +import com.ningdatech.pmapi.organization.model.entity.ProvincialGovBusinessStrip; +import com.ningdatech.pmapi.organization.service.IProvincialGovBusinessStripService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author zpf + * @since 2023-03-08 + */ +@Service +public class ProvincialGovBusinessStripServiceImpl extends ServiceImpl + implements IProvincialGovBusinessStripService { + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/OrgSelfAppraisalManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/OrgSelfAppraisalManage.java index 56697ce..59c2f3f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/OrgSelfAppraisalManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/OrgSelfAppraisalManage.java @@ -61,9 +61,8 @@ public class OrgSelfAppraisalManage { //当前登录用户 单位code String empPosUnitCode = user.getEmpPosUnitCode(); - projectService.list(Wrappers.lambdaQuery(Project.class) - .eq(Project::getBuildOrgCode,empPosUnitCode)); - + List projectLists = projectService.list(Wrappers.lambdaQuery(Project.class) + .eq(Project::getBuildOrgCode, empPosUnitCode)); Page page = req.page(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectCollectionSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectCollectionSaveDTO.java index 7ce4b42..73e60f5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectCollectionSaveDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectCollectionSaveDTO.java @@ -73,6 +73,9 @@ public class ProjectCollectionSaveDTO implements Serializable { @ApiModelProperty("建设类型 1软件，2硬件，3服务") private Integer constructionType; + @ApiModelProperty("预算来源") + private Integer budgetSource; + @ApiModelProperty("是否首次新建 0:否 1:是") private Integer isFirst; @@ -142,6 +145,12 @@ public class ProjectCollectionSaveDTO implements Serializable { @ApiModelProperty("主管部门Code") private String superOrgCode; + @ApiModelProperty("上级条线主管部门") + private String higherSuperOrg; + + @ApiModelProperty("上级主管部门Code") + private String higherSuperOrgCode; + private String projectTypeName; public String getProjectTypeName() { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectCollection.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectCollection.java index fa281d9..8167f62 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectCollection.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectCollection.java @@ -73,6 +73,9 @@ public class ProjectCollection implements Serializable { @ApiModelProperty("建设类型 1软件，2硬件，3服务") private Integer constructionType; + @ApiModelProperty("预算来源") + private Integer budgetSource; + @ApiModelProperty("是否首次新建 0:否 1:是") private Integer isFirst; @@ -141,9 +144,15 @@ public class ProjectCollection implements Serializable { @ApiModelProperty("监理单位统一信用编码") private String supervisorOrgCreditCode; - @ApiModelProperty("主管部门名称") + @ApiModelProperty("本级主管部门名称") private String superOrg; - @ApiModelProperty("主管部门Code") + @ApiModelProperty("本级主管部门Code") private String superOrgCode; + + @ApiModelProperty("上级条线主管部门") + private String higherSuperOrg; + + @ApiModelProperty("上级主管部门Code") + private String higherSuperOrgCode; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectCollectionVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectCollectionVO.java index 73daabd..e6d7eed 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectCollectionVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectCollectionVO.java @@ -73,6 +73,9 @@ public class ProjectCollectionVO implements Serializable { @ApiModelProperty("建设类型 1软件，2硬件，3服务") private Integer constructionType; + @ApiModelProperty("预算来源") + private Integer budgetSource; + @ApiModelProperty("是否首次新建 0:否 1:是") private Integer isFirst; @@ -147,6 +150,12 @@ public class ProjectCollectionVO implements Serializable { @ApiModelProperty("主管部门Code") private String superOrgCode; + @ApiModelProperty("上级条线主管部门") + private String higherSuperOrg; + + @ApiModelProperty("上级主管部门Code") + private String higherSuperOrgCode; + private String projectTypeName; public String getProjectTypeName() {