|
@@ -445,16 +445,13 @@ func getAuditFlowLog(chanceid int64) ([]protocol.ChanceFlowLog, error) { |
|
@@ -445,16 +445,13 @@ func getAuditFlowLog(chanceid int64) ([]protocol.ChanceFlowLog, error) { |
445
|
func getChanceSelfChecks(chanceInfo *models.Chance) []ChanceSelfCheckData {
|
445
|
func getChanceSelfChecks(chanceInfo *models.Chance) []ChanceSelfCheckData {
|
446
|
selfChecks := []models.ChanceSelfCheckData{}
|
446
|
selfChecks := []models.ChanceSelfCheckData{}
|
447
|
switch chanceInfo.CheckResultStatus {
|
447
|
switch chanceInfo.CheckResultStatus {
|
448
|
- case models.CheckResultStatusNone: //未提交筛查结果
|
448
|
+ case models.CheckResultStatusNone, models.CheckResultStatusWait: //未提交筛查结果,未通过审核的返回所有筛查结果(一级/二级)
|
449
|
selfChecks = chanceInfo.GetSelfCheckData()
|
449
|
selfChecks = chanceInfo.GetSelfCheckData()
|
450
|
if len(selfChecks) != 0 {
|
450
|
if len(selfChecks) != 0 {
|
451
|
models.ChanceSelfCheckList(selfChecks).SetSelfChecksLevel1ByRule()
|
451
|
models.ChanceSelfCheckList(selfChecks).SetSelfChecksLevel1ByRule()
|
452
|
}
|
452
|
}
|
453
|
break
|
453
|
break
|
454
|
- case models.CheckResultStatusWait: //未通过审核的返回所有筛查结果(一级/二级)
|
|
|
455
|
- selfChecks = chanceInfo.GetCheckResultData()
|
|
|
456
|
- break
|
|
|
457
|
- default: //审核通过/不通过只显示一级
|
454
|
+ case models.CheckResultStatusPass, models.CheckResultStatusNOPass: //审核通过/不通过只显示一级
|
458
|
checkResult := chanceInfo.GetCheckResultData()
|
455
|
checkResult := chanceInfo.GetCheckResultData()
|
459
|
for i := 0; i < len(checkResult); i++ {
|
456
|
for i := 0; i < len(checkResult); i++ {
|
460
|
if selfChecks[i].ParentId == 0 {
|
457
|
if selfChecks[i].ParentId == 0 {
|
|
@@ -469,6 +466,9 @@ func getChanceSelfChecks(chanceInfo *models.Chance) []ChanceSelfCheckData { |
|
@@ -469,6 +466,9 @@ func getChanceSelfChecks(chanceInfo *models.Chance) []ChanceSelfCheckData { |
469
|
Title: selfChecks[i].CheckItem,
|
466
|
Title: selfChecks[i].CheckItem,
|
470
|
Result: selfChecks[i].Answer,
|
467
|
Result: selfChecks[i].Answer,
|
471
|
}
|
468
|
}
|
|
|
469
|
+ if selfChecks[i].Answer == "否" && len(selfChecks[i].Reason) > 0 {
|
|
|
470
|
+ d.Result = fmt.Sprintf("%s,理由:%s", selfChecks[i].Answer, selfChecks[i].Reason)
|
|
|
471
|
+ }
|
472
|
checkData = append(checkData, d)
|
472
|
checkData = append(checkData, d)
|
473
|
}
|
473
|
}
|
474
|
return checkData
|
474
|
return checkData
|