|
@@ -2,6 +2,8 @@ package com.github.jfcloud.gene.sample.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.date.DatePattern;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -439,6 +441,8 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
projectType += "/" + projectName;
|
|
|
}
|
|
|
|
|
|
+ String now = DateUtil.format(new Date(), DatePattern.CHINESE_DATE_TIME_PATTERN);
|
|
|
+
|
|
|
Long userId;
|
|
|
String dingMsg;
|
|
|
GeneStatusEnum statusEnum = Objects.requireNonNull(GeneStatusEnum.getByStatus(sampleInfo.getStatus()));
|
|
@@ -446,20 +450,20 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
case REJECTED:
|
|
|
//驳回通知申请人
|
|
|
userId = Long.valueOf(sampleInfo.getCreateBy());
|
|
|
- dingMsg = String.format("【%s】【%s/%s】不同意,请修正后再提交", projectType, previousStatus, previousUser);
|
|
|
+ dingMsg = String.format("【%s】【%s/%s】%s不同意,请修正后再提交", projectType, previousStatus, previousUser, now);
|
|
|
break;
|
|
|
case DEPART_LEADER:
|
|
|
userId = sampleInfo.getDepartLeaderId();
|
|
|
- dingMsg = String.format("【%s】【%s】已提交,请进行审查", projectType, userIdNameCache.getNicknameByUserId(sampleInfo.getCreateBy()));
|
|
|
+ dingMsg = String.format("【%s】【%s】%s提交,请进行审查", projectType, userIdNameCache.getNicknameByUserId(sampleInfo.getCreateBy()), now);
|
|
|
break;
|
|
|
case PROJECT_MANAGEMENT:
|
|
|
userId = sampleInfo.getProjectManageId();
|
|
|
- dingMsg = String.format("【%s】【%s/%s】已同意,请进行审查", projectType, previousStatus, previousUser);
|
|
|
+ dingMsg = String.format("【%s】【%s/%s】%s同意,请进行审查", projectType, previousStatus, previousUser, now);
|
|
|
break;
|
|
|
case COMPLETED:
|
|
|
//执行
|
|
|
userId = Long.valueOf(sampleInfo.getCreateBy());
|
|
|
- dingMsg = String.format("【%s】【%s/%s】已同意,请执行项目", projectType, previousStatus, previousUser);
|
|
|
+ dingMsg = String.format("【%s】【%s/%s】%s同意,请执行项目", projectType, previousStatus, previousUser, now);
|
|
|
break;
|
|
|
default:
|
|
|
log.error("流程项目 ({}) 状态异常 {}", projectName, statusEnum.getDescription());
|