diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go index eb40fd94..c22b435e 100644 --- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go +++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao/BaseOrganizationDao.go @@ -549,3 +549,29 @@ func ListEduByCityCode(cityCode string) ([]map[string]interface{}, error) { list, err := db.SQL(sql, cityCode).Query().List() return list, err } + +/** +功能:将学校的附设班进行修改 +作者:黄海 +时间:2020-07-17 +*/ +func ModifyFsb(bureauId string, fsbCode []string) error { + //1、旧数据全面修改为-2 + myBuilder := builder.Dialect(builder.MYSQL).Update(builder.Eq{"b_use": -2}).From("t_base_school_fsb"). + Where(builder.Eq{"bureau_id": bureauId}).And(builder.Eq{"b_use": 1}) + sql, err := myBuilder.ToBoundSQL() + if err != nil { + return err + } + db.SQL(sql).Execute() + //2、增加新数据 + for i := range fsbCode { + model := new(models.TBaseSchoolFsb) + model.Id = CommonUtil.GetUUID() + model.BureauId = bureauId + model.Fsxxbxlxm = fsbCode[i] + model.BUse = 1 + db.Insert(model) + } + return nil +} diff --git a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go index f2fc3814..38aa0065 100644 --- a/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go +++ b/dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go @@ -212,6 +212,8 @@ func (s *Rpc) AddBaseOrganization(ctx context.Context, in *BaseOrganizationProto LogUtil.Error(ErrorConst.SqlUpdateError, "执行AddBaseOrganization时发生严重错误:"+err.Error()) return nil, err } + //保存附设班信息 + BaseOrganizationDao.ModifyFsb(model.BureauId, in.FsbIds) // *********************************************************************// // 组织机构类型 1:教育局 2:学校 3:部门 4:院 5:系 6:专业 7:教辅单位,8:大学区 // 如果是学校,教辅单位,大学区的话,需要生成管理员账号 @@ -491,6 +493,9 @@ func (s *Rpc) UpdateBaseOrganization(ctx context.Context, in *BaseOrganizationPr LogUtil.Error(ErrorConst.SqlUpdateError, "执行UpdateBaseOrganization时发生严重错误:"+err.Error()) return nil, err } + //保存附设班信息 + BaseOrganizationDao.ModifyFsb(model.BureauId, in.FsbIds) + //是否传递了部门管理员 ,黄海添加于2020-06-04 if len(in.OrgManagerIds) > 0 && len(in.OrgManagerIds[0]) > 0 { err = BaseOrganizationManagerDao.UpdateOrgManager(model.OrgId, in.OrgManagerIds) diff --git a/dsBaseRpc/models/t_base_organization_fsb.go b/dsBaseRpc/models/t_base_school_fsb.go similarity index 90% rename from dsBaseRpc/models/t_base_organization_fsb.go rename to dsBaseRpc/models/t_base_school_fsb.go index 3777faee..d20602d9 100644 --- a/dsBaseRpc/models/t_base_organization_fsb.go +++ b/dsBaseRpc/models/t_base_school_fsb.go @@ -1,6 +1,6 @@ package models -type TBaseOrganizationFsb struct { +type TBaseSchoolFsb struct { Id string `xorm:"not null pk comment('主键') CHAR(36)"` BureauId string `xorm:"not null comment('学校ID') CHAR(36)"` Fsxxbxlxm string `xorm:"not null comment('学校附设班办学类型') CHAR(3)"`