|
@@ -248,31 +248,35 @@ public class SrmIssuesListServiceImpl extends ServiceImpl<SrmIssuesListDao, SrmI
|
|
|
for(SrmIssuesListVo vo:list){
|
|
|
taskname = vo.getTaskname();
|
|
|
try {
|
|
|
- //2.条件判断节点跟超时时间截取数据
|
|
|
- if (taskname.equals("问题登记人") && System.currentTimeMillis()- vo.getCreatedate().getTime() > twentyFourHoursInMillis){
|
|
|
- vo.setNodetime(vo.getCreatedate());
|
|
|
- vo.setOperationid(vo.getCreateuserid());
|
|
|
- vo.setHour(24);
|
|
|
- f= true;
|
|
|
- } else if ((taskname.equals("部门长") || taskname.equals("生产副总") || taskname.equals("责任部门长") || taskname.equals("车间主任/部门经理审核")
|
|
|
- || taskname.equals("车间主任/经理审核") || taskname.equals("发起人确认") || taskname.equals("领导审核") || taskname.equals("SPA跟踪"))
|
|
|
- && System.currentTimeMillis()- vo.getNodetime().getTime() > fourHoursInMillis) {
|
|
|
- f= true;vo.setHour(4);
|
|
|
- }else if ( (taskname.equals("SPA") || taskname.equals("任务SPA") || taskname.equals("SPA维护标准化文件"))
|
|
|
- && System.currentTimeMillis()- vo.getNodetime().getTime() > fortyEightHoursInMillis) {
|
|
|
- f= true;vo.setHour(48);
|
|
|
- }
|
|
|
- if (f){
|
|
|
- // 生成个人工作台提醒
|
|
|
- addNotifyAnnounce(vo,userEmailList,keyMap, issTaskkey);
|
|
|
+ if (vo.getId().equals("1f8feeeae3e041f5a79727730af9f30a")){
|
|
|
+ //2.条件判断节点跟超时时间截取数据
|
|
|
+ if (taskname.equals("问题登记人") && System.currentTimeMillis()- vo.getCreatedate().getTime() > twentyFourHoursInMillis){
|
|
|
+ vo.setNodetime(vo.getCreatedate());
|
|
|
+ vo.setOperationid(vo.getCreateuserid());
|
|
|
+ vo.setHour(24);
|
|
|
+ f= true;
|
|
|
+ } else if ((taskname.equals("部门长") || taskname.equals("生产副总") || taskname.equals("责任部门长") || taskname.equals("责任部长审核") || taskname.equals("车间主任/部门经理审核")
|
|
|
+ || taskname.equals("车间主任/经理审核") || taskname.equals("发起人确认") || taskname.equals("领导审核") || taskname.equals("SPA跟踪"))
|
|
|
+ && System.currentTimeMillis()- vo.getNodetime().getTime() > fourHoursInMillis) {
|
|
|
+ f= true;vo.setHour(4);
|
|
|
+ }else if ( (taskname.equals("SPA") || taskname.equals("任务SPA") || taskname.equals("SPA维护标准化文件"))
|
|
|
+ && System.currentTimeMillis()- vo.getNodetime().getTime() > fortyEightHoursInMillis) {
|
|
|
+ f= true;vo.setHour(48);
|
|
|
+ }
|
|
|
+ if (f){
|
|
|
+ // 生成个人工作台提醒
|
|
|
+ addNotifyAnnounce(vo,userEmailList,keyMap, issTaskkey);
|
|
|
+ }
|
|
|
+ f=false;
|
|
|
}
|
|
|
- f=false;
|
|
|
+
|
|
|
}catch (Exception e){
|
|
|
log.error(" 节点 {} 问题编号 {} 出现问题 {} ",taskname,vo.getQuestionno(),e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//3.发送邮件
|
|
|
+ log.info("开始发送邮件,人员数量{}",userEmailList.size());
|
|
|
sendIssuesListEmail(userEmailList);
|
|
|
log.info("生产问题审批超时提醒结束:");
|
|
|
return R.ok();
|