Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test
正在显示
1 个修改的文件
包含
10 行增加
和
0 行删除
| @@ -1281,6 +1281,16 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand) | @@ -1281,6 +1281,16 @@ func (srv StaffAssessServeice) SaveSelfAssess(in *command.SaveSelfAssessCommand) | ||
| 1281 | } | 1281 | } |
| 1282 | } | 1282 | } |
| 1283 | } | 1283 | } |
| 1284 | + | ||
| 1285 | + if anomalyState == domain.AnomalyState0 { | ||
| 1286 | + trimSpace := strings.TrimLeft(it.AssistContent, "\n") // 去掉前换行符 | ||
| 1287 | + trimSpace = strings.TrimRight(trimSpace, "\n") // 去掉后换行符 | ||
| 1288 | + trimSpace = strings.TrimSpace(trimSpace) // 去掉前后空格符 | ||
| 1289 | + // 上级填写内容有值,选项是已辅导,变为正常 | ||
| 1290 | + if !(len(trimSpace) == 0 || trimSpace == "无") && it.AssistLevel >= domain.AssistLevel2 { | ||
| 1291 | + anomalyState = domain.AnomalyState1 | ||
| 1292 | + } | ||
| 1293 | + } | ||
| 1284 | it.AnomalyState = anomalyState | 1294 | it.AnomalyState = anomalyState |
| 1285 | 1295 | ||
| 1286 | // 更新里程碑状态 | 1296 | // 更新里程碑状态 |
-
请 注册 或 登录 后发表评论