|
|
@@ -64,11 +64,12 @@ type RsCalendarResearcher struct {
|
|
|
EndTime string `description:"结束时间"`
|
|
|
StartWeek string `description:"开始日期对应周"`
|
|
|
EndWeek string `description:"结束日期对应周"`
|
|
|
- CreateTime time.Time
|
|
|
- ModifyTime time.Time
|
|
|
- Status int `description:"状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回"`
|
|
|
- RefuseReason string `description:"拒绝理由"`
|
|
|
- RefuseTime time.Time `description:"拒绝时间"`
|
|
|
+ CreateTime string
|
|
|
+ ModifyTime string
|
|
|
+ Status int `description:"状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回"`
|
|
|
+ RefuseReason string `description:"拒绝理由"`
|
|
|
+ RefuseTime string `description:"拒绝时间"`
|
|
|
+ ApproveTime string `description:"审批时间"`
|
|
|
}
|
|
|
|
|
|
func GetRsCalendarById(rsCalendarId int) (item *RsCalendar, err error) {
|
|
|
@@ -85,7 +86,6 @@ func GetRsCalendarResearcherById(rsCalendarResearcherId int) (item *RsCalendarRe
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
type Researcher struct {
|
|
|
AdminId int `description:"研究员id"`
|
|
|
RealName string `description:"研究员名称"`
|
|
|
@@ -224,7 +224,6 @@ type RsMatters struct {
|
|
|
ModifyTime time.Time `description:"修改时间"`
|
|
|
}
|
|
|
|
|
|
-
|
|
|
type UpdateMattersReq struct {
|
|
|
RsMattersId int `orm:"column(rs_matters_id);pk"`
|
|
|
StartDate string `description:"开始日期"`
|
|
|
@@ -247,7 +246,7 @@ type CompanyDetailView struct {
|
|
|
}
|
|
|
|
|
|
type CalendarDetailResp struct {
|
|
|
- RsCalendarItem *RsCalendar
|
|
|
+ RsCalendarItem *RsCalendar
|
|
|
RsCalendarResearcherItem *RsCalendarResearcher
|
|
|
- CompanyDetail *CompanyDetailView
|
|
|
-}
|
|
|
+ CompanyDetail *CompanyDetailView
|
|
|
+}
|
longyu