From 78969c23ed5e29c8c8af7d6d4edff2b55b0b5ad1 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 7 Dec 2021 18:23:54 +0800
Subject: [PATCH] 20211207

---
 experiment.http                   | 96 +++++++++++++++++++++++++++----
 tall/project/ExcelController.http |  3 +-
 tall3.http                        | 33 ++++++-----
 文件管理/file/file.http           | 11 ++--
 4 files changed, 112 insertions(+), 31 deletions(-)

diff --git a/experiment.http b/experiment.http
index d54ae62..2179ec9 100644
--- a/experiment.http
+++ b/experiment.http
@@ -3,8 +3,8 @@
 
 
 # @name login
-# POST https://www.tall.wiki/gateway/tall3/v3.0/users/signin
-POST http://test.tall.wiki/gateway/tall3/v3.0/users/signin
+POST https://www.tall.wiki/gateway/tall3/v3.0/users/signin
+# POST http://test.tall.wiki/gateway/tall3/v3.0/users/signin
 # POST http://localhost:7130/v3.0/users/signin
 {{type}}
 
@@ -18,6 +18,69 @@ POST http://test.tall.wiki/gateway/tall3/v3.0/users/signin
   "type": 3
 }
 
+### 查看子课题概览
+POST http://localhost:7270/subExperiment/getProgress
+# POST http://test.tall.wiki/gateway/experiment/question/queryExperimentation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "projectId":"1462041041435627520"
+    }
+}
+
+### 查看课题概览
+POST http://localhost:7270/experiment/getExperimentProgress
+# POST http://test.tall.wiki/gateway/experiment/question/queryExperimentation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "projectId":"1467054521674895360"
+    }
+}
+
+### 申请解锁科研成果
+POST http://localhost:7270/subExperiment/applyUnlock
+# POST http://test.tall.wiki/gateway/experiment/question/queryExperimentation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "id":1462083417998888960,
+      "remark":"666"
+    }
+}
+
+### 审核科研成果
+POST http://localhost:7270/subExperiment/examineExperimentation
+# POST http://test.tall.wiki/gateway/experiment/question/queryExperimentation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "id":1462083417998888960,
+      "type":0,
+      "remark":""
+    }
+}
+
+### 查找科研成果
+POST http://localhost:7270/subExperiment/queryExperimentation
+# POST http://test.tall.wiki/gateway/experiment/question/queryExperimentation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "projectId":1467695029480853504
+    }
+}
+
 ### 查看知识产权提交答案
 POST http://localhost:7270/question/getIntellectual
 # POST http://test.tall.wiki/gateway/experiment/question/getByCode
@@ -160,7 +223,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
 "param":{
-      "projectId":1462041041435627520,
+      "projectId":"",
       "code":"ZKT_ZL"
     }
 }
@@ -173,8 +236,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
 "param":{
-      "projectId":1462083417998888960,
-      "code":"",
+      "projectId":1462600993833226240,
+      "code":"SY_BG",
       "questionAndAnswerList":[
         {
           "questionId":"1465502788171599872",
@@ -262,6 +325,19 @@ Authorization: Bearer {{login.response.body.$.data.token}}
     }
 }
 
+### 添加课题成员
+# POST http://localhost:7270/organization/save
+POST http://www.tall.wiki/gateway/experiment/organization/save
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+"param":{
+      "projectId":1467360266207367168,
+      "name":"ss",
+      "phone":15335153627
+    }
+}
 
 ### 查看课题成员
 POST http://localhost:7270/organization/query
@@ -290,14 +366,14 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 
 ### 查看计划任务书
-# POST http://localhost:7270/experiment/getPlanTask
-POST http://test.tall.wiki/gateway/experiment/experiment/getPlanTask
+POST http://localhost:7270/experiment/getPlanTask
+# POST http://test.tall.wiki/gateway/experiment/experiment/getPlanTask
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
 "param":{
-      "projectId":1462039176476102656
+      "projectId":""
     }
 }
 
@@ -313,7 +389,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
       "name":"测试1125",
       "startTime":1637412277648,
       "endTime":1640398883000,
-      "memberId":1462019079309103104,
+      "memberId":"",
       "technicalIndicator":"技术指标",
       "economicIndicators":"经济效益",
       "socialBenefit":"社会效益",
@@ -399,7 +475,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
 "param":{
-      "projectId":1462066197042302976
+      "projectId":"1465988343066005504"
     }
 }
 
