|
|
@@ -82,7 +82,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
projectStaffRecordMapper.insertSelective(in);
|
|
|
addRecordLog(in);
|
|
|
if (flag){
|
|
|
- addWechatAppSend(in, String.format("[%s]发起研发打卡,请及时审核!", username));
|
|
|
+ addWechatAppSend(in, String.format("[%s]发起打卡,请及时审核!", username));
|
|
|
}
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
@@ -273,8 +273,6 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
switch (processStatus) {
|
|
|
case 0: return "修改了内容!";
|
|
|
case 1: return "发起了审核!";
|
|
|
- case 2: return "完成了审核!";
|
|
|
- case 3: return "驳回了审核!";
|
|
|
}
|
|
|
return "";
|
|
|
}
|
|
|
@@ -290,7 +288,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
if(in.getProcessStatus()>1)in.setProcessStatus(1);
|
|
|
projectStaffRecordMapper.updateByPrimaryKeySelective(in);
|
|
|
if (in.getProcessStatus()==1){
|
|
|
- addWechatAppSend(in, String.format("[%s]发起研发打卡,及时是审核!", username));
|
|
|
+ addWechatAppSend(in, String.format("[%s]发起打卡,及时是审核!", username));
|
|
|
}
|
|
|
addRecordLog(in);
|
|
|
return AjaxResult.success();
|
|
|
@@ -313,12 +311,13 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
newP.setExamineName(username);
|
|
|
newP.setExamineId(SecurityUtils.getUserId());
|
|
|
newP.setExamineTime(new Date());
|
|
|
+ newP.setExamineContent(in.getContent());
|
|
|
}
|
|
|
projectStaffRecordMapper.updateByPrimaryKeySelective(newP);
|
|
|
if (in.getProcessStatus()==2){
|
|
|
- addWechatAppSend(in, String.format("[%s]已审核[%s]您的研发打卡.", username,"同意"));
|
|
|
+ addWechatAppSend(in, String.format("[%s]%s您的研发打卡.", username,"同意"));
|
|
|
}else if (in.getProcessStatus()==3){
|
|
|
- addWechatAppSend(in, String.format("[%s]已审核[%s]您的研发打卡.", username,"驳回"));
|
|
|
+ addWechatAppSend(in, String.format("[%s]%s您的研发打卡.", username,"驳回"));
|
|
|
}
|
|
|
addRecordLog(in);
|
|
|
return AjaxResult.success();
|