Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

This commit is contained in:
gaojiabao
2023-06-02 17:09:28 +08:00
2 changed files with 10 additions and 6 deletions
@@ -563,11 +563,15 @@ public class ActSarItemsBussEOService {
});
}
});
if (evaluations.get(0).getProcessNode().equals("重新技术委员会评审、评审意见修改")){
qualityEvaluationService.saveBatch(evaluations);
qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId());
}else {
qualityEvaluationService.saveBatch(evaluations);
for (QualityEvaluation qualityEvaluation :evaluations){
if (qualityEvaluation.getProcessNode().equals("重新技术委员会评审、评审意见修改")){
//qualityEvaluationService.saveBatch(evaluations);
qualityEvaluationService.save(qualityEvaluation);
qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId());
}else {
//qualityEvaluationService.saveBatch(evaluations);
qualityEvaluationService.save(qualityEvaluation);
}
}
}
}
@@ -290,7 +290,7 @@ public class StateSync {
/**
* 企业标准更新文本状态定时器
*/
@Scheduled(cron = "0 0 5 * * ?") //每天早晨点执行
@Scheduled(cron = "0 0 4 * * ?") //每天早晨点执行
public void timeSarBussionessStand(){
if (isNotScheduled){
logger.info("开始执行企业标准更新文本状态定时器");