diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BasePrintTemplateController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BasePrintTemplateController.java new file mode 100644 index 00000000..d560049e --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BasePrintTemplateController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.base.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.base.domain.vo.BasePrintTemplateVo; +import org.dromara.oa.base.domain.bo.BasePrintTemplateBo; +import org.dromara.oa.base.service.IBasePrintTemplateService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 打印模板信息 + * 前端访问路由地址为:/oa/base/printTemplate + * + * @author Yinq + * @date 2025-10-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/base/printTemplate") +public class BasePrintTemplateController extends BaseController { + + private final IBasePrintTemplateService basePrintTemplateService; + + /** + * 查询打印模板信息列表 + */ + @SaCheckPermission("oa/base:printTemplate:list") + @GetMapping("/list") + public TableDataInfo list(BasePrintTemplateBo bo, PageQuery pageQuery) { + return basePrintTemplateService.queryPageList(bo, pageQuery); + } + + /** + * 导出打印模板信息列表 + */ + @SaCheckPermission("oa/base:printTemplate:export") + @Log(title = "打印模板信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BasePrintTemplateBo bo, HttpServletResponse response) { + List list = basePrintTemplateService.queryList(bo); + ExcelUtil.exportExcel(list, "打印模板信息", BasePrintTemplateVo.class, response); + } + + /** + * 获取打印模板信息详细信息 + * + * @param templateId 主键 + */ + @SaCheckPermission("oa/base:printTemplate:query") + @GetMapping("/{templateId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("templateId") Long templateId) { + return R.ok(basePrintTemplateService.queryById(templateId)); + } + + /** + * 新增打印模板信息 + */ + @SaCheckPermission("oa/base:printTemplate:add") + @Log(title = "打印模板信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BasePrintTemplateBo bo) { + return toAjax(basePrintTemplateService.insertByBo(bo)); + } + + /** + * 修改打印模板信息 + */ + @SaCheckPermission("oa/base:printTemplate:edit") + @Log(title = "打印模板信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BasePrintTemplateBo bo) { + return toAjax(basePrintTemplateService.updateByBo(bo)); + } + + /** + * 删除打印模板信息 + * + * @param templateIds 主键串 + */ + @SaCheckPermission("oa/base:printTemplate:remove") + @Log(title = "打印模板信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{templateIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("templateIds") Long[] templateIds) { + return toAjax(basePrintTemplateService.deleteWithValidByIds(List.of(templateIds), true)); + } + + /** + * 下拉框查询打印模板信息列表 + */ + @GetMapping("/getBasePrintTemplateList") + public R> getBasePrintTemplateList(BasePrintTemplateBo bo) { + List list = basePrintTemplateService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java new file mode 100644 index 00000000..1af8f103 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/controller/BaseTemplateVariableController.java @@ -0,0 +1,116 @@ +package org.dromara.oa.base.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.oa.base.domain.vo.BaseTemplateVariableVo; +import org.dromara.oa.base.domain.bo.BaseTemplateVariableBo; +import org.dromara.oa.base.service.IBaseTemplateVariableService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 模板变量信息 + * 前端访问路由地址为:/oa/base/templateVariable + * + * @author Yinq + * @date 2025-10-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/base/templateVariable") +public class BaseTemplateVariableController extends BaseController { + + private final IBaseTemplateVariableService baseTemplateVariableService; + + /** + * 查询模板变量信息列表 + */ + @SaCheckPermission("oa/base:templateVariable:list") + @GetMapping("/list") + public TableDataInfo list(BaseTemplateVariableBo bo, PageQuery pageQuery) { + return baseTemplateVariableService.queryPageList(bo, pageQuery); + } + + /** + * 导出模板变量信息列表 + */ + @SaCheckPermission("oa/base:templateVariable:export") + @Log(title = "模板变量信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(BaseTemplateVariableBo bo, HttpServletResponse response) { + List list = baseTemplateVariableService.queryList(bo); + ExcelUtil.exportExcel(list, "模板变量信息", BaseTemplateVariableVo.class, response); + } + + /** + * 获取模板变量信息详细信息 + * + * @param variableId 主键 + */ + @SaCheckPermission("oa/base:templateVariable:query") + @GetMapping("/{variableId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("variableId") Long variableId) { + return R.ok(baseTemplateVariableService.queryById(variableId)); + } + + /** + * 新增模板变量信息 + */ + @SaCheckPermission("oa/base:templateVariable:add") + @Log(title = "模板变量信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody BaseTemplateVariableBo bo) { + return toAjax(baseTemplateVariableService.insertByBo(bo)); + } + + /** + * 修改模板变量信息 + */ + @SaCheckPermission("oa/base:templateVariable:edit") + @Log(title = "模板变量信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody BaseTemplateVariableBo bo) { + return toAjax(baseTemplateVariableService.updateByBo(bo)); + } + + /** + * 删除模板变量信息 + * + * @param variableIds 主键串 + */ + @SaCheckPermission("oa/base:templateVariable:remove") + @Log(title = "模板变量信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{variableIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("variableIds") Long[] variableIds) { + return toAjax(baseTemplateVariableService.deleteWithValidByIds(List.of(variableIds), true)); + } + + /** + * 下拉框查询模板变量信息列表 + */ + @GetMapping("/getBaseTemplateVariableList") + public R> getBaseTemplateVariableList(BaseTemplateVariableBo bo) { + List list = baseTemplateVariableService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePrintTemplate.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePrintTemplate.java new file mode 100644 index 00000000..224f37cb --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BasePrintTemplate.java @@ -0,0 +1,77 @@ +package org.dromara.oa.base.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 打印模板信息对象 base_print_template + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_print_template") +public class BasePrintTemplate extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板ID + */ + @TableId(value = "template_id", type = IdType.ASSIGN_ID) + private Long templateId; + + /** + * 模板名称 + */ + private String templateName; + + /** + * 版本号 + */ + private String version; + + /** + * 模板类型(1合同 2发货单） + */ + private String templateType; + + /** + * 模板状态(1暂存 2审批中 3可用) + */ + private String templateStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 模板数据 + */ + private String templateData; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseTemplateVariable.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseTemplateVariable.java new file mode 100644 index 00000000..8b94fc24 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/BaseTemplateVariable.java @@ -0,0 +1,92 @@ +package org.dromara.oa.base.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 模板变量信息对象 base_template_variable + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("base_template_variable") +public class BaseTemplateVariable extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 变量ID + */ + @TableId(value = "variable_id", type = IdType.AUTO) + private Long variableId; + + /** + * 变量显示名称 + */ + private String varLabel; + + /** + * 变量名称(含占位符) + */ + private String varName; + + /** + * 模板类型(1合同 2发货单） + */ + private String templateType; + + /** + * 数据表名 + */ + private String dataSource; + + /** + * 数据字段 + */ + private String dataField; + + /** + * 变量类型(1文本 2数值 3时间 4数组) + */ + private String varType; + + /** + * 默认值 + */ + private String defaultValue; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 模板ID（预留） + */ + private Long templateId; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + /** + * 删除标志（0代表存在 1代表删除） + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePrintTemplateBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePrintTemplateBo.java new file mode 100644 index 00000000..0f9ba650 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BasePrintTemplateBo.java @@ -0,0 +1,71 @@ +package org.dromara.oa.base.domain.bo; + +import org.dromara.oa.base.domain.BasePrintTemplate; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 打印模板信息业务对象 base_print_template + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BasePrintTemplate.class, reverseConvertGenerate = false) +public class BasePrintTemplateBo extends BaseEntity { + + /** + * 模板ID + */ + private Long templateId; + + /** + * 模板名称 + */ + @NotBlank(message = "模板名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateName; + + /** + * 版本号 + */ + private String version; + + /** + * 模板类型(1合同 2发货单） + */ + @NotBlank(message = "模板类型(1合同 2发货单）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String templateType; + + /** + * 模板状态(1暂存 2审批中 3可用) + */ + private String templateStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 模板数据 + */ + private String templateData; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseTemplateVariableBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseTemplateVariableBo.java new file mode 100644 index 00000000..80782cb6 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/bo/BaseTemplateVariableBo.java @@ -0,0 +1,84 @@ +package org.dromara.oa.base.domain.bo; + +import org.dromara.oa.base.domain.BaseTemplateVariable; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 模板变量信息业务对象 base_template_variable + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = BaseTemplateVariable.class, reverseConvertGenerate = false) +public class BaseTemplateVariableBo extends BaseEntity { + + /** + * 变量ID + */ + private Long variableId; + + /** + * 变量显示名称 + */ + private String varLabel; + + /** + * 变量名称(含占位符) + */ + private String varName; + + /** + * 模板类型(1合同 2发货单） + */ + private String templateType; + + /** + * 数据表名 + */ + private String dataSource; + + /** + * 数据字段 + */ + private String dataField; + + /** + * 变量类型(1文本 2数值 3时间 4数组) + */ + private String varType; + + /** + * 默认值 + */ + private String defaultValue; + + /** + * 排序号 + */ + private Long sortOrder; + + /** + * 模板ID（预留） + */ + private Long templateId; + + /** + * 备注 + */ + private String remark; + + /** + * 激活标识（1是 0否） + */ + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePrintTemplateVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePrintTemplateVo.java new file mode 100644 index 00000000..f37340be --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BasePrintTemplateVo.java @@ -0,0 +1,119 @@ +package org.dromara.oa.base.domain.vo; + +import org.dromara.oa.base.domain.BasePrintTemplate; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 打印模板信息视图对象 base_print_template + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BasePrintTemplate.class) +public class BasePrintTemplateVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 模板ID + */ + @ExcelProperty(value = "模板ID") + private Long templateId; + + /** + * 模板名称 + */ + @ExcelProperty(value = "模板名称") + private String templateName; + + /** + * 版本号 + */ + @ExcelProperty(value = "版本号") + private String version; + + /** + * 模板类型(1合同 2发货单） + */ + @ExcelProperty(value = "模板类型(1合同 2发货单）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "template_type") + private String templateType; + + /** + * 模板状态(1暂存 2审批中 3可用) + */ + @ExcelProperty(value = "模板状态(1暂存 2审批中 3可用)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "template_status") + private String templateStatus; + + /** + * 流程状态 + */ + @ExcelProperty(value = "流程状态") + private String flowStatus; + + /** + * 模板数据 + */ + @ExcelProperty(value = "模板数据") + private String templateData; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseTemplateVariableVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseTemplateVariableVo.java new file mode 100644 index 00000000..9848354d --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/domain/vo/BaseTemplateVariableVo.java @@ -0,0 +1,108 @@ +package org.dromara.oa.base.domain.vo; + +import org.dromara.oa.base.domain.BaseTemplateVariable; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 模板变量信息视图对象 base_template_variable + * + * @author Yinq + * @date 2025-10-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = BaseTemplateVariable.class) +public class BaseTemplateVariableVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 变量ID + */ + @ExcelProperty(value = "变量ID") + private Long variableId; + + /** + * 变量显示名称 + */ + @ExcelProperty(value = "变量显示名称") + private String varLabel; + + /** + * 变量名称(含占位符) + */ + @ExcelProperty(value = "变量名称(含占位符)") + private String varName; + + /** + * 模板类型(1合同 2发货单） + */ + @ExcelProperty(value = "模板类型(1合同 2发货单）", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "template_type") + private String templateType; + + /** + * 数据表名 + */ + @ExcelProperty(value = "数据表名") + private String dataSource; + + /** + * 数据字段 + */ + @ExcelProperty(value = "数据字段") + private String dataField; + + /** + * 变量类型(1文本 2数值 3时间 4数组) + */ + @ExcelProperty(value = "变量类型(1文本 2数值 3时间 4数组)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "var_type") + private String varType; + + /** + * 默认值 + */ + @ExcelProperty(value = "默认值") + private String defaultValue; + + /** + * 排序号 + */ + @ExcelProperty(value = "排序号") + private Long sortOrder; + + /** + * 模板ID（预留） + */ + @ExcelProperty(value = "模板ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "预=留") + private Long templateId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 激活标识（1是 0否） + */ + @ExcelProperty(value = "激活标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "active_flag") + private String activeFlag; + + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BasePrintTemplateMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BasePrintTemplateMapper.java new file mode 100644 index 00000000..291a6c5d --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BasePrintTemplateMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.base.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.base.domain.BasePrintTemplate; +import org.dromara.oa.base.domain.vo.BasePrintTemplateVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 打印模板信息Mapper接口 + * + * @author Yinq + * @date 2025-10-09 + */ +public interface BasePrintTemplateMapper extends BaseMapperPlus { + + /** + * 查询打印模板信息列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 打印模板信息集合 + */ + public Page selectCustomBasePrintTemplateVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询打印模板信息列表 + * + * @param queryWrapper 条件 + * @return 打印模板信息集合 + */ + public List selectCustomBasePrintTemplateVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseTemplateVariableMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseTemplateVariableMapper.java new file mode 100644 index 00000000..3e76d699 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/mapper/BaseTemplateVariableMapper.java @@ -0,0 +1,37 @@ +package org.dromara.oa.base.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.oa.base.domain.BaseTemplateVariable; +import org.dromara.oa.base.domain.vo.BaseTemplateVariableVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 模板变量信息Mapper接口 + * + * @author Yinq + * @date 2025-10-09 + */ +public interface BaseTemplateVariableMapper extends BaseMapperPlus { + + /** + * 查询模板变量信息列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 模板变量信息集合 + */ + public Page selectCustomBaseTemplateVariableVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询模板变量信息列表 + * + * @param queryWrapper 条件 + * @return 模板变量信息集合 + */ + public List selectCustomBaseTemplateVariableVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBasePrintTemplateService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBasePrintTemplateService.java new file mode 100644 index 00000000..90da87c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBasePrintTemplateService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.base.service; + +import org.dromara.oa.base.domain.BasePrintTemplate; +import org.dromara.oa.base.domain.vo.BasePrintTemplateVo; +import org.dromara.oa.base.domain.bo.BasePrintTemplateBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 打印模板信息Service接口 + * + * @author Yinq + * @date 2025-10-09 + */ +public interface IBasePrintTemplateService { + + /** + * 查询打印模板信息 + * + * @param templateId 主键 + * @return 打印模板信息 + */ + BasePrintTemplateVo queryById(Long templateId); + + /** + * 分页查询打印模板信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板信息分页列表 + */ + TableDataInfo queryPageList(BasePrintTemplateBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的打印模板信息列表 + * + * @param bo 查询条件 + * @return 打印模板信息列表 + */ + List queryList(BasePrintTemplateBo bo); + + /** + * 新增打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BasePrintTemplateBo bo); + + /** + * 修改打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BasePrintTemplateBo bo); + + /** + * 校验并批量删除打印模板信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseTemplateVariableService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseTemplateVariableService.java new file mode 100644 index 00000000..de8132e2 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/IBaseTemplateVariableService.java @@ -0,0 +1,69 @@ +package org.dromara.oa.base.service; + +import org.dromara.oa.base.domain.BaseTemplateVariable; +import org.dromara.oa.base.domain.vo.BaseTemplateVariableVo; +import org.dromara.oa.base.domain.bo.BaseTemplateVariableBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 模板变量信息Service接口 + * + * @author Yinq + * @date 2025-10-09 + */ +public interface IBaseTemplateVariableService { + + /** + * 查询模板变量信息 + * + * @param variableId 主键 + * @return 模板变量信息 + */ + BaseTemplateVariableVo queryById(Long variableId); + + /** + * 分页查询模板变量信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 模板变量信息分页列表 + */ + TableDataInfo queryPageList(BaseTemplateVariableBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的模板变量信息列表 + * + * @param bo 查询条件 + * @return 模板变量信息列表 + */ + List queryList(BaseTemplateVariableBo bo); + + /** + * 新增模板变量信息 + * + * @param bo 模板变量信息 + * @return 是否新增成功 + */ + Boolean insertByBo(BaseTemplateVariableBo bo); + + /** + * 修改模板变量信息 + * + * @param bo 模板变量信息 + * @return 是否修改成功 + */ + Boolean updateByBo(BaseTemplateVariableBo bo); + + /** + * 校验并批量删除模板变量信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePrintTemplateServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePrintTemplateServiceImpl.java new file mode 100644 index 00000000..f35fdbfe --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BasePrintTemplateServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.oa.base.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.base.domain.bo.BasePrintTemplateBo; +import org.dromara.oa.base.domain.vo.BasePrintTemplateVo; +import org.dromara.oa.base.domain.BasePrintTemplate; +import org.dromara.oa.base.mapper.BasePrintTemplateMapper; +import org.dromara.oa.base.service.IBasePrintTemplateService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 打印模板信息Service业务层处理 + * + * @author Yinq + * @date 2025-10-09 + */ +@RequiredArgsConstructor +@Service +public class BasePrintTemplateServiceImpl implements IBasePrintTemplateService { + + private final BasePrintTemplateMapper baseMapper; + + /** + * 查询打印模板信息 + * + * @param templateId 主键 + * @return 打印模板信息 + */ + @Override + public BasePrintTemplateVo queryById(Long templateId){ + return baseMapper.selectVoById(templateId); + } + + /** + * 分页查询打印模板信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 打印模板信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BasePrintTemplateBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的打印模板信息列表 + * + * @param bo 查询条件 + * @return 打印模板信息列表 + */ + @Override + public List queryList(BasePrintTemplateBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BasePrintTemplateBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BasePrintTemplate.class) + .selectAll(BasePrintTemplate.class) + .like(StringUtils.isNotBlank(bo.getTemplateName()), BasePrintTemplate::getTemplateName, bo.getTemplateName()) + .eq(StringUtils.isNotBlank(bo.getTemplateType()), BasePrintTemplate::getTemplateType, bo.getTemplateType()) + .eq(StringUtils.isNotBlank(bo.getTemplateStatus()), BasePrintTemplate::getTemplateStatus, bo.getTemplateStatus()) + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), BasePrintTemplate::getFlowStatus, bo.getFlowStatus()) + .eq(StringUtils.isNotBlank(bo.getTemplateData()), BasePrintTemplate::getTemplateData, bo.getTemplateData()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BasePrintTemplate::getActiveFlag, bo.getActiveFlag()) +; + return lqw; + } + + /** + * 新增打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BasePrintTemplateBo bo) { + BasePrintTemplate add = MapstructUtils.convert(bo, BasePrintTemplate.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTemplateId(add.getTemplateId()); + } + return flag; + } + + /** + * 修改打印模板信息 + * + * @param bo 打印模板信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BasePrintTemplateBo bo) { + BasePrintTemplate update = MapstructUtils.convert(bo, BasePrintTemplate.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BasePrintTemplate entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除打印模板信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java new file mode 100644 index 00000000..957162d3 --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/base/service/impl/BaseTemplateVariableServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.oa.base.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.oa.base.domain.bo.BaseTemplateVariableBo; +import org.dromara.oa.base.domain.vo.BaseTemplateVariableVo; +import org.dromara.oa.base.domain.BaseTemplateVariable; +import org.dromara.oa.base.mapper.BaseTemplateVariableMapper; +import org.dromara.oa.base.service.IBaseTemplateVariableService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 模板变量信息Service业务层处理 + * + * @author Yinq + * @date 2025-10-09 + */ +@RequiredArgsConstructor +@Service +public class BaseTemplateVariableServiceImpl implements IBaseTemplateVariableService { + + private final BaseTemplateVariableMapper baseMapper; + + /** + * 查询模板变量信息 + * + * @param variableId 主键 + * @return 模板变量信息 + */ + @Override + public BaseTemplateVariableVo queryById(Long variableId){ + return baseMapper.selectVoById(variableId); + } + + /** + * 分页查询模板变量信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 模板变量信息分页列表 + */ + @Override + public TableDataInfo queryPageList(BaseTemplateVariableBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的模板变量信息列表 + * + * @param bo 查询条件 + * @return 模板变量信息列表 + */ + @Override + public List queryList(BaseTemplateVariableBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(BaseTemplateVariableBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseTemplateVariable.class) + .selectAll(BaseTemplateVariable.class) + .eq(StringUtils.isNotBlank(bo.getVarLabel()), BaseTemplateVariable::getVarLabel, bo.getVarLabel()) + .like(StringUtils.isNotBlank(bo.getVarName()), BaseTemplateVariable::getVarName, bo.getVarName()) + .eq(StringUtils.isNotBlank(bo.getTemplateType()), BaseTemplateVariable::getTemplateType, bo.getTemplateType()) + .eq(StringUtils.isNotBlank(bo.getDataSource()), BaseTemplateVariable::getDataSource, bo.getDataSource()) + .eq(StringUtils.isNotBlank(bo.getDataField()), BaseTemplateVariable::getDataField, bo.getDataField()) + .eq(StringUtils.isNotBlank(bo.getVarType()), BaseTemplateVariable::getVarType, bo.getVarType()) + .eq(StringUtils.isNotBlank(bo.getDefaultValue()), BaseTemplateVariable::getDefaultValue, bo.getDefaultValue()) + .eq(bo.getSortOrder() != null, BaseTemplateVariable::getSortOrder, bo.getSortOrder()) + .eq(bo.getTemplateId() != null, BaseTemplateVariable::getTemplateId, bo.getTemplateId()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), BaseTemplateVariable::getActiveFlag, bo.getActiveFlag()) +; + return lqw; + } + + /** + * 新增模板变量信息 + * + * @param bo 模板变量信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(BaseTemplateVariableBo bo) { + BaseTemplateVariable add = MapstructUtils.convert(bo, BaseTemplateVariable.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setVariableId(add.getVariableId()); + } + return flag; + } + + /** + * 修改模板变量信息 + * + * @param bo 模板变量信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(BaseTemplateVariableBo bo) { + BaseTemplateVariable update = MapstructUtils.convert(bo, BaseTemplateVariable.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(BaseTemplateVariable entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除模板变量信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePrintTemplateMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePrintTemplateMapper.xml new file mode 100644 index 00000000..1f12a77a --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BasePrintTemplateMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseTemplateVariableMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseTemplateVariableMapper.xml new file mode 100644 index 00000000..a2cf193e --- /dev/null +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/base/BaseTemplateVariableMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +