From d5e550a8f4a9546bbf4f98e8c91ca5f95a59ff82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Wed, 27 Aug 2025 20:11:20 +0800 Subject: [PATCH] =?UTF-8?q?UPDATE:=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=90=E8=AE=A1=E5=88=92=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/pojo/vo/AdSubPlanMetaDataVO.java | 4 ++-- .../plan/service/impl/AdPlanServiceImpl.java | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdSubPlanMetaDataVO.java b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdSubPlanMetaDataVO.java index fd90bda5..6bdde4d1 100644 --- a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdSubPlanMetaDataVO.java +++ b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdSubPlanMetaDataVO.java @@ -6,8 +6,8 @@ import com.njcn.gather.err.pojo.po.PqErrSys; import com.njcn.gather.err.pojo.po.PqErrSysDtls; import com.njcn.gather.icd.pojo.po.PqIcdPath; import com.njcn.gather.plan.pojo.po.AdPlan; +import com.njcn.gather.plan.pojo.po.AdPlanTestConfig; import com.njcn.gather.report.pojo.po.PqReport; -import com.njcn.gather.system.cfg.pojo.po.SysTestConfig; import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import com.njcn.gather.system.dictionary.pojo.po.DictType; @@ -23,7 +23,7 @@ public class AdSubPlanMetaDataVO { private Dict dict; private AdPlan plan; - private SysTestConfig testConfig; + private AdPlanTestConfig testConfig; private List devList; private List standardDevList; private List devTypeList; diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index ca098d70..2053f6de 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -1556,10 +1556,6 @@ public class AdPlanServiceImpl extends ServiceImpl impleme dict.setTreeList(dictTreeList); subPlanMetaData.setDict(dict); - // 获取检测相关配置 - SysTestConfig testConfig = sysTestConfigService.getOneConfig(); - subPlanMetaData.setTestConfig(testConfig); - // 获取误差体系数据 List errSysList = pqErrSysService.list(); subPlanMetaData.setErrSysList(errSysList); @@ -1569,7 +1565,9 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // 获取检测计划基本数据 AdPlan subPlan = this.getById(planId); subPlanMetaData.setPlan(subPlan); - + // 获取检测配置 + AdPlanTestConfig testConfig = adPlanTestConfigService.lambdaQuery().eq(AdPlanTestConfig::getPlanId, subPlan.getFatherPlanId()).one(); + subPlanMetaData.setTestConfig(testConfig); // 获取检设备类型数据 List devTypeList = devTypeService.list(); subPlanMetaData.setDevTypeList(devTypeList); @@ -1762,9 +1760,15 @@ public class AdPlanServiceImpl extends ServiceImpl impleme } } // 更新检测配置 - SysTestConfig testConfig = subPlanMetaDataVO.getTestConfig(); + AdPlanTestConfig testConfig = subPlanMetaDataVO.getTestConfig(); if (testConfig != null) { - sysTestConfigService.saveOrUpdate(testConfig); + Integer count = adPlanTestConfigService.lambdaQuery().eq(AdPlanTestConfig::getPlanId, testConfig.getPlanId()).count(); + if (count.intValue() == 0) { + adPlanTestConfigService.save(testConfig); + } else { + adPlanTestConfigService.update(testConfig, new LambdaUpdateWrapper().eq(AdPlanTestConfig::getPlanId, testConfig.getPlanId())); + } + } // 批量更新误差体系