diff --git a/tall/project/ExcelController.http b/tall/project/ExcelController.http
index 4d69ba4..5c311d3 100644
--- a/tall/project/ExcelController.http
+++ b/tall/project/ExcelController.http
@@ -30,7 +30,8 @@ POST {{loaclhost}}{{tallLocal}}/users/signin
 
 
 ### 
-GET {{loaclhost}}{{tallLocal}}/users/userIdByPhone?phone=15
+# GET https://www.tall.wiki/gateway/tall3/v3.0/users/userIdByPhone?phone=15335153627
+GET http://localhost:7130/v3.0/users/userIdByPhone?phone=15335153627
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}
 
diff --git a/tall3.http b/tall3.http
index 33cf48c..fc43d0f 100644
--- a/tall3.http
+++ b/tall3.http
@@ -12,8 +12,8 @@
 ### login
 
 # @name login
-# POST {{loaclhost}}7130/v3.0/users/signin
-POST {{test}}{{tall3}}/users/signin
+POST {{loaclhost}}7130/v3.0/users/signin
+# POST {{test}}{{tall3}}/users/signin
 # POST {{www}}{{tall3}}/users/signin
 {{type}}
 
@@ -21,23 +21,28 @@ POST {{test}}{{tall3}}/users/signin
   "client": 1,
   "data": {
     "credential": "123456",
-	  "identifier": "zdd"
+	  "identifier": "zhouyong"
   },
   "scene": 0,
   "type": 3
 }
 
+1467019286404009985
+1467019286404009986
+1467019286404009987
+1637023534000
 
 ### 导出考勤表格（新）
 POST {{loaclhost}}7210/clock/export1
+# POST {{www}}defaultwbs/clock/export1
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
     "param":{
         "projectId":1433332016270811136,
-        "endTime":"1635609600000",
-        "startTime":"1633058185521",
+        "endTime":"1638374399000",
+        "startTime":"1635609600000",
         "roleId":1433332016702824448,
         "memberIdList":[
 
@@ -78,19 +83,19 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 
 ###F
-# POST {{test}}{{tall}}/project/query
-POST http://localhost:7210/clock/audit
+POST {{www}}defaultwbs/clock/audit
+# POST http://localhost:7210/clock/audit
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
 "param":{
-    "id":"1453969548721266688",
-    "projectId":"1448173415050780672",
-    "memberId":"1448173417680609280",
+    "id":"",
+    "projectId":"1433332016270811136",
+    "memberId":"1433332016790904832",
     "type":"0",
-    "morning":"",
-    "night":"1635487919413"
+    "morning":"1637024150000",
+    "night":"1637058050000"
     }
 }
 
@@ -154,7 +159,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 {
     "param":{
-        "projectId":1463417628931661824
+        "projectId":1467346672493268992
     }
 }
 
@@ -419,7 +424,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 
 
 ###
-GET https://www.tall.wiki/gateway/tall3/v3.0/users/userId?userId=1443567335800705024
+GET https://www.tall.wiki/gateway/tall3/v3.0/users/userId?userId=1443833898806153216
 {{type}}
 
 
diff --git a/文件管理/file/file.http b/文件管理/file/file.http
index 96e6311..a151e33 100644
--- a/文件管理/file/file.http
+++ b/文件管理/file/file.http
@@ -1,5 +1,5 @@
 @localhost = http://localhost:8001
-@testTall = https://test.tall.wiki/gateway/tall/v1.0
+@testTall = https://test.tall.wiki/gateway/tall3/v3.0
 @localhostTall = http://localhost:7030/v1.0
 @testFile = https://test.tall.wiki/filedeal
 @testFile31 = http://192.168.31.13/filedeal
@@ -46,11 +46,12 @@ POST {{testFile}}/file/query
 [
     1321760076465311744
 ]
- 
+
 
 ###  批量添加文件
-POST https://test.tall.wiki/filedeal/file/upload/multiple
-Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW 
+# POST https://www.tall.wiki/filedeal/file/upload/multiple
+POST https://101.201.226.21:7180/file/upload/multiple
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
 
 ------WebKitFormBoundary7MA4YWxkTrZu0gW
 Content-Disposition: form-data; name="files"; filename="111.png"
@@ -62,5 +63,3 @@ Content-Type: png
 ### 文件下载
 GET {{testFile}}/file/download/1385069982416769024
 {{type}}
-
- 
\ No newline at end of file