diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java index 6c6e9d9..3be1c2f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java @@ -86,4 +86,6 @@ public class ReportDocumentMainPageReqVO extends PageParam { @Schema(description = "报表类型ID") private Long configReportTypeId; + @Schema(description = "表单设计器模板id") + private Long dataTemplateId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java index 2bb3930..26cfd55 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java @@ -110,4 +110,7 @@ public class ReportDocumentMainRespVO { @ExcelProperty("报表类型ID") private Long configReportTypeId; + @Schema(description = "表单设计器模板id") + @ExcelProperty("表单设计器模板id") + private Long dataTemplateId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java index cec7ea5..63a79ce 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java @@ -86,5 +86,7 @@ public class ReportDocumentMainSaveReqVO { @Schema(description = "报告明细数据ids") private String reportDocumentDataIds; + @Schema(description = "表单设计器模板id") + private Long dataTemplateId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypePageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypePageReqVO.java index 588a618..ab0483c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypePageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypePageReqVO.java @@ -63,4 +63,10 @@ public class ReportDocumentTypePageReqVO extends PageParam { @Schema(description = "主id") private Long mainId; + + @Schema(description = "前端组件") + private String pageComponent; + + @Schema(description = "前端组件（移动端）") + private String pageComponentMobile; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeRespVO.java index d4f8632..0c3ed5d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeRespVO.java @@ -81,4 +81,12 @@ public class ReportDocumentTypeRespVO { @Schema(description = "主id") @ExcelProperty("主id") private Long mainId; + + @Schema(description = "前端组件") + @ExcelProperty("前端组件") + private String pageComponent; + + @Schema(description = "前端组件（移动端）") + @ExcelProperty("前端组件（移动端）") + private String pageComponentMobile; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeSaveReqVO.java index 15b1bd6..c918832 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeSaveReqVO.java @@ -66,4 +66,10 @@ public class ReportDocumentTypeSaveReqVO { @Schema(description = "主id") private Long mainId; + + @Schema(description = "前端组件") + private String pageComponent; + + @Schema(description = "前端组件（移动端）") + private String pageComponentMobile; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java index a04c459..356fda4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java @@ -138,4 +138,8 @@ public class ReportDocumentMainDO extends BusinessBaseDO { */ @TableField("CFG_RPT_TP_ID") private Long configReportTypeId; + + //表单设计器模板id + @TableField("DAT_TMPL_ID") + private Long dataTemplateId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentTypeDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentTypeDO.java index 7134040..1d09abb 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentTypeDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentTypeDO.java @@ -105,4 +105,12 @@ public class ReportDocumentTypeDO extends BusinessBaseDO { @TableField("MAIN_ID") private Long mainId; + //前端组件 + @TableField("PG_CPNT") + private String pageComponent; + + //前端组件-移动 + @TableField("PG_CPNT_MOB") + private String pageComponentMobile; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentTypeMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentTypeMapper.java index cc97fb6..91cd662 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentTypeMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentTypeMapper.java @@ -20,6 +20,7 @@ public interface ReportDocumentTypeMapper extends BaseMapperX createTempData(@Valid @RequestBody DataTemplateSaveReqVO vo) { - vo.setCancelFlag("-1"); - vo.setNodeType(DataTypeConstant.DATA_TYPE_DATA); - vo.setVersion(1); - return success(dataTemplateService.createDataTemplate(vo)); - } +// @PostMapping("/create-temp-data") +// @Operation(summary = "创建临时数据") +// public CommonResult createTempData(@Valid @RequestBody DataTemplateSaveReqVO vo) { +// vo.setCancelFlag("-1"); +// vo.setNodeType(DataTypeConstant.DATA_TYPE_DATA); +// vo.setVersion(1); +// return success(dataTemplateService.createDataTemplate(vo)); +// } @PostMapping("/saveData") @Operation(summary = "保存数据") @@ -109,6 +112,23 @@ public class DataTemplateController implements BusinessControllerMarker { return success(BeanUtils.toBean(dataTemplate, DataTemplateRespVO.class)); } + @GetMapping("/getByKey") + @Operation(summary = "获得表单设计器模板") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('qms:data-template:query')") + public CommonResult getByKey(@RequestParam("dataKey") String dataKey) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(DataTemplateDO::getDataKey, dataKey); + query.eq(DataTemplateDO::getCancelFlag, "0"); + query.eq(DataTemplateDO::getCurrentFlag, "1"); + query.eq(DataTemplateDO::getNodeType, DataTypeConstant.DATA_TYPE_DATA); + query.orderByDesc(DataTemplateDO::getUpdateTime); + List list = dataTemplateMapper.selectList(query); + if(list.size()>0) + return success(BeanUtils.toBean(list.get(0), DataTemplateRespVO.class)); + return CommonResult.error(DATA_TEMPLATE_NOT_EXISTS); + } + @GetMapping("/page") @Operation(summary = "获得表单设计器模板分页") @PreAuthorize("@ss.hasPermission('qms:data-template:query')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataTemplateSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataTemplateSaveReqVO.java index 323e2a9..ebca40a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataTemplateSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataTemplateSaveReqVO.java @@ -12,39 +12,30 @@ public class DataTemplateSaveReqVO { private Long id; @Schema(description = "上级id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14825") - @NotNull(message = "上级id不能为空") private Long parentId; @Schema(description = "主数据id，用于版本识别", requiredMode = Schema.RequiredMode.REQUIRED, example = "12080") - @NotNull(message = "主数据id，用于版本识别不能为空") private Long mainId; @Schema(description = "id路径", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "id路径不能为空") private String idPath; @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @NotEmpty(message = "名称不能为空") private String name; @Schema(description = "节点类型,字典：qms_tree_node_type，category-分类；data-表单", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "节点类型,字典：qms_tree_node_type，category-分类；data-表单不能为空") private String nodeType; @Schema(description = "数据键", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "数据键不能为空") private String dataKey; @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "版本不能为空") private Integer version; @Schema(description = "是否最新版本,默认显示最新版本", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否最新版本,默认显示最新版本不能为空") private String currentFlag; @Schema(description = "禁用状态,0-启用；1-禁用", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "禁用状态,0-启用；1-禁用不能为空") private String cancelFlag; @Schema(description = "排序号") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataTemplateMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataTemplateMapper.java index 6c29d31..d0720df 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataTemplateMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataTemplateMapper.java @@ -7,6 +7,8 @@ import com.zt.plat.module.qms.common.data.controller.vo.DataTemplatePageReqVO; import com.zt.plat.module.qms.common.data.dal.dataobject.DataTemplateDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Arrays; + /** * 表单设计器模板 Mapper * @@ -18,6 +20,7 @@ public interface DataTemplateMapper extends BaseMapperX { default PageResult selectPage(DataTemplatePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(DataTemplateDO::getParentId, reqVO.getParentId()) + .eqIfPresent(DataTemplateDO::getMainId, reqVO.getMainId()) .eqIfPresent(DataTemplateDO::getIdPath, reqVO.getIdPath()) .likeIfPresent(DataTemplateDO::getName, reqVO.getName()) .eqIfPresent(DataTemplateDO::getNodeType, reqVO.getNodeType()) @@ -32,7 +35,37 @@ public interface DataTemplateMapper extends BaseMapperX { .eqIfPresent(DataTemplateDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(DataTemplateDO::getRemark, reqVO.getRemark()) .betweenIfPresent(DataTemplateDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(DataTemplateDO::getId)); + .orderByDesc(DataTemplateDO::getId) + .select(Arrays.asList( + DataTemplateDO::getId, + DataTemplateDO::getParentId, + DataTemplateDO::getMainId, + DataTemplateDO::getIdPath, + DataTemplateDO::getName, + DataTemplateDO::getNodeType, + DataTemplateDO::getDataKey, + DataTemplateDO::getVersion, + DataTemplateDO::getCurrentFlag, + DataTemplateDO::getCancelFlag, + DataTemplateDO::getSortNo, + DataTemplateDO::getCustomConfig, +// DataTemplateDO::getFormContent, +// DataTemplateDO::getMobileContent, + DataTemplateDO::getSystemDepartmentCode, + DataTemplateDO::getRemark, + DataTemplateDO::getCreator, + DataTemplateDO::getCreateTime, + DataTemplateDO::getUpdater, + DataTemplateDO::getUpdateTime, + DataTemplateDO::getCompanyId, + DataTemplateDO::getCompanyName, + DataTemplateDO::getDeptId, + DataTemplateDO::getDeptName, + DataTemplateDO::getPostId, + DataTemplateDO::getCreatorName, + DataTemplateDO::getUpdaterName + )) + ); } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataTemplateServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataTemplateServiceImpl.java index 9f119b2..6a8b182 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataTemplateServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataTemplateServiceImpl.java @@ -54,12 +54,22 @@ public class DataTemplateServiceImpl implements DataTemplateService { if("1".equals(newVersionFlag)) return saveDataWithNewVersion(reqV); Long id = reqV.getId(); - DataTemplateDO backData = this.getDataTemplate(id); - if(backData.getCancelFlag() == null || backData.getCancelFlag().equals("-1")){ + if(id == null){ reqV.setCancelFlag("0"); reqV.setCurrentFlag("1"); - reqV.setMainId( id); + reqV.setVersion(1); + DataTemplateDO dataTemplate = BeanUtils.toBean(reqV, DataTemplateDO.class); + dataTemplateMapper.insert(dataTemplate); + id = dataTemplate.getId(); + reqV.setMainId(id); + reqV.setId( id); } +// DataTemplateDO backData = this.getDataTemplate(id); +// if(backData.getCancelFlag() == null || backData.getCancelFlag().equals("-1")){ +// reqV.setCancelFlag("0"); +// reqV.setCurrentFlag("1"); +// reqV.setMainId( id); +// } this.updateDataTemplate(reqV); return CommonResult.success("保存成功");