From e523becef4e83a9d3157b3a1d2fff024fdd11019 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 14 Aug 2023 10:47:36 +0800 Subject: [PATCH] =?UTF-8?q?debug,excel=E5=8A=A8=E6=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExlTableConfController.java | 113 ++++++++++++++++++ .../modules/exl/entity/ExlColumnConf.java | 102 ++++++++++++++++ .../serve/modules/exl/entity/ExlDsConf.java | 105 ++++++++++++++++ .../modules/exl/entity/ExlTableConf.java | 98 +++++++++++++++ .../modules/exl/entity/dto/ExlTableBo.java | 39 ++++++ .../exl/mapper/ExlColumnConfMapper.java | 14 +++ .../modules/exl/mapper/ExlDsConfMapper.java | 14 +++ .../exl/mapper/ExlTableConfMapper.java | 14 +++ .../exl/service/ExlColumnConfService.java | 14 +++ .../exl/service/ExlTableConfService.java | 21 ++++ .../impl/ExlColumnConfServiceImpl.java | 22 ++++ .../service/impl/ExlTableConfServiceImpl.java | 31 +++++ .../mapper/tbs/TbsBudgetMatchMapper.xml | 4 +- 13 files changed, 589 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java create mode 100644 src/main/java/com/qs/serve/modules/exl/entity/ExlColumnConf.java create mode 100644 src/main/java/com/qs/serve/modules/exl/entity/ExlDsConf.java create mode 100644 src/main/java/com/qs/serve/modules/exl/entity/ExlTableConf.java create mode 100644 src/main/java/com/qs/serve/modules/exl/entity/dto/ExlTableBo.java create mode 100644 src/main/java/com/qs/serve/modules/exl/mapper/ExlColumnConfMapper.java create mode 100644 src/main/java/com/qs/serve/modules/exl/mapper/ExlDsConfMapper.java create mode 100644 src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java create mode 100644 src/main/java/com/qs/serve/modules/exl/service/ExlColumnConfService.java create mode 100644 src/main/java/com/qs/serve/modules/exl/service/ExlTableConfService.java create mode 100644 src/main/java/com/qs/serve/modules/exl/service/impl/ExlColumnConfServiceImpl.java create mode 100644 src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java new file mode 100644 index 00000000..2b1a0f1e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java @@ -0,0 +1,113 @@ +package com.qs.serve.modules.exl.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.exl.entity.ExlTableConf; +import com.qs.serve.modules.exl.service.ExlTableConfService; + +import javax.validation.Valid; +import java.util.List; + +/** + * 动态Excel表 表配置 + * @author YenHex + * @since 2023-08-11 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("exl/tableConf") +public class ExlTableConfController { + + private ExlTableConfService exlTableConfService; + + /** + * 列表 + * @param param + * @return + */ + //@GetMapping("/list") + public R> getList(ExlTableConf param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + List list = exlTableConfService.list(lqw); + return R.ok(list); + } + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(ExlTableConf param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = exlTableConfService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + @GetMapping("/getById/{id}") + @SysLog(module = SystemModule.Excel, title = "表配置", biz = BizType.QUERY) + public R getById(@PathVariable("id") String id){ + ExlTableConf exlTableConf = exlTableConfService.getById(id); + return R.ok(exlTableConf); + } + + + + /** + * 更新 + * @param param + * @return + */ + @PostMapping("/updateById") + @SysLog(module = SystemModule.Excel, title = "表配置", biz = BizType.UPDATE) + public R updateById(@RequestBody @Valid ExlTableConf param){ + boolean result = exlTableConfService.updateById(param); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + @PostMapping("/save") + @SysLog(module = SystemModule.Excel, title = "表配置", biz = BizType.INSERT) + public R save(@RequestBody @Valid ExlTableConf param){ + boolean result = exlTableConfService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.Excel, title = "表配置", biz = BizType.DELETE) + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = exlTableConfService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/entity/ExlColumnConf.java b/src/main/java/com/qs/serve/modules/exl/entity/ExlColumnConf.java new file mode 100644 index 00000000..52860641 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/entity/ExlColumnConf.java @@ -0,0 +1,102 @@ +package com.qs.serve.modules.exl.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 行配置 实体类 + * @author YenHex + * @since 2023-08-14 + */ +@Data +@TableName("exl_column_conf") +public class ExlColumnConf implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @JsonIgnore + @TableId(type = IdType.AUTO) + private Long id; + + /** 表名 */ + @NotBlank(message = "表名不能为空") + @Length(max = 255,message = "表名长度不能超过255字") + private String columnName; + + /** excel头部 */ + @NotBlank(message = "excel头部不能为空") + @Length(max = 255,message = "excel头部长度不能超过255字") + private String columnHeader; + + /** 数据类型：string；int；money；date；datetime； */ + @Length(max = 255,message = "数据类型：string；int；money；date；datetime；长度不能超过255字") + private String columnType; + + @JsonIgnore + /** 作为查询条件标识 string-like；int-eq；date-between；datetime-between */ + @NotNull(message = "作为查询条件标识 string-like；int-eq；date-between；datetime-between不能为空") + private Integer conditionFlag; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 最后更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + + + public static ExlColumnConf toNewObject(ExlColumnConf source){ + ExlColumnConf columnConf = new ExlColumnConf(); + columnConf.setId(source.getId()); + columnConf.setColumnName(source.getColumnName()); + columnConf.setColumnHeader(source.getColumnHeader()); + columnConf.setColumnType(source.getColumnType()); + columnConf.setConditionFlag(source.getConditionFlag()); + columnConf.setCreateTime(source.getCreateTime()); + columnConf.setUpdateTime(source.getUpdateTime()); + columnConf.setTenantId(source.getTenantId()); + columnConf.setCreateBy(source.getCreateBy()); + columnConf.setUpdateBy(source.getUpdateBy()); + columnConf.setDelFlag(source.getDelFlag()); + return columnConf; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/entity/ExlDsConf.java b/src/main/java/com/qs/serve/modules/exl/entity/ExlDsConf.java new file mode 100644 index 00000000..7fccd980 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/entity/ExlDsConf.java @@ -0,0 +1,105 @@ +package com.qs.serve.modules.exl.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 数据源配置 实体类 + * @author YenHex + * @since 2023-08-11 + */ +@Data +@TableName("exl_ds_conf") +public class ExlDsConf implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 启用 */ + @NotNull(message = "启用不能为空") + private Integer enable; + + /** 用户名 */ + @NotBlank(message = "用户名不能为空") + @Length(max = 255,message = "用户名长度不能超过255字") + private String username; + + /** 密码 */ + @NotBlank(message = "密码不能为空") + @Length(max = 255,message = "密码长度不能超过255字") + private String password; + + /** url */ + @Length(max = 255,message = "url长度不能超过255字") + private String url; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 最后更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + + + public static ExlDsConf toNewObject(ExlDsConf source){ + ExlDsConf dsConf = new ExlDsConf(); + dsConf.setId(source.getId()); + dsConf.setEnable(source.getEnable()); + dsConf.setUsername(source.getUsername()); + dsConf.setPassword(source.getPassword()); + dsConf.setUrl(source.getUrl()); + dsConf.setRemark(source.getRemark()); + dsConf.setCreateTime(source.getCreateTime()); + dsConf.setUpdateTime(source.getUpdateTime()); + dsConf.setTenantId(source.getTenantId()); + dsConf.setCreateBy(source.getCreateBy()); + dsConf.setUpdateBy(source.getUpdateBy()); + dsConf.setDelFlag(source.getDelFlag()); + return dsConf; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/entity/ExlTableConf.java b/src/main/java/com/qs/serve/modules/exl/entity/ExlTableConf.java new file mode 100644 index 00000000..ed4269b9 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/entity/ExlTableConf.java @@ -0,0 +1,98 @@ +package com.qs.serve.modules.exl.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 表配置 实体类 + * @author YenHex + * @since 2023-08-11 + */ +@Data +@TableName("exl_table_conf") +public class ExlTableConf implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 表名 */ + @NotBlank(message = "表名不能为空") + @Length(max = 255,message = "表名长度不能超过255字") + private String tableName; + + /** excel标题 */ + @NotBlank(message = "excel标题不能为空") + @Length(max = 255,message = "excel标题长度不能超过255字") + private String excelTitle; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 启用标识 (0/1) */ + private String enableFlag; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 最后更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + + + public static ExlTableConf toNewObject(ExlTableConf source){ + ExlTableConf tableConf = new ExlTableConf(); + tableConf.setId(source.getId()); + tableConf.setTableName(source.getTableName()); + tableConf.setExcelTitle(source.getExcelTitle()); + tableConf.setRemark(source.getRemark()); + tableConf.setCreateTime(source.getCreateTime()); + tableConf.setUpdateTime(source.getUpdateTime()); + tableConf.setTenantId(source.getTenantId()); + tableConf.setCreateBy(source.getCreateBy()); + tableConf.setUpdateBy(source.getUpdateBy()); + tableConf.setDelFlag(source.getDelFlag()); + return tableConf; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/entity/dto/ExlTableBo.java b/src/main/java/com/qs/serve/modules/exl/entity/dto/ExlTableBo.java new file mode 100644 index 00000000..b97885e0 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/entity/dto/ExlTableBo.java @@ -0,0 +1,39 @@ +package com.qs.serve.modules.exl.entity.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.qs.serve.modules.exl.entity.ExlColumnConf; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * @author YenHex + * @since 2023/8/14 + */ +@Data +public class ExlTableBo { + + /** id(修改时参数) */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 表名 */ + @NotBlank(message = "表名不能为空") + @Length(max = 255,message = "表名长度不能超过255字") + private String tableName; + + /** excel标题 */ + @NotBlank(message = "excel标题不能为空") + @Length(max = 255,message = "excel标题长度不能超过255字") + private String excelTitle; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + private List columnList; + +} diff --git a/src/main/java/com/qs/serve/modules/exl/mapper/ExlColumnConfMapper.java b/src/main/java/com/qs/serve/modules/exl/mapper/ExlColumnConfMapper.java new file mode 100644 index 00000000..9f45418d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/mapper/ExlColumnConfMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.exl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.exl.entity.ExlColumnConf; + +/** + * 行配置 Mapper + * @author YenHex + * @date 2023-08-14 + */ +public interface ExlColumnConfMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/mapper/ExlDsConfMapper.java b/src/main/java/com/qs/serve/modules/exl/mapper/ExlDsConfMapper.java new file mode 100644 index 00000000..f6c18515 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/mapper/ExlDsConfMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.exl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.exl.entity.ExlDsConf; + +/** + * 数据源配置 Mapper + * @author YenHex + * @date 2023-08-11 + */ +public interface ExlDsConfMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java b/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java new file mode 100644 index 00000000..4c3e02eb --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/mapper/ExlTableConfMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.exl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.exl.entity.ExlTableConf; + +/** + * 表配置 Mapper + * @author YenHex + * @date 2023-08-11 + */ +public interface ExlTableConfMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/service/ExlColumnConfService.java b/src/main/java/com/qs/serve/modules/exl/service/ExlColumnConfService.java new file mode 100644 index 00000000..cc568bd4 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/service/ExlColumnConfService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.exl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.exl.entity.ExlColumnConf; + +/** + * 行配置 服务接口 + * @author YenHex + * @date 2023-08-14 + */ +public interface ExlColumnConfService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/service/ExlTableConfService.java b/src/main/java/com/qs/serve/modules/exl/service/ExlTableConfService.java new file mode 100644 index 00000000..9c1c70cf --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/service/ExlTableConfService.java @@ -0,0 +1,21 @@ +package com.qs.serve.modules.exl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.exl.entity.ExlTableConf; +import com.qs.serve.modules.exl.entity.dto.ExlTableBo; + +/** + * 表配置 服务接口 + * @author YenHex + * @date 2023-08-11 + */ +public interface ExlTableConfService extends IService { + + /** + * 编辑 + * @param param + */ + void modify(ExlTableBo param); + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/service/impl/ExlColumnConfServiceImpl.java b/src/main/java/com/qs/serve/modules/exl/service/impl/ExlColumnConfServiceImpl.java new file mode 100644 index 00000000..5af7ca02 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/service/impl/ExlColumnConfServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.exl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.exl.entity.ExlColumnConf; +import com.qs.serve.modules.exl.service.ExlColumnConfService; +import com.qs.serve.modules.exl.mapper.ExlColumnConfMapper; + +/** + * 行配置 服务实现类 + * @author YenHex + * @since 2023-08-14 + */ +@Slf4j +@Service +@AllArgsConstructor +public class ExlColumnConfServiceImpl extends ServiceImpl implements ExlColumnConfService { + +} + diff --git a/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java b/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java new file mode 100644 index 00000000..8bf1e2a0 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java @@ -0,0 +1,31 @@ +package com.qs.serve.modules.exl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.modules.exl.entity.dto.ExlTableBo; +import com.qs.serve.modules.exl.service.ExlColumnConfService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.exl.entity.ExlTableConf; +import com.qs.serve.modules.exl.service.ExlTableConfService; +import com.qs.serve.modules.exl.mapper.ExlTableConfMapper; + +/** + * 表配置 服务实现类 + * @author YenHex + * @since 2023-08-11 + */ +@Slf4j +@Service +@AllArgsConstructor +public class ExlTableConfServiceImpl extends ServiceImpl implements ExlTableConfService { + + private final ExlColumnConfService columnConfService; + + @Override + public void modify(ExlTableBo param) { + + } + +} + diff --git a/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml b/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml index b6519534..b80287f8 100644 --- a/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml +++ b/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml @@ -19,7 +19,7 @@ - + @@ -34,7 +34,7 @@ -- temp_tbg2.amt final_budget_amount, -- temp_tbg3.amt used_budget_amount, tb.condition_flag budget_condition_flag, - tb.subject_id subject_id, + tb.subject_id budget_subject_id, tb.budget_code budget_name, tb.budget_number budget_code, tbc.target_level_path_ids condition_goods_ids