浏览代码

新增日历面板接口

longyu 3 年之前
父节点
当前提交
51ff3f12c9
共有 2 个文件被更改,包括 602 次插入824 次删除
  1. 358 473
      swagger/swagger.json
  2. 244 351
      swagger/swagger.yml

+ 358 - 473
swagger/swagger.json

@@ -1072,7 +1072,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.AcceptReq"
+                            "$ref": "#/definitions/rs.AcceptReq"
                         }
                     }
                 ],
@@ -1083,6 +1083,23 @@
                 }
             }
         },
+        "/roadshow/activity/type/list": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "获取报告电话会类型接口",
+                "operationId": "CalendarController.获取报告电话会类型",
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/rs.ResearcherGroup"
+                        }
+                    }
+                }
+            }
+        },
         "/roadshow/add": {
             "post": {
                 "tags": [
@@ -1097,7 +1114,32 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.AddActivityReq"
+                            "$ref": "#/definitions/rs.AddActivityReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "Ret=200": {
+                        "description": "保存成功"
+                    }
+                }
+            }
+        },
+        "/roadshow/back": {
+            "post": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "撤回路演活动接口",
+                "operationId": "CalendarController.撤回路演活动接口",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "request",
+                        "description": "type json string",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/rs.AcceptReq"
                         }
                     }
                 ],
@@ -1137,7 +1179,7 @@
                     "200": {
                         "description": "",
                         "schema": {
-                            "$ref": "#/definitions/roadshow.CalendarDetailResp"
+                            "$ref": "#/definitions/rs.CalendarDetailResp"
                         }
                     }
                 }
@@ -1170,7 +1212,77 @@
                     {
                         "in": "query",
                         "name": "Status",
-                        "description": "1:待接受,2:包含,已接受,已拒绝,已删除",
+                        "description": "1:待接受,2:包含,已接受,已拒绝,已删除,已撤回,已结束",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/rs.CalendarListResp"
+                        }
+                    }
+                }
+            }
+        },
+        "/roadshow/calendar/type/list": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "内部会议和报告电话会日历列表",
+                "operationId": "CalendarController.内部会议和报告电话会日历列表",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "PageSize",
+                        "description": "每页数据条数",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "CurrentIndex",
+                        "description": "当前页页码,从1开始",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    {
+                        "in": "query",
+                        "name": "CalendarType",
+                        "description": "1:内部会议,2:报告电话会",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/rs.CalendarListResp"
+                        }
+                    }
+                }
+            }
+        },
+        "/roadshow/company/detail": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "我的日历列表接口",
+                "operationId": "CalendarController.我的日历列表",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "CompanyId",
+                        "description": "公司id",
                         "required": true,
                         "type": "integer",
                         "format": "int64"
@@ -1180,9 +1292,85 @@
                     "200": {
                         "description": "",
                         "schema": {
-                            "$ref": "#/definitions/roadshow.CalendarListResp"
+                            "$ref": "#/definitions/rs.CompanyDetailView"
+                        }
+                    }
+                }
+            }
+        },
+        "/roadshow/company/search": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "我的日历列表接口",
+                "operationId": "CalendarController.我的日历列表",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "KeyWord",
+                        "description": "搜索关键词",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/rs.CalendarListResp"
+                        }
+                    }
+                }
+            }
+        },
+        "/roadshow/delete": {
+            "post": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "删除路演活动接口",
+                "operationId": "CalendarController.删除路演活动接口",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "request",
+                        "description": "type json string",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/rs.DeleteReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "Ret=200": {
+                        "description": "保存成功"
+                    }
+                }
+            }
+        },
+        "/roadshow/edit": {
+            "post": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "编辑路演活动接口",
+                "operationId": "CalendarController.编辑路演活动接口",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "request",
+                        "description": "type json string",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/rs.EditActivityReq"
                         }
                     }
+                ],
+                "responses": {
+                    "Ret=200": {
+                        "description": "保存成功"
+                    }
                 }
             }
         },
@@ -1200,7 +1388,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.AddMattersReq"
+                            "$ref": "#/definitions/rs.AddMattersReq"
                         }
                     }
                 ],
@@ -1225,7 +1413,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.DeleteMattersReq"
+                            "$ref": "#/definitions/rs.DeleteMattersReq"
                         }
                     }
                 ],
@@ -1265,7 +1453,7 @@
                     "200": {
                         "description": "",
                         "schema": {
-                            "$ref": "#/definitions/roadshow.MattersListResp"
+                            "$ref": "#/definitions/rs.MattersListResp"
                         }
                     }
                 }
@@ -1285,7 +1473,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.UpdateMattersReq"
+                            "$ref": "#/definitions/rs.UpdateMattersReq"
                         }
                     }
                 ],
@@ -1296,6 +1484,39 @@
                 }
             }
         },
