Commit bbf1b434 authored by 赵啸非's avatar 赵啸非

考勤异常添加绩效考核

parent df8fc018
...@@ -139,11 +139,10 @@ ...@@ -139,11 +139,10 @@
this.$message.error('请选择处理结果') this.$message.error('请选择处理结果')
return return
} }
if(this.duration && (this.dealParams.processResult == '早退' || this.dealParams.processResult == '迟到')){ this.dealParams.errorStatus=this.dealParams.processResult
this.dealParams.processResult = this.dealParams.processResult + this.duration +'分钟' if(this.duration && (this.dealParams.processResult == '1' || this.dealParams.processResult == '2')){
this.dealParams.processResult =this.dict.errorStatus[this.dealParams.processResult] + this.duration +'分钟'
this.dealParams.durtion=this.duration this.dealParams.durtion=this.duration
} }
// 保存结果处理 // 保存结果处理
this.$post(this.urls.saveUrl,this.dealParams).then(res => { this.$post(this.urls.saveUrl,this.dealParams).then(res => {
......
...@@ -143,8 +143,9 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont ...@@ -143,8 +143,9 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
for (AttendanceRecordErrorEntity recordErrorEntity : entity.getRecordErrorEntities()) { for (AttendanceRecordErrorEntity recordErrorEntity : entity.getRecordErrorEntities()) {
AttendanceRecordErrorEntity updateEntity = new AttendanceRecordErrorEntity(); AttendanceRecordErrorEntity updateEntity = new AttendanceRecordErrorEntity();
updateEntity.setId(recordErrorEntity.getId()); updateEntity.setId(recordErrorEntity.getId());
updateEntity.setErrorDateTime(recordErrorEntity.getErrorDateTime());
updateEntity.setGoOffDateTime(recordErrorEntity.getGoOffDateTime());
updateEntity.setProcessStatus(entity.getProcessStatus()); updateEntity.setProcessStatus(entity.getProcessStatus());
updateEntity.setGoOffDateTime(null);
updateEntity.setProcessResult(entity.getProcessResult()); updateEntity.setProcessResult(entity.getProcessResult());
updateEntity.setErrorStatus(entity.getErrorStatus()); updateEntity.setErrorStatus(entity.getErrorStatus());
updateEntity.setOpertor(context.getUser().getRealName()); updateEntity.setOpertor(context.getUser().getRealName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment