Browse Source

Merge remote-tracking branch 'origin/master'

tags/24080901
WendyYang 1 year ago
parent
commit
b8d44d03cf
3 changed files with 40 additions and 0 deletions
  1. +8
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java
  2. +11
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java
  3. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ProvincialGovBusinessStripVO.java

+ 8
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java View File

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.organization.controller;

import com.ningdatech.pmapi.organization.manage.GovBusinessStripManage;
import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO;
import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -41,4 +42,11 @@ public class GovBusinessStripController {
return govBusinessStripManage.getChildOrganizationList(parentCode);
}


@GetMapping("/list")
@ApiOperation("获取省局条线列表")
public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList() {
return govBusinessStripManage.getProvincialGovBusinessStripList();
}

}

+ 11
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/GovBusinessStripManage.java View File

@@ -3,10 +3,12 @@ package com.ningdatech.pmapi.organization.manage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ningdatech.pmapi.organization.entity.GovBusinessStrip;
import com.ningdatech.pmapi.organization.model.vo.GovBusinessStripTreeVO;
import com.ningdatech.pmapi.organization.model.vo.ProvincialGovBusinessStripVO;
import com.ningdatech.pmapi.organization.service.IGovBusinessStripService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -39,4 +41,13 @@ public class GovBusinessStripManage {
return govBusinessStripTreeVO;
}).collect(Collectors.toList());
}

public List<ProvincialGovBusinessStripVO> getProvincialGovBusinessStripList() {
List<ProvincialGovBusinessStripVO> provincialGovBusinessStripVOList = new ArrayList<>();
ProvincialGovBusinessStripVO provincialGovBusinessStripVO = new ProvincialGovBusinessStripVO();
provincialGovBusinessStripVO.setBusinessStripCode("test_provincial_manage_org_code");
provincialGovBusinessStripVO.setBusinessStripName("测试省局条线主管单位");
provincialGovBusinessStripVOList.add(provincialGovBusinessStripVO);
return provincialGovBusinessStripVOList;
}
}

+ 21
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/model/vo/ProvincialGovBusinessStripVO.java View File

@@ -0,0 +1,21 @@
package com.ningdatech.pmapi.organization.model.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
* @author Liuxinxin
* @since 2023-03-08
*/
@Data
@ApiModel(value = "条线 responseVO", description = "")
public class ProvincialGovBusinessStripVO {

@ApiModelProperty("条线code")
private String businessStripCode;

@ApiModelProperty("条线名称")
private String businessStripName;

}

Loading…
Cancel
Save