|
@@ -2310,7 +2310,7 @@ func (this *CalendarController) ResearcherCalendarDetail() {
|
|
|
//condition += ` AND b.end_date<=?`
|
|
//condition += ` AND b.end_date<=?`
|
|
|
//pars = append(pars, endDate)
|
|
//pars = append(pars, endDate)
|
|
|
//解决研究员休假，产生跨周的数据查询不到的bug，
|
|
//解决研究员休假，产生跨周的数据查询不到的bug，
|
|
|
- condition += `AND ( b.start_date >= ? AND b.end_date <= ?
|
|
|
|
|
|
|
+ condition += ` AND ( b.start_date >= ? AND b.end_date <= ?
|
|
|
OR ( b.start_date >= ? AND b.start_date <= ? )
|
|
OR ( b.start_date >= ? AND b.start_date <= ? )
|
|
|
OR ( b.start_date <= ? AND b.end_date >= ? )
|
|
OR ( b.start_date <= ? AND b.end_date >= ? )
|
|
|
OR ( b.end_date >= ? AND b.end_date <= ? ) ) `
|
|
OR ( b.end_date >= ? AND b.end_date <= ? ) ) `
|
xingzai