省级条线接口

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<GovBusinessStripTreeVO> getChildOrganizationList(String parentCode) {
         if (Objects.isNull(parentCode)) {
@@ -44,15 +48,12 @@ public class GovBusinessStripManage {
     }
 
     public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList(String businessStripName) {
-        List<ProvincialGovBusinessStripVO> provincialGovBusinessStripVOList = new ArrayList<>();
-        ProvincialGovBusinessStripVO provincialGovBusinessStripVO = new ProvincialGovBusinessStripVO();
-        provincialGovBusinessStripVO.setBusinessStripCode("test_provincial_manage_org_code");
-        provincialGovBusinessStripVO.setBusinessStripName("测试省局条线主管单位");
-        provincialGovBusinessStripVOList.add(provincialGovBusinessStripVO);
+        List<ProvincialGovBusinessStrip> 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;
     }
 }

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;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ * @author zpf
+ * @since 2023-06-25
+ */
+public interface ProvincialGovBusinessStripMapper extends BaseMapper<ProvincialGovBusinessStrip> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/ProvincialGovBusinessStripMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.pmapi.organization.mapper.ProvincialGovBusinessStripMapper">
+
+</mapper>

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;
+
+}

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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-03-08
+ */
+public interface IProvincialGovBusinessStripService extends IService<ProvincialGovBusinessStrip> {
+
+}

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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-03-08
+ */
+@Service
+public class ProvincialGovBusinessStripServiceImpl extends ServiceImpl<ProvincialGovBusinessStripMapper, ProvincialGovBusinessStrip>
+        implements IProvincialGovBusinessStripService {
+
+}

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<Project> projectLists = projectService.list(Wrappers.lambdaQuery(Project.class)
+                .eq(Project::getBuildOrgCode, empPosUnitCode));
 
         Page<PerformanceAppraisal> page = req.page();
         LambdaQueryWrapper<PerformanceAppraisal> wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class)

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() {

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;
 }

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() {