From 9b40dbb3e350ad28fa6d12023cae75ca867746bf Mon Sep 17 00:00:00 2001 From: XLR_asd <xueyawei@seaskysh.com> Date: Fri, 18 Jun 2021 17:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=20=20=E7=94=B3=E6=8A=A5=E4=B9=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...45\345\217\243\350\256\276\350\256\241.md" | 686 +++++++++++++++++- .../db/mapper/xml/ProjectPlanBookMapper.xml | 15 + .../controller/BaseConfigController.java | 4 +- .../controller/BaseInfoController.java | 5 +- 4 files changed, 705 insertions(+), 5 deletions(-) diff --git "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" index 542993a3c..234bb951e 100644 --- "a/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" +++ "b/Document/2.\350\256\276\350\256\241/4.\346\216\245\345\217\243\350\256\276\350\256\241/\347\224\263\346\212\245\344\271\246\346\216\245\345\217\243\350\256\276\350\256\241.md" @@ -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璇旵CLJ1", + "subjectCode": "22551", + "subjectContent": "", + "price": 0, + "number": 0, + "subtotal": 0, + "otherJson": "", + "extendFormId": "0", + "helperCode": "123", + "helperName": "娴�2璇旵CLJ1", + "subjectDetailList": [ + { + "subtotal": 857, + "otherJson": "2CCLJ11" + }, + { + "subtotal": 21, + "otherJson": "2CCLJ12" + } + ] + }, + { + "subjectName": "娴�2璇旵CLJ2", + "subjectCode": "64561", + "subjectDetailList": [ + { + "subtotal": 33, + "otherJson": "2CCLJ21" + }, + { + "subtotal": 54, + "otherJson": "2CCLJ22" + } + ] + } + ], + "projectTargetCmd": { + "summaryJson": "2CCLJ1", + "subOtherArrayJson": "2CCLJ target1椤圭洰缁忚垂鐢虫姤涔" + } +} +``` + +```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璇旵CLJ1", + "subjectCode": "22551", + "subjectContent": "", + "price": 0, + "number": 0, + "subtotal": 0, + "otherJson": "", + "extendFormId": "0", + "helperCode": "123", + "helperName": "娴�1璇旵CLJ1", + "subjectDetailList": [ + { + "subtotal": 857, + "otherJson": "1CCLJ11" + }, + { + "subtotal": 21, + "otherJson": "1CCLJ12" + } + ] + }, + { + "id":1405033373976408066, + "planBookId":1405032722970095617, + "subjectName": "娴�1璇旵CLJ2", + "subjectCode": "64561", + "subjectDetailList": [ + { + "subtotal": 33, + "otherJson": "1CCLJ21" + }, + { + "subtotal": 54, + "otherJson": "1CCLJ22" + } + ] + } + ], + "projectTargetCmd": { + "id":1405043634351292417, + "planBookId":1405032722970095617, + "summaryJson": "1CCLJ1", + "subOtherArrayJson": "1CCLJ target1椤圭洰缁忚垂鐢虫姤涔" + } +} +``` + +## 杩斿洖 + | 绫诲瀷 | 澶囨敞 | | ---- | ---- | | | | @@ -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璇旵CLJ1", + "subjectCode": "22551", + "subjectContent": "", + "price": 0, + "number": 0, + "subtotal": 0, + "otherJson": "", + "extendFormId": "0", + "helperCode": "123", + "helperName": "娴�4璇旵CLJ1", + "subjectDetailList": [ + { + "subtotal": 857, + "otherJson": "4CCLJ11" + }, + { + "subtotal": 21, + "otherJson": "4CCLJ12" + } + ] + }, + { + "subjectName": "娴�4璇旵CLJ2", + "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璇旵CLJ1-", + "subjectCode": "22551", + "subjectContent": "", + "price": 0, + "number": 0, + "subtotal": 0, + "otherJson": "", + "extendFormId": "0", + "helperCode": "123", + "helperName": "娴�4璇旵CLJ1-", + "subjectDetailList": [ + { + "subtotal": 857, + "otherJson": "4CCLJ11-" + }, + { + "subtotal": 21, + "otherJson": "4CCLJ12-" + } + ] + }, + { + "id":1405046703935934465, + "planBookId":1405046702769917953, + "subjectName": "娴�4璇旵CLJ2-", + "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" + } + ] +} +``` + +---------- + diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml index b23f24293..5ee618023 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml @@ -762,6 +762,15 @@ <where> a.available = 'YES' and plan_book_type = 1 + <if test="pm.year != null"> + and a.year = #{pm.year} + </if> + <if test="pm.projectName != null and pm.projectName != '' "> + and a.project_name = #{pm.projectName} + </if> + <if test="pm.projectType != null and pm.projectType != '' "> + and a.project_type = #{pm.projectType} + </if> <if test="pm.projectTypeList != null and pm.projectTypeList.size() > 0"> and a.project_type in <foreach collection="pm.projectTypeList" item="projectType" separator="," open="(" close=")"> @@ -798,6 +807,12 @@ <where> a.available = 'YES' and plan_book_type = 1 + <if test="pm.planType != null and pm.planType != '' "> + and a.plan_type = #{pm.planType} + </if> + <if test="pm.projectType != null and pm.projectType != '' "> + and a.project_type = #{pm.projectType} + </if> <if test="pm.projectTypeList != null and pm.projectTypeList.size() > 0"> and a.project_type in <foreach collection="pm.projectTypeList" item="projectType" separator="," open="(" close=")"> diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java index 45e51f38c..7565a1ad4 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseConfigController.java @@ -73,9 +73,9 @@ public class BaseConfigController implements IBaseConfigController { // @PostConstruct public Result<Object> loginUserInfo() { try { - iAccount.login(AccountLoginDTO.builder().username("quota01").password("123456").recognizeId("seasky_budget_quota").rememberMe(true).build()); + iAccount.login(AccountLoginDTO.builder().username("admin").password("123456").recognizeId("seasky_budget_quota").rememberMe(true).build()); CommonIdParamDTO commonIdParamDTO = new CommonIdParamDTO(); - commonIdParamDTO.setId(Long.parseLong("1346655855830896642")); + commonIdParamDTO.setId(Long.parseLong("1")); iUser.setCurrent(commonIdParamDTO); return ok(ResponseCode.SUCCESS); } catch (Exception e) { diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java index 9ea4f5410..16d59a282 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/BaseInfoController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -58,7 +59,7 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr @ApiOperation("鑾峰彇鎵€鏈夌敤鎴蜂俊鎭甫鍒嗛〉") @Override - public Result<UserDTO> queryUserPage(UserQry userQry) { + public Result<UserDTO> queryUserPage(@RequestBody UserQry userQry) { return ok(ResponseCode.SUCCESS, userRPC.queryUserPage(userQry)); } @@ -70,7 +71,7 @@ public class BaseInfoController extends BaseController implements IBaseInfoContr */ @ApiOperation("鑾峰彇鎵€鏈夐儴闂ㄤ俊鎭甫鍒嗛〉") @Override - public Result<OrganizationSystemOut> queryDeptPage(DeptQry deptQry) { + public Result<OrganizationSystemOut> queryDeptPage(@RequestBody DeptQry deptQry) { return ok(ResponseCode.SUCCESS,userRPC.queryAllOrganization(deptQry)); } -- GitLab