|
|
|
|
@ -100,7 +100,7 @@ func PageBaseTeacher(in *BaseTeacherProto.QueryArg) ([]map[string]interface{}, i
|
|
|
|
|
var myBuilder = builder.Dialect(builder.MYSQL).Select("t1.*").
|
|
|
|
|
From("t_base_teacher as t1").
|
|
|
|
|
LeftJoin("t_base_teacher_org as t2", "t1.person_id=t2.person_id").
|
|
|
|
|
OrderBy("t1.org_id").OrderBy("t1.sort_id")
|
|
|
|
|
OrderBy("t1.sort_id")
|
|
|
|
|
//所在单位ID
|
|
|
|
|
list := SqlKit.QueryByIds([]string{in.OrgId}, "t_base_organization")
|
|
|
|
|
if list == nil {
|
|
|
|
|
@ -217,7 +217,7 @@ func ExportTeacherAccountInfoExcel(in *BaseTeacherProto.ModelArg) ([]map[string]
|
|
|
|
|
And(builder.Eq{"t2.b_use": 1}).
|
|
|
|
|
And(builder.Eq{"t3.b_use": 1}).
|
|
|
|
|
And(builder.Eq{"t2.bureau_id": in.BureauId}).And(builder.Eq{"t1.identity_id": 2})
|
|
|
|
|
myBuilder.OrderBy("t3.org_id").OrderBy("t2.sort_id")
|
|
|
|
|
myBuilder.OrderBy("t2.sort_id")
|
|
|
|
|
sql, err := myBuilder.ToBoundSQL()
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, 0, err
|
|
|
|
|
@ -306,7 +306,7 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
|
|
|
|
|
t1.mzm,t1.zzmmm,t1.sfzjlxm, (case t1.sfzjh when '-1' then '' else t1.sfzjh end ) as sfzjh,
|
|
|
|
|
t1.xlm,t1.xwm,t1.zcm,t1.bzlbm,t1.stage_id,t1.subject_id,t1.gwzym,t1.lxdh,t1.dzxx
|
|
|
|
|
from t_base_teacher as t1 inner join t_base_organization as t2 on t1.org_id=t2.org_id
|
|
|
|
|
where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1 order by t1.org_id,t1.sort_id`
|
|
|
|
|
where t1.bureau_id=? and t1.identity_id=2 and t1.b_use=1 order t1.sort_id`
|
|
|
|
|
list, _ := db.SQL(sql, bureauId).Query().List()
|
|
|
|
|
for i := range list {
|
|
|
|
|
record := list[i]
|
|
|
|
|
|
