|
|
@@ -80,7 +80,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
flag=true;
|
|
|
}
|
|
|
projectStaffRecordMapper.insertSelective(in);
|
|
|
- addRecordLog(in);
|
|
|
+ addRecordLog(in,flag);
|
|
|
if (flag){
|
|
|
addWechatAppSend(in, String.format("[%s]发起打卡,请及时审核!", username));
|
|
|
}
|
|
|
@@ -253,7 +253,12 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void addRecordLog(ProjectStaffRecord in) {
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ * @param in
|
|
|
+ * @param flag ture=正常流程审核,false=无需审核流程
|
|
|
+ */
|
|
|
+ private void addRecordLog(ProjectStaffRecord in,boolean flag) {
|
|
|
ProjectStaffRecordLog log = new ProjectStaffRecordLog();
|
|
|
log.setPsrId(in.getId());
|
|
|
log.setProcessStatus(in.getProcessStatus());
|
|
|
@@ -264,7 +269,11 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
}else {
|
|
|
log.setAid(SecurityUtils.getUserId());
|
|
|
log.setName(SecurityUtils.getLoginUser().getUser().getNickName());
|
|
|
- log.setContent(getContent(in.getProcessStatus())+in.getContent());
|
|
|
+ if (flag){
|
|
|
+ log.setContent(getContent(in.getProcessStatus())+in.getContent());
|
|
|
+ }else {
|
|
|
+ log.setContent("技术总监打卡无需审核");
|
|
|
+ }
|
|
|
}
|
|
|
projectStaffRecordLogMapper.insertSelective(log);
|
|
|
}
|
|
|
@@ -290,7 +299,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
if (in.getProcessStatus()==1){
|
|
|
addWechatAppSend(in, String.format("[%s]发起打卡,及时是审核!", username));
|
|
|
}
|
|
|
- addRecordLog(in);
|
|
|
+ addRecordLog(in,true);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
@@ -319,7 +328,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
}else if (in.getProcessStatus()==3){
|
|
|
addWechatAppSend(in, String.format("[%s]%s您的研发打卡.", username,"驳回"));
|
|
|
}
|
|
|
- addRecordLog(in);
|
|
|
+ addRecordLog(in,true);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|