dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8961 from ulleo/dev

Browse Source 
fix(X-Pack): 修复数据填报任务无法启停的问题
This commit is contained in:
ulleo 2024-04-05 22:41:08 +08:00 committed by GitHub
commit 5223c98577
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java
View File

@ -98,22 +98,30 @@ public class DataFillTaskService {
request.setCreateTime(new Date()); request.setCreateTime(new Date());
} }
DataFillTaskExample example = new DataFillTaskExample(); if (StringUtils.isNotBlank(request.getName())) {
DataFillTaskExample.Criteria criteria = example.createCriteria() DataFillTaskExample example = new DataFillTaskExample();
.andFormIdEqualTo(formId) DataFillTaskExample.Criteria criteria = example.createCriteria()
.andNameEqualTo(request.getName()); .andFormIdEqualTo(formId)
.andNameEqualTo(request.getName());
if (insert) { if (insert) {
if (dataFillTaskMapper.countByExample(example) > 0) { if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST")); DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
}
dataFillTaskMapper.insertSelective(request);
} else {
criteria.andIdNotEqualTo(request.getId());
if (dataFillTaskMapper.countByExample(example) > 0) {
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST"));
}
dataFillTaskMapper.updateByPrimaryKeySelective(request);
} }
dataFillTaskMapper.insertSelective(request);
} else { } else {
criteria.andIdNotEqualTo(request.getId()); if (insert) {
if (dataFillTaskMapper.countByExample(example) > 0) { dataFillTaskMapper.insertSelective(request);
DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXIST")); } else {
dataFillTaskMapper.updateByPrimaryKeySelective(request);
} }
dataFillTaskMapper.updateByPrimaryKeySelective(request);
} }
DataFillTaskWithBLOBs task = dataFillTaskMapper.selectByPrimaryKey(request.getId()); DataFillTaskWithBLOBs task = dataFillTaskMapper.selectByPrimaryKey(request.getId());