正在显示
4 个修改的文件
包含
7 行增加
和
8 行删除
@@ -153,12 +153,11 @@ func EditAchievement(editData *protocol.RequestEditAchievement, companyid int64) | @@ -153,12 +153,11 @@ func EditAchievement(editData *protocol.RequestEditAchievement, companyid int64) | ||
153 | achievementData.AuditTemplateId = editData.AuditTemplateId | 153 | achievementData.AuditTemplateId = editData.AuditTemplateId |
154 | achievementData.SourceContent = editData.SourceContent | 154 | achievementData.SourceContent = editData.SourceContent |
155 | achievementData.GraspScore = editData.GraspScore | 155 | achievementData.GraspScore = editData.GraspScore |
156 | - achievementData.UpdateAt = nowTime | ||
157 | achievementData.UserGraspScore = editData.UserGraspScore | 156 | achievementData.UserGraspScore = editData.UserGraspScore |
158 | achievementData.GraspScoreRemain = newRamain | 157 | achievementData.GraspScoreRemain = newRamain |
159 | cols := []string{ | 158 | cols := []string{ |
160 | "UpdateAt", "ChanceTypeId", "AuditTemplateId", "SourceContent", "GraspScore", | 159 | "UpdateAt", "ChanceTypeId", "AuditTemplateId", "SourceContent", "GraspScore", |
161 | - "UserGraspScore", | 160 | + "UserGraspScore", "GraspScoreRemain", |
162 | } | 161 | } |
163 | o := orm.NewOrm() | 162 | o := orm.NewOrm() |
164 | o.Begin() | 163 | o.Begin() |
@@ -16,7 +16,7 @@ type CommonProtocol struct { | @@ -16,7 +16,7 @@ type CommonProtocol struct { | ||
16 | var actionmap = map[string]PlatformAction{ | 16 | var actionmap = map[string]PlatformAction{ |
17 | "department": ModuleDeparmentData{}, | 17 | "department": ModuleDeparmentData{}, |
18 | "position": ModulePositionData{}, | 18 | "position": ModulePositionData{}, |
19 | - "emplayee": ModuleEmployee{}, | 19 | + "employee": ModuleEmployee{}, |
20 | "company": ModuleCompanytData{}, | 20 | "company": ModuleCompanytData{}, |
21 | } | 21 | } |
22 | 22 |
@@ -180,9 +180,10 @@ func AddPosition(data ModulePositionData) error { | @@ -180,9 +180,10 @@ func AddPosition(data ModulePositionData) error { | ||
180 | return errors.New("无效公司") | 180 | return errors.New("无效公司") |
181 | } | 181 | } |
182 | positioninfo := &models.Position{ | 182 | positioninfo := &models.Position{ |
183 | - Id: data.Id, | ||
184 | - Name: data.Name, | ||
185 | - CompanyId: companyinfo.Id, | 183 | + Id: data.Id, |
184 | + Name: data.Name, | ||
185 | + CompanyId: companyinfo.Id, | ||
186 | + BusinessPositionId: data.Id, | ||
186 | } | 187 | } |
187 | var ( | 188 | var ( |
188 | parentPosition *models.Position | 189 | parentPosition *models.Position |
@@ -449,8 +449,7 @@ func deleteRankRangeDataByRelation(rankTypeId int64, rangeType int8, relationId | @@ -449,8 +449,7 @@ func deleteRankRangeDataByRelation(rankTypeId int64, rangeType int8, relationId | ||
449 | _, err := om.QueryTable(&models.RankRangeData{}). | 449 | _, err := om.QueryTable(&models.RankRangeData{}). |
450 | Filter("rank_type_id", rankTypeId). | 450 | Filter("rank_type_id", rankTypeId). |
451 | Filter("range_type", rangeType). | 451 | Filter("range_type", rangeType). |
452 | - Filter("relation_id__in", relationId). | ||
453 | - Delete() | 452 | + Filter("relation_id__in", relationId).Delete() |
454 | if err != nil { | 453 | if err != nil { |
455 | log.Error("删除rank_range_data数据失败:%s", err) | 454 | log.Error("删除rank_range_data数据失败:%s", err) |
456 | return err | 455 | return err |
-
请 注册 或 登录 后发表评论