正在显示
1 个修改的文件
包含
12 行增加
和
10 行删除
@@ -1193,10 +1193,10 @@ func (d *StaffAssessDao) SearchContentValueByAssessId(assessId []int) map[int][] | @@ -1193,10 +1193,10 @@ func (d *StaffAssessDao) SearchContentValueByAssessId(assessId []int) map[int][] | ||
1193 | } | 1193 | } |
1194 | 1194 | ||
1195 | type AssessContentLevelCode struct { | 1195 | type AssessContentLevelCode struct { |
1196 | - Cnt int `pg:"cnt"` //数量 | ||
1197 | - LevelValue string `pg:"levelValue"` //评估的等级值 | ||
1198 | - Category string `pg:"category"` //评估的分类 | ||
1199 | - Name string `pg:"name"` //名称 | 1196 | + Cnt int `pg:"cnt"` //数量 |
1197 | + LevelValue string `pg:"level_value"` //评估的等级值 | ||
1198 | + Category string `pg:"category"` //评估的分类 | ||
1199 | + Name string `pg:"name"` //名称 | ||
1200 | } | 1200 | } |
1201 | 1201 | ||
1202 | func (d *StaffAssessDao) CountAssessContentLevelCode(targetUserId int, assessType domain.StaffAssessType, cycleId int) ([]AssessContentLevelCode, error) { | 1202 | func (d *StaffAssessDao) CountAssessContentLevelCode(targetUserId int, assessType domain.StaffAssessType, cycleId int) ([]AssessContentLevelCode, error) { |
@@ -1255,8 +1255,8 @@ func (d *StaffAssessDao) CountUncompletedSelfAssess(companyId int, projectIds [] | @@ -1255,8 +1255,8 @@ func (d *StaffAssessDao) CountUncompletedSelfAssess(companyId int, projectIds [] | ||
1255 | } | 1255 | } |
1256 | 1256 | ||
1257 | // SearchAssesBeforeNow | 1257 | // SearchAssesBeforeNow |
1258 | -func (d *StaffAssessDao) SearchAssesBeforeNow(executorId int, companyId int, limit int, offset int) int { | ||
1259 | - sqlStr := `select | 1258 | +func (d *StaffAssessDao) SearchAssesBeforeNow(executorId int, companyId int, limit int, offset int) ([]AssessCycleDayMe, int, error) { |
1259 | + sqlStr1 := `select | ||
1260 | distinct on(cycle_id ,begin_day) | 1260 | distinct on(cycle_id ,begin_day) |
1261 | staff_assess.cycle_id , | 1261 | staff_assess.cycle_id , |
1262 | staff_assess.cycle_name , | 1262 | staff_assess.cycle_name , |
@@ -1273,13 +1273,15 @@ func (d *StaffAssessDao) SearchAssesBeforeNow(executorId int, companyId int, lim | @@ -1273,13 +1273,15 @@ func (d *StaffAssessDao) SearchAssesBeforeNow(executorId int, companyId int, lim | ||
1273 | order by begin_day desc | 1273 | order by begin_day desc |
1274 | limit ? offset ?` | 1274 | limit ? offset ?` |
1275 | 1275 | ||
1276 | - condition := []interface{}{ | 1276 | + // sqlStr2 := `` |
1277 | + | ||
1278 | + condition1 := []interface{}{ | ||
1277 | companyId, executorId, limit, offset, | 1279 | companyId, executorId, limit, offset, |
1278 | } | 1280 | } |
1279 | 1281 | ||
1280 | - _ = sqlStr | ||
1281 | - _ = condition | ||
1282 | - return 0 | 1282 | + _ = sqlStr1 |
1283 | + _ = condition1 | ||
1284 | + return nil, 0, nil | ||
1283 | 1285 | ||
1284 | } | 1286 | } |
1285 | 1287 |
-
请 注册 或 登录 后发表评论