FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaojiabao
2023-06-02 17:09:28 +08:00
parent 4d2604aea5 859293ab7f
commit 9daee78db4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+9 -5
View File
@@ -563,11 +563,15 @@ public class ActSarItemsBussEOService {
}); });
} }
}); });
if (evaluations.get(0).getProcessNode().equals("重新技术委员会评审、评审意见修改")){ for (QualityEvaluation qualityEvaluation :evaluations){
qualityEvaluationService.saveBatch(evaluations); if (qualityEvaluation.getProcessNode().equals("重新技术委员会评审、评审意见修改")){
qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId()); //qualityEvaluationService.saveBatch(evaluations);
}else { qualityEvaluationService.save(qualityEvaluation);
qualityEvaluationService.saveBatch(evaluations); qualityEvaluationDao.updateByProcessNode(evaluations.get(0).getLawId());
}else {
//qualityEvaluationService.saveBatch(evaluations);
qualityEvaluationService.save(qualityEvaluation);
}
} }
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/sync/StateSync.java
+1 -1
View File
@@ -290,7 +290,7 @@ public class StateSync {
/** /**
* 企业标准更新文本状态定时器 * 企业标准更新文本状态定时器
*/ */
@Scheduled(cron = "0 0 5 * * ?") //每天早晨五点执行 @Scheduled(cron = "0 0 4 * * ?") //每天早晨四点执行
public void timeSarBussionessStand(){ public void timeSarBussionessStand(){
if (isNotScheduled){ if (isNotScheduled){
logger.info("开始执行企业标准更新文本状态定时器"); logger.info("开始执行企业标准更新文本状态定时器");