From 32ba9cb4112823adea8440fa79c2ca490bd4c1ba Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 01 九月 2025 14:47:00 +0800 Subject: [PATCH] 添加ORGID --- smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java index 2958338..947dac7 100644 --- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java @@ -33,8 +33,6 @@ @Autowired private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper; @Autowired - private TemplateDeptMapper templateDeptMapper; - @Autowired private SvyLibTemplateTagMapper svyLibTemplateTagMapper; @Autowired private Icd10AssociationMapper icd10AssociationMapper; @@ -56,15 +54,19 @@ svyLibTemplateReq.setSvyid(svyLibTemplate.getSvyid()); svyLibTemplateReq.setCategoryid(svyLibTemplate.getCategoryid()); svyLibTemplateReq.setDescription(svyLibTemplate.getDescription()); + svyLibTemplateReq.setSvyname(svyLibTemplate.getSvyname()); + svyLibTemplateReq.setOrgid(svyLibTemplate.getOrgid()); List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq); for (SvyLibTemplate svyLibTemplate1 : svyLibTemplates) { SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript(); svyLibTemplateScript.setSvyid(svyLibTemplate1.getSvyid()); + svyLibTemplateScript.setOrgid(svyLibTemplate1.getOrgid()); List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript); for (SvyLibTemplateScript svyLibTemplateScript1 : svyLibTemplateScripts) { if (svyLibTemplateScript1.getScriptType().equals("1") || svyLibTemplateScript1.getScriptType().equals("2")) { SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption(); svyLibTemplateTargetoption.setScriptid(svyLibTemplateScript1.getId()); + svyLibTemplateTargetoption.setOrgid(svyLibTemplateScript1.getOrgid()); List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption); svyLibTemplateScript1.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions); } @@ -89,6 +91,7 @@ for (int i = 0; i < svyLibTemplateVOS.size(); i++) { SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript(); svyLibTemplateScript.setSvyid(svyLibTemplateVOS.get(i).getSvyid()); + svyLibTemplateScript.setOrgid(svyLibTemplateVOS.get(i).getOrgid()); List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript); //鑾峰彇棰樼洰閫夐」 a: @@ -100,6 +103,7 @@ } else { SvyLibTemplateTargetoption svyLibTopicoption = new SvyLibTemplateTargetoption(); svyLibTopicoption.setScriptid(svyLibTemplateScripts.get(j).getId()); + svyLibTopicoption.setOrgid(svyLibTemplateVOS.get(i).getOrgid()); List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTopicoption); //灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑 svyLibTemplateScripts.get(j).setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions); @@ -107,12 +111,6 @@ } //灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑 svyLibTemplateVOS.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts); - - //鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹� - TemplateDept templateDept = new TemplateDept(); - templateDept.setTempid(svyLibTemplateVOS.get(i).getSvyid()); - List<TemplateDept> tempDetpRelevances = templateDeptMapper.selectTemplateDeptList(templateDept); - svyLibTemplateVOS.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>()); //鑾峰彇鏍囩 SvyLibTemplateTag svyLibTemplateTag = new SvyLibTemplateTag(); @@ -210,22 +208,6 @@ } } } - } - - if (CollectionUtils.isNotEmpty(svyLibTemplate.getTempDetpRelevances())) { - for (TemplateDept tempDetpRelevance : svyLibTemplate.getTempDetpRelevances()) { - tempDetpRelevance.setGuid(svyLibTemplateVO.getGuid()); - tempDetpRelevance.setOrgid(svyLibTemplateVO.getOrgid()); - if (tempDetpRelevance.getId() == null) { - //鏂板 - tempDetpRelevance.setTempid(svyLibTemplate.getSvyid()); - tempDetpRelevance.setType(1L); - templateDeptMapper.insertTemplateDept(tempDetpRelevance); - } else { - templateDeptMapper.updateTemplateDept(tempDetpRelevance); - } - } - } //鏍囩澶勭悊 -- Gitblit v1.9.3