sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!39 Merge branch 'master' into feature/20260610

Browse Source 
* Merge branch 'master' into feature/20260610
* fix(dqinspecttask): updateMain 子表数据仅在显式传入时才变更
* chore(system): 删除 xiSpeakFlow Bean 调试打印语句
* test(inspectimprove): 新增 inspectimprove 流程模块单元测试
This commit is contained in:
new_new_new
2026-06-10 08:30:47 +00:00
parent cb77619d7c
commit 59bd76a250
9 changed files with 741 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java
+9 -10
View File
@@ -55,16 +55,15 @@ public class DqInspectTaskServiceImpl extends ServiceImpl<DqInspectTaskMapper, D
public void updateMain(DqInspectTask dqInspectTask,List<DqInspectProgress> dqInspectProgressList) {
validateProblemId(dqInspectTask);
dqInspectTaskMapper.updateById(dqInspectTask);
//1.先删除子表数据
dqInspectProgressMapper.deleteByMainId(dqInspectTask.getId());
//2.子表数据重新插入
if(dqInspectProgressList!=null && dqInspectProgressList.size()>0) {
for(DqInspectProgress entity:dqInspectProgressList) {
//外键设置
entity.setMainId(dqInspectTask.getId());
dqInspectProgressMapper.insert(entity);
// 仅当显式传入子表列表时才变更子表数据（null 表示不修改子表）
if (dqInspectProgressList != null) {
dqInspectProgressMapper.deleteByMainId(dqInspectTask.getId());
if (dqInspectProgressList.size() > 0) {
for (DqInspectProgress entity : dqInspectProgressList) {
entity.setMainId(dqInspectTask.getId());
dqInspectProgressMapper.insert(entity);
}
}
}
}