|
@@ -1061,11 +1061,9 @@ func (this *UserController) TableDetail() {
|
|
|
}
|
|
|
} else if source == 15 { //1V1路演
|
|
|
if startDate != "" {
|
|
|
- //startDate += " 00:00:00"
|
|
|
condition += ` AND b.start_date >= '` + startDate + `' `
|
|
|
}
|
|
|
if endDate != "" {
|
|
|
- //endDate += " 23:59:59"
|
|
|
condition += ` AND b.start_date <= '` + endDate + `' `
|
|
|
}
|
|
|
if wxUser.Mobile == "" {
|
|
@@ -3111,6 +3109,12 @@ func (this *UserController) CompanyTableDetail() {
|
|
|
}
|
|
|
}
|
|
|
} else if source == 15 { //1V1路演
|
|
|
+ if startDate != "" {
|
|
|
+ condition += ` AND b.start_date >= '` + startDate + `' `
|
|
|
+ }
|
|
|
+ if endDate != "" {
|
|
|
+ condition += ` AND b.start_date <= '` + endDate + `' `
|
|
|
+ }
|
|
|
var totalRsCalendar int
|
|
|
var listRsCalendar []*roadshow.RsCalendarMeetingUserByRai
|
|
|
if isAdminRole {
|
|
@@ -4445,6 +4449,12 @@ func (this *UserController) CompanyList() {
|
|
|
}
|
|
|
}
|
|
|
} else if source == 15 {
|
|
|
+ if startDate != "" {
|
|
|
+ condition += ` AND b.start_date >= '` + startDate + `' `
|
|
|
+ }
|
|
|
+ if endDate != "" {
|
|
|
+ condition += ` AND b.start_date <= '` + endDate + `' `
|
|
|
+ }
|
|
|
var totalRsCalendar int
|
|
|
var listRsCalendar []*roadshow.RsCalendarMeetingUserByRai
|
|
|
if isAdminRole {
|