模版修改
This commit is contained in:
@@ -42,18 +42,18 @@ public class TmplInscBsnRelRespVO {
|
|||||||
private List<String> deptIds;
|
private List<String> deptIds;
|
||||||
|
|
||||||
|
|
||||||
@Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
// @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
||||||
private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
|
// private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
|
||||||
|
|
||||||
@Schema(description = "实例条款;这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
// @Schema(description = "实例条款;这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
||||||
private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
|
// private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
|
||||||
|
|
||||||
@Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
@Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
||||||
private List<DeptRespDTO> DeptRespVOS;
|
private List<DeptRespDTO> DeptRespVOS;
|
||||||
|
|
||||||
@Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称")
|
// @Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称")
|
||||||
@ExcelProperty("模版实例名称")
|
// @ExcelProperty("模版实例名称")
|
||||||
private String inscName;
|
// private String inscName;
|
||||||
|
|
||||||
@Schema(description = "业务实例字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
@Schema(description = "业务实例字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
|
||||||
@ExcelProperty("业务实例字段")
|
@ExcelProperty("业务实例字段")
|
||||||
|
|||||||
@@ -131,8 +131,8 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
@Override
|
@Override
|
||||||
public void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
public void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
||||||
tmplInscBsnRelRespVO.setDeptIds(setDeptData(tmplInscBsnRelRespVO));//获取部门使用范围
|
tmplInscBsnRelRespVO.setDeptIds(setDeptData(tmplInscBsnRelRespVO));//获取部门使用范围
|
||||||
tmplInscBsnRelRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(tmplInscBsnRelRespVO));//获取条款;
|
// tmplInscBsnRelRespVO.setInstanceItemRespVOS(setInstanceItemRespVOS(tmplInscBsnRelRespVO));//获取条款;
|
||||||
tmplInscBsnRelRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(tmplInscBsnRelRespVO)); // 实例字段
|
// tmplInscBsnRelRespVO.setTemplateInstanceDataRespVOS(setTemplateInstanceDataRespVOS(tmplInscBsnRelRespVO)); // 实例字段
|
||||||
//业务条款
|
//业务条款
|
||||||
tmplInscBsnRelRespVO.setTmplInscItmBsnRespVOS(setTmplInscItmBsnRespVOS(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()); // 部门详情
|
tmplInscBsnRelRespVO.setDeptRespVOS(deptApi.getDeptList(tmplInscBsnRelRespVO.getDeptIds().stream().map(Long::valueOf).toList()).getData()); // 部门详情
|
||||||
}
|
}
|
||||||
TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId());
|
TemplateInstanceRespVO templateInstance = SpringUtil.getBean(TemplateInstanceService.class).getTemplateInstance(tmplInscBsnRelRespVO.getInscId());
|
||||||
if (templateInstance != null) {
|
// if (templateInstance != null) {
|
||||||
tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名");
|
// tmplInscBsnRelRespVO.setInscName(!templateInstance.getName().isEmpty() ? templateInstance.getName() : "分类未命名");
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -166,13 +166,13 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
List<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
|
List<TmplInscItmBsnRespVO> tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscItmBsnDO>()
|
||||||
.eq(TmplInscItmBsnDO::getBsnId, tmplInscBsnRelRespVO.getBsnId())
|
.eq(TmplInscItmBsnDO::getBsnId, tmplInscBsnRelRespVO.getBsnId())
|
||||||
), TmplInscItmBsnRespVO.class);
|
), TmplInscItmBsnRespVO.class);
|
||||||
tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> {
|
// tmplInscItmBsnRespVOS.forEach(tmplInscItmBsnRespVO -> {
|
||||||
tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> {
|
// tmplInscBsnRelRespVO.getInstanceItemRespVOS().forEach(instanceItemRespVO -> {
|
||||||
if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())) {
|
// if (tmplInscItmBsnRespVO.getInscItmId().equals(instanceItemRespVO.getId())) {
|
||||||
tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName());
|
// tmplInscItmBsnRespVO.setItmName(instanceItemRespVO.getItmName());
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
});
|
// });
|
||||||
return tmplInscItmBsnRespVOS;
|
return tmplInscItmBsnRespVOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,12 +180,12 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService {
|
|||||||
private List<TmplInscDatBsnRespVO> setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
private List<TmplInscDatBsnRespVO> setTmplInscDatBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) {
|
||||||
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>()), TmplInscDatBsnRespVO.class);
|
List<TmplInscDatBsnRespVO> tmplInscDatBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscDatBsnMapper.class).selectList(new LambdaQueryWrapper<TmplInscDatBsnDO>()), TmplInscDatBsnRespVO.class);
|
||||||
|
|
||||||
tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> {
|
// tmplInscDatBsnRespVOS.forEach(tmplInscDatBsnRespVO -> tmplInscBsnRelRespVO.getTemplateInstanceDataRespVOS().forEach(templateInstanceDataRespVO -> {
|
||||||
if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) {
|
// if (templateInstanceDataRespVO.getId().toString().equals(tmplInscDatBsnRespVO.getInscFldId())) {
|
||||||
// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy());
|
//// tmplInscDatBsnRespVO.setFldVal(templateInstanceDataRespVO.getFldKy());
|
||||||
tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy());
|
// tmplInscDatBsnRespVO.setFldKy(templateInstanceDataRespVO.getFldKy());
|
||||||
}
|
// }
|
||||||
}));
|
// }));
|
||||||
return tmplInscDatBsnRespVOS;
|
return tmplInscDatBsnRespVOS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user