+        "/roadshow/my/calendar/detail": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "路演-我的日历详情接口",
+                "operationId": "CalendarController.路演-我的日历详情",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "StartDate",
+                        "description": "开始日期",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "EndDate",
+                        "description": "结束日期日期",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/roadshow.CalendarDetailResp"
+                        }
+                    }
+                }
+            }
+        },
         "/roadshow/refuse": {
             "post": {
                 "tags": [
@@ -1310,7 +1531,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/roadshow.RefuseReq"
+                            "$ref": "#/definitions/rs.RefuseReq"
                         }
                     }
                 ],
@@ -1321,6 +1542,64 @@
                 }
             }
         },
+        "/roadshow/researcher/calendar/detail": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "路演-研究员日历详情接口",
+                "operationId": "CalendarController.路演-研究员日历详情",
+                "parameters": [
+                    {
+                        "in": "query",
+                        "name": "StartDate",
+                        "description": "开始日期",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "EndDate",
+                        "description": "结束日期日期",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "query",
+                        "name": "ResearcherId",
+                        "description": "研究员id",
+                        "required": true,
+                        "type": "integer",
+                        "format": "int64"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/roadshow.CalendarDetailResp"
+                        }
+                    }
+                }
+            }
+        },
+        "/roadshow/researcher/list": {
+            "get": {
+                "tags": [
+                    "roadshow"
+                ],
+                "description": "研究员列表接口",
+                "operationId": "CalendarController.研究员列表",
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/rs.ResearcherGroup"
+                        }
+                    }
+                }
+            }
+        },
         "/seal/add": {
             "post": {
                 "tags": [
@@ -1811,16 +2090,16 @@
         }
     },
     "definitions": {
-        "1635.\u003cnil\u003e.0xc0006bc0a8": {
-            "title": "0xc0006bc0a8",
+        "1635.\u003cnil\u003e.0xc00077c780": {
+            "title": "0xc00077c780",
             "type": "object"
         },
-        "645.\u003cnil\u003e.0xc000663cf8": {
-            "title": "0xc000663cf8",
+        "645.\u003cnil\u003e.0xc00077c3d8": {
+            "title": "0xc00077c3d8",
             "type": "object"
         },
-        "722.\u003cnil\u003e.0xc0006bc3d8": {
-            "title": "0xc0006bc3d8",
+        "722.\u003cnil\u003e.0xc00077cab0": {
+            "title": "0xc00077cab0",
             "type": "object"
         },
         "admin.LoginReq": {
@@ -1934,7 +2213,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/645.\u003cnil\u003e.0xc000663cf8"
+                        "$ref": "#/definitions/645.\u003cnil\u003e.0xc00077c3d8"
                     }
                 },
                 "PermissionList": {
@@ -2822,7 +3101,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/1635.\u003cnil\u003e.0xc0006bc0a8"
+                        "$ref": "#/definitions/1635.\u003cnil\u003e.0xc00077c780"
                     }
                 },
                 "OpButton": {
@@ -3560,320 +3839,23 @@
             "title": "PagingItem",
             "type": "object"
         },
-        "roadshow.AcceptReq": {
-            "title": "AcceptReq",
+        "roadshow.CalendarDetailResp": {
+            "title": "CalendarDetailResp",
             "type": "object",
             "properties": {
-                "RsCalendarId": {
-                    "description": "日历活动id",
-                    "type": "integer",
-                    "format": "int64"
+                "CompanyDetail": {
+                    "$ref": "#/definitions/roadshow.CompanyDetailView"
                 },
-                "RsCalendarResearcherId": {
-                    "description": "活动研究员id",
-                    "type": "integer",
-                    "format": "int64"
+                "RsCalendarItem": {
+                    "$ref": "#/definitions/roadshow.RsCalendar"
+                },
+                "RsCalendarResearcherItem": {
+                    "$ref": "#/definitions/roadshow.RsCalendarResearcher"
                 }
             }
         },
-        "roadshow.AddActivityReq": {
-            "title": "AddActivityReq",
-            "type": "object",
-            "properties": {
-                "ActivityCategory": {
-                    "description": "活动类别",
-                    "type": "string"
-                },
-                "ActivityType": {
-                    "description": "活动类型",
-                    "type": "string"
-                },
-                "City": {
-                    "description": "市",
-                    "type": "string"
-                },
-                "CityCode": {
-                    "description": "市编码",
-                    "type": "string"
-                },
-                "CompanyId": {
-                    "description": "客户id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "CompanyName": {
-                    "description": "客户名称",
-                    "type": "string"
-                },
-                "CooperationName": {
-                    "description": "合作方名称",
-                    "type": "string"
-                },
-                "Province": {
-                    "description": "省",
-                    "type": "string"
-                },
-                "ProvinceCode": {
-                    "description": "省编码",
-                    "type": "string"
-                },
-                "ResearcherList": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/roadshow.CalendarResearcher"
-                    }
-                },
-                "RoadshowPlatform": {
-                    "description": "路演平台",
-                    "type": "string"
-                },
-                "RoadshowType": {
-                    "description": "路演形式",
-                    "type": "string"
-                },
-                "Theme": {
-                    "description": "会议主题",
-                    "type": "string"
-                }
-            }
-        },
-        "roadshow.AddMattersReq": {
-            "title": "AddMattersReq",
-            "type": "object",
-            "properties": {
-                "EndDate": {
-                    "description": "结束日期",
-                    "type": "string"
-                },
-                "EndTime": {
-                    "description": "结束时间",
-                    "type": "string"
-                },
-                "EndWeek": {
-                    "description": "结束日期周",
-                    "type": "string"
-                },
-                "MatterContent": {
-                    "description": "事项内容",
-                    "type": "string"
-                },
-                "StartDate": {
-                    "description": "开始日期",
-                    "type": "string"
-                },
-                "StartTime": {
-                    "description": "开始时间",
-                    "type": "string"
-                },
-                "StartWeek": {
-                    "description": "开始日期周",
-                    "type": "string"
-                }
-            }
-        },
-        "roadshow.CalendarDetailResp": {
-            "title": "CalendarDetailResp",
-            "type": "object",
-            "properties": {
-                "CompanyDetail": {
-                    "$ref": "#/definitions/roadshow.CompanyDetailView"
-                },
-                "RsCalendarItem": {
-                    "$ref": "#/definitions/roadshow.RsCalendar"
-                },
-                "RsCalendarResearcherItem": {
-                    "$ref": "#/definitions/roadshow.RsCalendarResearcher"
-                }
-            }
-        },
-        "roadshow.CalendarListResp": {
-            "title": "CalendarListResp",
-            "type": "object",
-            "properties": {
-                "List": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/roadshow.CalendarListView"
-                    }
-                },
-                "Paging": {
-                    "$ref": "#/definitions/paging.PagingItem"
-                }
-            }
-        },
-        "roadshow.CalendarListView": {
-            "title": "CalendarListView",
-            "type": "object",
-            "properties": {
-                "ActivityCategory": {
-                    "description": "活动类别",
-                    "type": "string"
-                },
-                "ActivityType": {
-                    "description": "活动类型",
-                    "type": "string"
-                },
-                "City": {
-                    "description": "市",
-                    "type": "string"
-                },
-                "CityCode": {
-                    "description": "市编码",
-                    "type": "string"
-                },
-                "CompanyId": {
-                    "description": "客户id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "CompanyName": {
-                    "description": "客户名称",
-                    "type": "string"
-                },
-                "CooperationName": {
-                    "description": "合作方名称",
-                    "type": "string"
-                },
-                "CreateTime": {
-                    "type": "string",
-                    "format": "datetime"
-                },
-                "DeleteReason": {
-                    "description": "删除原因",
-                    "type": "string"
-                },
-                "EndDate": {
-                    "description": "结束日期",
-                    "type": "string"
-                },
-                "EndTime": {
-                    "description": "结束时间",
-                    "type": "string"
-                },
-                "EndWeek": {
-                    "description": "结束日期对应周",
-                    "type": "string"
-                },
-                "ModifyTime": {
-                    "type": "string",
-                    "format": "datetime"
-                },
-                "Province": {
-                    "description": "省",
-                    "type": "string"
-                },
-                "ProvinceCode": {
-                    "description": "省编码",
-                    "type": "string"
-                },
-                "RefuseReason": {
-                    "description": "拒绝理由",
-                    "type": "string"
-                },
-                "RefuseTime": {
-                    "description": "拒绝时间",
-                    "type": "string",
-                    "format": "datetime"
-                },
-                "ResearcherId": {
-                    "description": "研究员id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "ResearcherName": {
-                    "description": "研究员名称",
-                    "type": "string"
-                },
-                "RoadshowPlatform": {
-                    "description": "路演平台",
-                    "type": "string"
-                },
-                "RoadshowType": {
-                    "description": "路演形式",
-                    "type": "string"
-                },
-                "RsCalendarId": {
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "RsCalendarResearcherId": {
-                    "description": "活动研究员id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "StartDate": {
-                    "description": "开始日期",
-                    "type": "string"
-                },
-                "StartTime": {
-                    "description": "开始时间",
-                    "type": "string"
-                },
-                "StartWeek": {
-                    "description": "开始日期对应周",
-                    "type": "string"
-                },
-                "Status": {
-                    "description": "状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "SysUserId": {
-                    "description": "创建人id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "SysUserRealName": {
-                    "description": "创建人名称",
-                    "type": "string"
-                },
-                "Theme": {
-                    "description": "会议主题",
-                    "type": "string"
-                }
-            }
-        },
-        "roadshow.CalendarResearcher": {
-            "title": "CalendarResearcher",
-            "type": "object",
-            "properties": {
-                "EndDate": {
-                    "description": "结束日期",
-                    "type": "string"
-                },
-                "EndTime": {
-                    "description": "结束时间",
-                    "type": "string"
-                },
-                "EndWeek": {
-                    "description": "结束日期对应周",
-                    "type": "string"
-                },
-                "ResearcherId": {
-                    "description": "研究员id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "ResearcherName": {
-                    "description": "研究员名称",
-                    "type": "string"
-                },
-                "StartDate": {
-                    "description": "开始日期",
-                    "type": "string"
-                },
-                "StartTime": {
-                    "description": "开始时间",
-                    "type": "string"
-                },
-                "StartWeek": {
-                    "description": "开始日期对应周",
-                    "type": "string"
-                }
-            }
-        },
-        "roadshow.CompanyDetailView": {
-            "title": "CompanyDetailView",
+        "roadshow.CompanyDetailView": {
+            "title": "CompanyDetailView",
             "type": "object",
             "properties": {
                 "CompanyId": {
@@ -3908,52 +3890,6 @@
                 }
             }
         },
-        "roadshow.DeleteMattersReq": {
-            "title": "DeleteMattersReq",
-            "type": "object",
-            "properties": {
-                "RsMattersId": {
-                    "description": "事项id",
-                    "type": "integer",
-                    "format": "int64"
-                }
-            }
-        },
-        "roadshow.MattersListResp": {
-            "title": "MattersListResp",
-            "type": "object",
-            "properties": {
-                "List": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/roadshow.RsMattersView"
-                    }
-                },
-                "Paging": {
-                    "$ref": "#/definitions/paging.PagingItem"
-                }
-            }
-        },
-        "roadshow.RefuseReq": {
-            "title": "RefuseReq",
-            "type": "object",
-            "properties": {
-                "RefuseReason": {
-                    "description": "拒绝原因",
-                    "type": "string"
-                },
-                "RsCalendarId": {
-                    "description": "日历活动id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "RsCalendarResearcherId": {
-                    "description": "活动研究员id",
-                    "type": "integer",
-                    "format": "int64"
-                }
-            }
-        },
         "roadshow.RsCalendar": {
             "title": "RsCalendar",
             "type": "object",
@@ -4138,108 +4074,57 @@
                 }
             }
         },
