Skip to content
Snippets Groups Projects

fix 申报书接口调整

Merged 班迪 requested to merge feature/xueyawei into develop
Compare and
4 files
+ 705
5
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -70,7 +70,139 @@
}
```
### 返回
```json
{
"year": 2021,
"projectName": "项目2名称CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "8765986",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"planSubjectList": [
{
"subjectName": "测2试CCLJ1",
"subjectCode": "22551",
"subjectContent": "",
"price": 0,
"number": 0,
"subtotal": 0,
"otherJson": "",
"extendFormId": "0",
"helperCode": "123",
"helperName": "测2试CCLJ1",
"subjectDetailList": [
{
"subtotal": 857,
"otherJson": "2CCLJ11"
},
{
"subtotal": 21,
"otherJson": "2CCLJ12"
}
]
},
{
"subjectName": "测2试CCLJ2",
"subjectCode": "64561",
"subjectDetailList": [
{
"subtotal": 33,
"otherJson": "2CCLJ21"
},
{
"subtotal": 54,
"otherJson": "2CCLJ22"
}
]
}
],
"projectTargetCmd": {
"summaryJson": "2CCLJ1",
"subOtherArrayJson": "2CCLJ target1项目经费申报书T"
}
}
```
```json
{
"id":1405032722970095617,
"year": 2021,
"projectName": "项目1名称CCLJ",
"departmentName": "这是CC修改的请求示例!~!!!!!!",
"departmentCode": "8765986",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"planSubjectList": [
{
"id":1405033373846384641,
"planBookId":1405032722970095617,
"subjectName": "测1试CCLJ1",
"subjectCode": "22551",
"subjectContent": "",
"price": 0,
"number": 0,
"subtotal": 0,
"otherJson": "",
"extendFormId": "0",
"helperCode": "123",
"helperName": "测1试CCLJ1",
"subjectDetailList": [
{
"subtotal": 857,
"otherJson": "1CCLJ11"
},
{
"subtotal": 21,
"otherJson": "1CCLJ12"
}
]
},
{
"id":1405033373976408066,
"planBookId":1405032722970095617,
"subjectName": "测1试CCLJ2",
"subjectCode": "64561",
"subjectDetailList": [
{
"subtotal": 33,
"otherJson": "1CCLJ21"
},
{
"subtotal": 54,
"otherJson": "1CCLJ22"
}
]
}
],
"projectTargetCmd": {
"id":1405043634351292417,
"planBookId":1405032722970095617,
"summaryJson": "1CCLJ1",
"subOtherArrayJson": "1CCLJ target1项目经费申报书T"
}
}
```
## 返回
| 类型 | 备注 |
| ---- | ---- |
| | |
@@ -149,6 +281,129 @@
}
```
```json
{
"year": 2021,
"projectName": "项目4名称日常经费CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "8765986",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"planSubjectList": [
{
"subjectName": "测4试CCLJ1",
"subjectCode": "22551",
"subjectContent": "",
"price": 0,
"number": 0,
"subtotal": 0,
"otherJson": "",
"extendFormId": "0",
"helperCode": "123",
"helperName": "测4试CCLJ1",
"subjectDetailList": [
{
"subtotal": 857,
"otherJson": "4CCLJ11"
},
{
"subtotal": 21,
"otherJson": "4CCLJ12"
}
]
},
{
"subjectName": "测4试CCLJ2",
"subjectCode": "64561",
"subjectDetailList": [
{
"subtotal": 33,
"otherJson": "4CCLJ21"
},
{
"subtotal": 54,
"otherJson": "4CCLJ22"
}
]
}
]
}
```
```json
{
"id": 1405046702769917953,
"year": 2021,
"projectName": "项目4名称日常经费CCLJ",
"departmentName": "这是CC修改的请求示例",
"departmentCode": "8765986",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"planSubjectList": [
{
"id":1405046703675887618,
"planBookId":1405046702769917953,
"subjectName": "测4试CCLJ1-",
"subjectCode": "22551",
"subjectContent": "",
"price": 0,
"number": 0,
"subtotal": 0,
"otherJson": "",
"extendFormId": "0",
"helperCode": "123",
"helperName": "测4试CCLJ1-",
"subjectDetailList": [
{
"subtotal": 857,
"otherJson": "4CCLJ11-"
},
{
"subtotal": 21,
"otherJson": "4CCLJ12-"
}
]
},
{
"id":1405046703935934465,
"planBookId":1405046702769917953,
"subjectName": "测4试CCLJ2-",
"subjectCode": "64561",
"subjectDetailList": [
{
"subtotal": 33,
"otherJson": "4CCLJ21-"
},
{
"subtotal": 54,
"otherJson": "4CCLJ22-"
}
]
}
]
}
```
### 返回
| 类型 | 备注 |
@@ -215,6 +470,73 @@
}
```
```json
{
"year": 2021,
"projectName": "项目5名称人员经费CCLJ",
"departmentName": "这是CC新增的请求示例",
"departmentCode": "8765986",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"personSubjectList": [
{
"note": "人员科目实体5",
"personSubjectCode": "555",
"personSubjectName": "CCLJ-",
"total": 0
}
]
}
```
```json
{
"id": 1405051249932283906,
"year": 2021,
"projectName": "项目5名称人员经费CCLJ",
"departmentName": "这是CC修改的请求示例",
"departmentCode": "121346",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ",
"personSubjectList": [
{
"id":1405046703675887618,
"planBookId":1405051249932283906,
"note": "人员科目实体5-1",
"personSubjectCode": "555-1",
"personSubjectName": "CCLJ-5",
"total": 0
},
{
"id":1405046703675887616,
"planBookId":1405051249932283906,
"note": "人员科目实体5-2",
"personSubjectCode": "555-2",
"personSubjectName": "CCLJ-5",
"total": 0
}
]
}
```
### 返回
| 类型 | 备注 |
@@ -622,3 +944,365 @@
----------
## 根据当前登录人所在部门集合获取项目经费集合(分页)
| 类 | 值 |
| ------ | ------------------------------------------------------ |
| URL | /projectPlan/queryProjectInfoPlanPageByCurrentUserDept |
| Method | POST |
### 请求参数
| 类型 | 备注 |
| ---- | ---- |
| long | 主键 |
| | |
### 请求体
```json
{
"planType": "YISHANG", //申报书类型 必传
"projectNam": "项目名称" //项目名称
"pageIndex": 1,
"pageSize": 20,
"year": 2021 //年份
}
```
### 返回
| 参数名 | 类型 | 备注 |
| ------ | ---- | ---- |
| | | |
```json
{
"code": "00000",
"description": "成功",
"currentTime": "1624001186473",
"rid": "8zTl5NSP",
"pageIndex": 1,
"pageSize": 20,
"pageCount": 1,
"total": 1,
"data": [
{
"id": "1405032722970095617",
"year": 2021,
"projectName": "项目1名称CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "TEST",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "YISHANG",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ"
}
]
}
```
----------
## 根据当前登录人所在部门集合获取日常经费集合(分页)
| 类 | 值 |
| ------ | --------------------------------------------------- |
| URL | /projectPlan/queryProjectDailyPlanByCurrentUserDept |
| Method | POST |
### 请求参数
| 类型 | 备注 |
| ---- | ---- |
| long | 主键 |
| | |
### 请求体
```json
{
"planType": "YISHANG", //申报书类型 必传
"pageIndex": 1,
"pageSize": 20,
"year": 2021 //年份
}
```
### 返回
| 参数名 | 类型 | 备注 |
| ------ | ---- | ---- |
| | | |
```json
{
"code": "00000",
"description": "成功",
"currentTime": "1624001058690",
"rid": "SvdAvspE",
"pageIndex": 1,
"pageSize": 20,
"pageCount": 1,
"total": 2,
"data": [
{
"id": "1405046053822971905",
"year": 2021,
"projectName": "项目3名称日常经费CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "Test2",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0"
},
{
"id": "1405046702769917953",
"year": 2021,
"projectName": "项目4名称日常经费CCLJ",
"departmentName": "这是CC修改的请求示例",
"departmentCode": "TEST",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0"
}
]
}
```
----------
## 根据当前登录人所在部门集合获取人员经费集合(分页)
| 类 | 值 |
| ------ | ---------------------------------------------------- |
| URL | /projectPlan/queryProjectPersonPlanByCurrentUserDept |
| Method | POST |
### 请求参数
| 类型 | 备注 |
| ---- | ---- |
| long | 主键 |
| | |
### 请求体
```json
{
"planType": "YISHANG", //申报书类型
"pageIndex": 1,
"pageSize": 20,
"year": 2021 //年份
}
```
### 返回
| 参数名 | 类型 | 备注 |
| ------ | ---- | ---- |
| | | |
```json
{
"code": "00000",
"description": "成功",
"currentTime": "1624001313156",
"rid": "zglON1z6",
"pageIndex": 1,
"pageSize": 20,
"pageCount": 1,
"total": 1,
"data": [
{
"id": "1405051249932283906",
"year": 2021,
"projectName": "项目5名称人员经费CCLJ",
"departmentName": "这是CC修改的请求示例",
"departmentCode": "Test2",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0"
}
]
}
```
----------
## 根据项目类型获取该类型的所有项目(分页)
| 类 | 值 |
| ------ | -------------------------------------------------- |
| URL | /projectPlan/queryProjectInfoPlanPageByProjectType |
| Method | POST |
### 请求参数
| 类型 | 备注 |
| ---- | ---- |
| long | 主键 |
| | |
### 请求体
```json
{
"projectType": "项目类型名称CCLJ", //项目类型名称
"pageIndex": 1,
"pageSize": 20,
"year": 2021 //年份
}
```
### 返回
| 参数名 | 类型 | 备注 |
| ------ | ---- | ---- |
| | | |
```json
{
"code": "00000",
"description": "成功",
"currentTime": "1624002952391",
"rid": "tlSoUK57",
"pageIndex": 1,
"pageSize": 20,
"pageCount": 1,
"total": 2,
"data": [
{
"id": "1405032722970095617",
"year": 2021,
"projectName": "项目1名称CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "TEST",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "YISHANG",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ"
},
{
"id": "1405045083873394689",
"year": 2021,
"projectName": "项目2名称项目经费CCLJ",
"departmentName": "这是CC新增的请求示例!~!!!!!!",
"departmentCode": "Test2",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称CCLJ"
}
]
}
```
----------
## 根据当前登录人所在的部门集合所拥有的项目类型所有项目信息
| 类 | 值 |
| ------ | --------------------------------------------------------- |
| URL | /projectPlan/queryProjectInfoPlanPageByOwnCurrentUserDept |
| Method | POST |
### 请求参数
| 类型 | 备注 |
| ---- | ---- |
| long | 主键 |
| | |
### 请求体
```json
{
"projectType": "项目类型名称1", //项目类型名称
"planType": "XIANGMUKU", //申报书类型
"pageIndex": 1,
"pageSize": 20,
"year": 2021 //年份
}
```
### 返回
| 参数名 | 类型 | 备注 |
| ------ | ---- | ---- |
| | | |
```json
{
"code": "00000",
"description": "成功",
"currentTime": "1624003590786",
"rid": "sEdQ1NQp",
"pageIndex": 1,
"pageSize": 20,
"pageCount": 1,
"total": 1,
"data": [
{
"id": "1405028426799050754",
"year": 2021,
"projectName": "项目名称CCLJ项目经费申报书",
"departmentName": "这是新增的请求示例!~!!!!!!",
"departmentCode": "Test2",
"projectLeaderId": "0",
"projectLeaderName": "",
"projectLeaderCode": "",
"flowId": "0",
"flowType": "",
"quotaMoney": 0,
"state": "",
"planType": "XIANGMUKU",
"projectLibraryId": "0",
"summaryJson": "",
"projectType": "项目类型名称1"
}
]
}
```
----------