zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

模版修改

Browse Source
This commit is contained in:
潘荣晟
2025-11-11 14:38:34 +08:00
parent c30992fa75
commit 81bde59906
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java
View File

@@ -42,18 +42,18 @@ public class TmplInscBsnRelRespVO {
private List<String> deptIds;
@Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
// @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
// private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
@Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
// @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
// private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
@Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
private List<DeptRespDTO> 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("业务实例字段")

36
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java
View File

@@ -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<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
.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<TmplInscDatBsnRespVO> setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>()), 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;
}