-        "roadshow.RsMattersView": {
-            "title": "RsMattersView",
-            "type": "object",
-            "properties": {
-                "CreateTime": {
-                    "description": "创建时间",
-                    "type": "string"
-                },
-                "EndDate": {
-                    "description": "结束日期",
-                    "type": "string"
-                },
-                "EndTime": {
-                    "description": "结束时间",
-                    "type": "string"
-                },
-                "EndWeek": {
-                    "description": "结束日期周",
-                    "type": "string"
-                },
-                "IsSynced": {
-                    "description": "是否与上海同步 0:未同步 1:已同步",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "MatterContent": {
-                    "description": "事项内容",
-                    "type": "string"
-                },
-                "ModifyTime": {
-                    "description": "修改时间",
-                    "type": "string"
-                },
-                "RsMattersId": {
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "StartDate": {
-                    "description": "开始日期",
-                    "type": "string"
-                },
-                "StartTime": {
-                    "description": "开始时间",
-                    "type": "string"
-                },
-                "StartWeek": {
-                    "description": "开始日期周",
-                    "type": "string"
-                },
-                "Status": {
-                    "description": "状态:1:进行中,6:已结束",
-                    "type": "integer",
-                    "format": "int32"
-                },
-                "SysUserId": {
-                    "description": "添加事项人id",
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "SysUserRealName": {
-                    "description": "创建人姓名",
-                    "type": "string"
-                }
-            }
+        "rs.AcceptReq": {
+            "title": "AcceptReq",
+            "type": "object"
         },
-        "roadshow.UpdateMattersReq": {
+        "rs.AddActivityReq": {
+            "title": "AddActivityReq",
+            "type": "object"
+        },
+        "rs.AddMattersReq": {
+            "title": "AddMattersReq",
+            "type": "object"
+        },
+        "rs.CalendarDetailResp": {
+            "title": "CalendarDetailResp",
+            "type": "object"
+        },
+        "rs.CalendarListResp": {
+            "title": "CalendarListResp",
+            "type": "object"
+        },
+        "rs.CompanyDetailView": {
+            "title": "CompanyDetailView",
+            "type": "object"
+        },
+        "rs.DeleteMattersReq": {
+            "title": "DeleteMattersReq",
+            "type": "object"
+        },
+        "rs.DeleteReq": {
+            "title": "DeleteReq",
+            "type": "object"
+        },
+        "rs.EditActivityReq": {
+            "title": "EditActivityReq",
+            "type": "object"
+        },
+        "rs.MattersListResp": {
+            "title": "MattersListResp",
+            "type": "object"
+        },
+        "rs.RefuseReq": {
+            "title": "RefuseReq",
+            "type": "object"
+        },
+        "rs.ResearcherGroup": {
+            "title": "ResearcherGroup",
+            "type": "object"
+        },
+        "rs.UpdateMattersReq": {
             "title": "UpdateMattersReq",
-            "type": "object",
-            "properties": {
-                "EndDate": {
-                    "description": "结束日期",
-                    "type": "string"
-                },
-                "EndTime": {
-                    "description": "结束时间",
-                    "type": "string"
-                },
-                "EndWeek": {
-                    "description": "结束日期周",
-                    "type": "string"
-                },
-                "MatterContent": {
-                    "description": "事项内容",
-                    "type": "string"
-                },
-                "RsMattersId": {
-                    "type": "integer",
-                    "format": "int64"
-                },
-                "StartDate": {
-                    "description": "开始日期",
-                    "type": "string"
-                },
-                "StartTime": {
-                    "description": "开始时间",
-                    "type": "string"
-                },
-                "StartWeek": {
-                    "description": "开始日期周",
-                    "type": "string"
-                }
-            }
+            "type": "object"
         },
         "seal.AddReq": {
             "title": "AddReq",
@@ -4586,7 +4471,7 @@
                     "description": "审批流",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/722.\u003cnil\u003e.0xc0006bc3d8"
+                        "$ref": "#/definitions/722.\u003cnil\u003e.0xc00077cab0"
                     }
                 },
                 "OpButton": {

+ 244 - 351
swagger/swagger.yml

@@ -710,7 +710,7 @@ paths:
   /roadshow/accept:
     post:
       tags:
-      - rs
+      - roadshow
       description: 接受路演活动接口
       parameters:
       - in: body
@@ -722,10 +722,21 @@ paths:
       responses:
         Ret=200:
           description: 保存成功
+  /roadshow/activity/type/list:
+    get:
+      tags:
+      - roadshow
+      description: 获取报告电话会类型接口
+      operationId: CalendarController.获取报告电话会类型
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/rs.ResearcherGroup'
   /roadshow/add:
     post:
       tags:
-      - rs
+      - roadshow
       description: 新增路演活动接口
       operationId: CalendarController.新增路演活动接口
       parameters:
@@ -738,10 +749,26 @@ paths:
       responses:
         Ret=200:
           description: 保存成功
+  /roadshow/back:
+    post:
+      tags:
+      - roadshow
+      description: 撤回路演活动接口
+      operationId: CalendarController.撤回路演活动接口
+      parameters:
+      - in: body
+        name: request
+        description: type json string
+        required: true
+        schema:
+          $ref: '#/definitions/rs.AcceptReq'
+      responses:
+        Ret=200:
+          description: 保存成功
   /roadshow/calendar/detail:
     get:
       tags:
-      - rs
+      - roadshow
       description: 日历详情接口
       operationId: CalendarController.日历详情
       parameters:
@@ -765,7 +792,7 @@ paths:
   /roadshow/calendar/list:
     get:
       tags:
-      - rs
+      - roadshow
       description: 我的日历列表接口
       operationId: CalendarController.我的日历列表
       parameters:
@@ -783,19 +810,116 @@ paths:
         format: int64
       - in: query
         name: Status
-        description: 1:待接受,2:包含,已接受,已拒绝,已删除
+        description: 1:待接受,2:包含,已接受,已拒绝,已删除,已撤回,已结束
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/rs.CalendarListResp'
+  /roadshow/calendar/type/list:
+    get:
+      tags:
+      - roadshow
+      description: 内部会议和报告电话会日历列表
+      operationId: CalendarController.内部会议和报告电话会日历列表
+      parameters:
+      - in: query
+        name: PageSize
+        description: 每页数据条数
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: CurrentIndex
+        description: 当前页页码,从1开始
+        required: true
+        type: integer
+        format: int64
+      - in: query
+        name: CalendarType
+        description: 1:内部会议,2:报告电话会
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/rs.CalendarListResp'
+  /roadshow/company/detail:
+    get:
+      tags:
+      - roadshow
+      description: 我的日历列表接口
+      operationId: CalendarController.我的日历列表
+      parameters:
+      - in: query
+        name: CompanyId
+        description: 公司id
         required: true
         type: integer
         format: int64
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/rs.CompanyDetailView'
+  /roadshow/company/search:
+    get:
+      tags:
+      - roadshow
+      description: 我的日历列表接口
+      operationId: CalendarController.我的日历列表
+      parameters:
+      - in: query
+        name: KeyWord
+        description: 搜索关键词
+        required: true
+        type: string
       responses:
         "200":
           description: ""
           schema:
             $ref: '#/definitions/rs.CalendarListResp'
+  /roadshow/delete:
+    post:
+      tags:
+      - roadshow
+      description: 删除路演活动接口
+      operationId: CalendarController.删除路演活动接口
+      parameters:
+      - in: body
+        name: request
+        description: type json string
+        required: true
+        schema:
+          $ref: '#/definitions/rs.DeleteReq'
+      responses:
+        Ret=200:
+          description: 保存成功
+  /roadshow/edit:
+    post:
+      tags:
+      - roadshow
+      description: 编辑路演活动接口
+      operationId: CalendarController.编辑路演活动接口
+      parameters:
+      - in: body
+        name: request
+        description: type json string
+        required: true
+        schema:
+          $ref: '#/definitions/rs.EditActivityReq'
+      responses:
+        Ret=200:
+          description: 保存成功
   /roadshow/matters/add:
     post:
       tags:
-      - rs
+      - roadshow
       description: 新增事项接口
       operationId: CalendarController.新增事项接口
       parameters:
@@ -811,7 +935,7 @@ paths:
   /roadshow/matters/delete:
     post:
       tags:
-      - rs
+      - roadshow
       description: 删除事项接口
       operationId: CalendarController.删除事项接口
       parameters:
@@ -827,7 +951,7 @@ paths:
   /roadshow/matters/list:
     get:
       tags:
-      - rs
+      - roadshow
       description: 事项列表接口
       operationId: CalendarController.事项列表
       parameters:
@@ -851,7 +975,7 @@ paths:
   /roadshow/matters/update:
     post:
       tags:
-      - rs
+      - roadshow
       description: 修改事项接口
       operationId: CalendarController.修改事项接口
       parameters:
@@ -864,10 +988,32 @@ paths:
       responses:
         Ret=200:
           description: 保存成功
+  /roadshow/my/calendar/detail:
+    get:
+      tags:
+      - roadshow
+      description: 路演-我的日历详情接口
+      operationId: CalendarController.路演-我的日历详情
+      parameters:
+      - in: query
+        name: StartDate
+        description: 开始日期
+        required: true
+        type: string
+      - in: query
+        name: EndDate
+        description: 结束日期日期
+        required: true
+        type: string
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/roadshow.CalendarDetailResp'
   /roadshow/refuse:
     post:
       tags:
-      - rs
+      - roadshow
       description: 拒绝路演活动接口
       operationId: CalendarController.拒绝路演活动接口
       parameters:
@@ -880,6 +1026,45 @@ paths:
       responses:
         Ret=200:
           description: 保存成功
+  /roadshow/researcher/calendar/detail:
+    get:
+      tags:
+      - roadshow
+      description: 路演-研究员日历详情接口
+      operationId: CalendarController.路演-研究员日历详情
+      parameters:
+      - in: query
+        name: StartDate
+        description: 开始日期
+        required: true
+        type: string
+      - in: query
+        name: EndDate
+        description: 结束日期日期
+        required: true
+        type: string
+      - in: query
+        name: ResearcherId
+        description: 研究员id
+        required: true
+        type: integer
+        format: int64
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/roadshow.CalendarDetailResp'
+  /roadshow/researcher/list:
+    get:
+      tags:
+      - roadshow
+      description: 研究员列表接口
+      operationId: CalendarController.研究员列表
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/rs.ResearcherGroup'
   /seal/add:
     post:
       tags:
@@ -1200,14 +1385,14 @@ paths:
           schema:
             $ref: '#/definitions/wechat.WxLoginResp'
 definitions:
-  645.<nil>.0xc000663cf8:
-    title: "0xc000663cf8"
+  645.<nil>.0xc00077c3d8:
+    title: "0xc00077c3d8"
     type: object
-  722.<nil>.0xc0006bc3d8:
-    title: "0xc0006bc3d8"
+  722.<nil>.0xc00077cab0:
+    title: "0xc00077cab0"
     type: object
-  1635.<nil>.0xc0006bc0a8:
-    title: "0xc0006bc0a8"
+  1635.<nil>.0xc00077c780:
+    title: "0xc00077c780"
     type: object
   admin.LoginReq:
     title: LoginReq
@@ -1294,7 +1479,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/645.<nil>.0xc000663cf8'
+          $ref: '#/definitions/645.<nil>.0xc00077c3d8'
       PermissionList:
         description: 权益权限列表
         type: array
@@ -1962,7 +2147,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/1635.<nil>.0xc0006bc0a8'
+          $ref: '#/definitions/1635.<nil>.0xc00077c780'
       OpButton:
         $ref: '#/definitions/contract.OpButton'
         description: 操作权限
@@ -2518,237 +2703,16 @@ definitions:
   paging.PagingItem:
     title: PagingItem
     type: object
-  roadshow.AcceptReq:
-    title: AcceptReq
-    type: object
-    properties:
-      RsCalendarId:
-        description: 日历活动id
-        type: integer
-        format: int64
-      RsCalendarResearcherId:
-        description: 活动研究员id
-        type: integer
-        format: int64
-  roadshow.AddActivityReq:
-    title: AddActivityReq
-    type: object
-    properties:
-      ActivityCategory:
-        description: 活动类别
-        type: string
-      ActivityType:
-        description: 活动类型
-        type: string
-      City:
-        description: 市
-        type: string
-      CityCode:
-        description: 市编码
-        type: string
-      CompanyId:
-        description: 客户id
-        type: integer
-        format: int64
-      CompanyName:
-        description: 客户名称
-        type: string
-      CooperationName:
-        description: 合作方名称
-        type: string
-      Province:
-        description: 省
-        type: string
-      ProvinceCode:
-        description: 省编码
-        type: string
-      ResearcherList:
-        type: array
-        items:
-          $ref: '#/definitions/rs.CalendarResearcher'
-      RoadshowPlatform:
-        description: 路演平台
-        type: string
-      RoadshowType:
-        description: 路演形式
-        type: string
-      Theme:
-        description: 会议主题
-        type: string
-  roadshow.AddMattersReq:
-    title: AddMattersReq
-    type: object
-    properties:
-      EndDate:
-        description: 结束日期
-        type: string
-      EndTime:
-        description: 结束时间
-        type: string
-      EndWeek:
-        description: 结束日期周
-        type: string
-      MatterContent:
-        description: 事项内容
-        type: string
-      StartDate:
-        description: 开始日期
-        type: string
-      StartTime:
-        description: 开始时间
-        type: string
-      StartWeek:
-        description: 开始日期周
-        type: string
   roadshow.CalendarDetailResp:
     title: CalendarDetailResp
     type: object
     properties:
       CompanyDetail:
-        $ref: '#/definitions/rs.CompanyDetailView'
+        $ref: '#/definitions/roadshow.CompanyDetailView'
       RsCalendarItem:
-        $ref: '#/definitions/rs.RsCalendar'
+        $ref: '#/definitions/roadshow.RsCalendar'
       RsCalendarResearcherItem:
-        $ref: '#/definitions/rs.RsCalendarResearcher'
-  roadshow.CalendarListResp:
-    title: CalendarListResp
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/rs.CalendarListView'
-      Paging:
-        $ref: '#/definitions/paging.PagingItem'
-  roadshow.CalendarListView:
-    title: CalendarListView
-    type: object
-    properties:
-      ActivityCategory:
-        description: 活动类别
-        type: string
-      ActivityType:
-        description: 活动类型
-        type: string
-      City:
-        description: 市
-        type: string
-      CityCode:
-        description: 市编码
-        type: string
-      CompanyId:
-        description: 客户id
-        type: integer
-        format: int64
-      CompanyName:
-        description: 客户名称
-        type: string
-      CooperationName:
-        description: 合作方名称
-        type: string
-      CreateTime:
-        type: string
-        format: datetime
-      DeleteReason:
-        description: 删除原因
-        type: string
-      EndDate:
-        description: 结束日期
-        type: string
-      EndTime:
-        description: 结束时间
-        type: string
-      EndWeek:
-        description: 结束日期对应周
-        type: string
-      ModifyTime:
-        type: string
-        format: datetime
-      Province:
-        description: 省
-        type: string
-      ProvinceCode:
-        description: 省编码
-        type: string
-      RefuseReason:
-        description: 拒绝理由
-        type: string
-      RefuseTime:
-        description: 拒绝时间
-        type: string
-        format: datetime
-      ResearcherId:
-        description: 研究员id
-        type: integer
-        format: int64
-      ResearcherName:
-        description: 研究员名称
-        type: string
-      RoadshowPlatform:
-        description: 路演平台
-        type: string
-      RoadshowType:
-        description: 路演形式
-        type: string
-      RsCalendarId:
-        type: integer
-        format: int64
-      RsCalendarResearcherId:
-        description: 活动研究员id
-        type: integer
-        format: int64
-      StartDate:
-        description: 开始日期
-        type: string
-      StartTime:
-        description: 开始时间
-        type: string
-      StartWeek:
-        description: 开始日期对应周
-        type: string
-      Status:
-        description: 状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回
-        type: integer
-        format: int64
-      SysUserId:
-        description: 创建人id
-        type: integer
-        format: int64
-      SysUserRealName:
-        description: 创建人名称
-        type: string
-      Theme:
-        description: 会议主题
-        type: string
-  roadshow.CalendarResearcher:
-    title: CalendarResearcher
-    type: object
-    properties:
-      EndDate:
-        description: 结束日期
-        type: string
-      EndTime:
-        description: 结束时间
-        type: string
-      EndWeek:
-        description: 结束日期对应周
-        type: string
-      ResearcherId:
-        description: 研究员id
-        type: integer
-        format: int64
-      ResearcherName:
-        description: 研究员名称
-        type: string
-      StartDate:
-        description: 开始日期
-        type: string
-      StartTime:
-        description: 开始时间
-        type: string
-      StartWeek:
-        description: 开始日期对应周
-        type: string
+        $ref: '#/definitions/roadshow.RsCalendarResearcher'
   roadshow.CompanyDetailView:
     title: CompanyDetailView
     type: object
@@ -2776,39 +2740,6 @@ definitions:
       Status:
         description: 客户状态
         type: string
-  roadshow.DeleteMattersReq:
-    title: DeleteMattersReq
-    type: object
-    properties:
-      RsMattersId:
-        description: 事项id
-        type: integer
-        format: int64
-  roadshow.MattersListResp:
-    title: MattersListResp
-    type: object
-    properties:
-      List:
-        type: array
-        items:
-          $ref: '#/definitions/rs.RsMattersView'
-      Paging:
-        $ref: '#/definitions/paging.PagingItem'
-  roadshow.RefuseReq:
-    title: RefuseReq
-    type: object
-    properties:
-      RefuseReason:
-        description: 拒绝原因
-        type: string
-      RsCalendarId:
-        description: 日历活动id
-        type: integer
-        format: int64
-      RsCalendarResearcherId:
-        description: 活动研究员id
-        type: integer
-        format: int64
   roadshow.RsCalendar:
     title: RsCalendar
     type: object
@@ -2949,83 +2880,45 @@ definitions:
         description: 状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回,6:已结束
         type: integer
         format: int64
-  roadshow.RsMattersView:
-    title: RsMattersView
+  rs.AcceptReq:
+    title: AcceptReq
     type: object
-    properties:
-      CreateTime:
-        description: 创建时间
-        type: string
-      EndDate:
-        description: 结束日期
-        type: string
-      EndTime:
-        description: 结束时间
-        type: string
-      EndWeek:
-        description: 结束日期周
-        type: string
-      IsSynced:
-        description: 是否与上海同步 0:未同步 1:已同步
-        type: integer
-        format: int64
-      MatterContent:
-        description: 事项内容
-        type: string
-      ModifyTime:
-        description: 修改时间
-        type: string
-      RsMattersId:
-        type: integer
-        format: int64
-      StartDate:
-        description: 开始日期
-        type: string
-      StartTime:
-        description: 开始时间
-        type: string
-      StartWeek:
-        description: 开始日期周
-        type: string
-      Status:
-        description: 状态:1:进行中,6:已结束
-        type: integer
-        format: int32
-      SysUserId:
-        description: 添加事项人id
-        type: integer
-        format: int64
-      SysUserRealName:
-        description: 创建人姓名
-        type: string
-  roadshow.UpdateMattersReq:
+  rs.AddActivityReq:
+    title: AddActivityReq
+    type: object
+  rs.AddMattersReq:
+    title: AddMattersReq
+    type: object
+  rs.CalendarDetailResp:
+    title: CalendarDetailResp
+    type: object
+  rs.CalendarListResp:
+    title: CalendarListResp
+    type: object
+  rs.CompanyDetailView:
+    title: CompanyDetailView
+    type: object
+  rs.DeleteMattersReq:
+    title: DeleteMattersReq
+    type: object
+  rs.DeleteReq:
+    title: DeleteReq
+    type: object
+  rs.EditActivityReq:
+    title: EditActivityReq
+    type: object
+  rs.MattersListResp:
+    title: MattersListResp
+    type: object
+  rs.RefuseReq:
+    title: RefuseReq
+    type: object
+  rs.ResearcherGroup:
+    title: ResearcherGroup
+    type: object
+  rs.UpdateMattersReq:
     title: UpdateMattersReq
     type: object
-    properties:
-      EndDate:
-        description: 结束日期
-        type: string
-      EndTime:
-        description: 结束时间
-        type: string
-      EndWeek:
-        description: 结束日期周
-        type: string
-      MatterContent:
-        description: 事项内容
-        type: string
-      RsMattersId:
-        type: integer
-        format: int64
-      StartDate:
-        description: 开始日期
-        type: string
-      StartTime:
-        description: 开始时间
-        type: string
-      StartWeek:
-        description: 开始日期周
-        type: string
   seal.AddReq:
     title: AddReq
     type: object
@@ -3286,7 +3179,7 @@ definitions:
         description: 审批流
         type: array
         items:
-          $ref: '#/definitions/722.<nil>.0xc0006bc3d8'
+          $ref: '#/definitions/722.<nil>.0xc00077cab0'
       OpButton:
         $ref: '#/definitions/seal.OpButton'
         description: 操作权限
@@ -3354,6 +3247,6 @@ tags:
 - name: resource
   description: |
     资源管理-图片上传,合同上传等
-- name: rs
+- name: roadshow
   description: |
     日历