From 81bde59906247e55b2102f4fa25ea0df346a9d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Tue, 11 Nov 2025 14:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templtp/vo/TmplInscBsnRelRespVO.java | 14 ++++---- .../tmpltp/TmplInscBsnRelServiceImpl.java | 36 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java index 9ea29fc..abcc4a5 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java @@ -42,18 +42,18 @@ public class TmplInscBsnRelRespVO { private List deptIds; - @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "") - private List templateInstanceDataRespVOS; +// @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "") +// private List templateInstanceDataRespVOS; - @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "") - private List instanceItemRespVOS; +// @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "") +// private List instanceItemRespVOS; @Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "") private List DeptRespVOS; - @Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称") - @ExcelProperty("模版实例名称") - private String inscName; +// @Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称") +// @ExcelProperty("模版实例名称") +// private String inscName; @Schema(description = "业务实例字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "") @ExcelProperty("业务实例字段") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java index ac0da63..006e339 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java @@ -131,8 +131,8 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { @Override public void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) { tmplInscBsnRelRespVO.setDeptIds(setDeptData(tmplInscBsnRelRespVO));//获取部门使用范围 - tmplInscBsnRelRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(tmplInscBsnRelRespVO));//获取条款; - tmplInscBsnRelRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(tmplInscBsnRelRespVO)); // 实例字段 +// tmplInscBsnRelRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(tmplInscBsnRelRespVO));//获取条款; +// tmplInscBsnRelRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(tmplInscBsnRelRespVO)); // 实例字段 //业务条款 tmplInscBsnRelRespVO.setTmplInscItmBsnRespVOS(setTmplInscItmBsnRespVOS(tmplInscBsnRelRespVO)); //业务字段 @@ -141,9 +141,9 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { tmplInscBsnRelRespVO.setDeptRespVOS(deptApi.getDeptList(tmplInscBsnRelRespVO.getDeptIds().stream().map(Long::valueOf).toList()).getData()); // 部门详情 } TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId()); - if (templateInstance != null) { - tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名"); - } +// if (templateInstance != null) { +// tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名"); +// } } @Override @@ -166,13 +166,13 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { List tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper() .eq(TmplInscItmBsnDO::getBsnId, tmplInscBsnRelRespVO.getBsnId()) ), TmplInscItmBsnRespVO.class); - tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> { - tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> { - if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())) { - tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName()); - } - }); - }); +// tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> { +// tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> { +// if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())) { +// tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName()); +// } +// }); +// }); return tmplInscItmBsnRespVOS; } @@ -180,12 +180,12 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { private List setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) { List tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper()), TmplInscDatBsnRespVO.class); - tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> { - if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) { -// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy()); - tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy()); - } - })); +// tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> { +// if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) { +//// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy()); +// tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy()); +// } +// })); return tmplInscDatBsnRespVOS; }