|
|
@@ -318,7 +318,7 @@ func (this *ApplyRecordController) UserApplyList() {
|
|
|
pars = append(pars, reqKeyword, reqKeyword, reqKeyword, reqKeyword, reqKeyword)
|
|
|
}
|
|
|
if markGroup != "" {
|
|
|
- condition += `AND y.mark_group = `+"'"+markGroup+"'"
|
|
|
+ condition += `AND (y.mark_group = `+"'"+markGroup+"'"+ ` OR a.mark_group = `+"'"+markGroup+"')"
|
|
|
}
|
|
|
if startDate != "" {
|
|
|
startDate += " 00:00:00"
|
|
|
@@ -533,7 +533,7 @@ func (this *ApplyRecordController) ApplyExport() {
|
|
|
}()
|
|
|
reqKeyword := this.GetString("KeyWord")
|
|
|
reqState := this.GetString("States")
|
|
|
-
|
|
|
+ markGroup := this.GetString("MarkGroup")
|
|
|
sysUser := this.SysUser
|
|
|
if sysUser == nil {
|
|
|
br.Msg = "请登录"
|
|
|
@@ -580,6 +580,9 @@ func (this *ApplyRecordController) ApplyExport() {
|
|
|
condition += " AND y.apply_record_id is null"
|
|
|
}
|
|
|
}
|
|
|
+ if markGroup != "" {
|
|
|
+ condition += `AND (y.mark_group = `+"'"+markGroup+"'"+ ` OR a.mark_group = `+"'"+markGroup+"')"
|
|
|
+ }
|
|
|
startTime := "2022-01-01"
|
|
|
list, err := yb.GetApplyRecordListV2Export(condition, pars, startTime)
|
|
|
if err != nil {
|
ziwen