diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaAccountingBatchController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaAccountingBatchController.java new file mode 100644 index 0000000..a675227 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaAccountingBatchController.java @@ -0,0 +1,101 @@ +package com.ruoyi.oa.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.validate.QueryGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.oa.domain.vo.OaAccountingBatchVo; +import com.ruoyi.oa.domain.bo.OaAccountingBatchBo; +import com.ruoyi.oa.service.IOaAccountingBatchService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + * + * @author Joshi + * @date 2025-09-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/accountingBatch") +public class OaAccountingBatchController extends BaseController { + + private final IOaAccountingBatchService iOaAccountingBatchService; + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaAccountingBatchBo bo, PageQuery pageQuery) { + return iOaAccountingBatchService.queryPageList(bo, pageQuery); + } + + /** + * 导出封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + @Log(title = "封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OaAccountingBatchBo bo, HttpServletResponse response) { + List list = iOaAccountingBatchService.queryList(bo); + ExcelUtil.exportExcel(list, "封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)", OaAccountingBatchVo.class, response); + } + + /** + * 获取封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)详细信息 + * + * @param batchId 主键 + */ + @GetMapping("/{batchId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long batchId) { + return R.ok(iOaAccountingBatchService.queryById(batchId)); + } + + /** + * 新增封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Log(title = "封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OaAccountingBatchBo bo) { + return toAjax(iOaAccountingBatchService.insertByBo(bo)); + } + + /** + * 修改封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Log(title = "封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OaAccountingBatchBo bo) { + return toAjax(iOaAccountingBatchService.updateByBo(bo)); + } + + /** + * 删除封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + * + * @param batchIds 主键串 + */ + @Log(title = "封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)", businessType = BusinessType.DELETE) + @DeleteMapping("/{batchIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] batchIds) { + return toAjax(iOaAccountingBatchService.deleteWithValidByIds(Arrays.asList(batchIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaJournalAccountController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaJournalAccountController.java new file mode 100644 index 0000000..7a43464 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaJournalAccountController.java @@ -0,0 +1,101 @@ +package com.ruoyi.oa.controller; + +import java.util.List; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.validate.QueryGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.oa.domain.vo.OaJournalAccountVo; +import com.ruoyi.oa.domain.bo.OaJournalAccountBo; +import com.ruoyi.oa.service.IOaJournalAccountService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL) + * + * @author Joshi + * @date 2025-09-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/journalAccount") +public class OaJournalAccountController extends BaseController { + + private final IOaJournalAccountService iOaJournalAccountService; + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + @GetMapping("/list") + public TableDataInfo list(OaJournalAccountBo bo, PageQuery pageQuery) { + return iOaJournalAccountService.queryPageList(bo, pageQuery); + } + + /** + * 导出日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + @Log(title = "日记账(绑定封账批次,未封账数据batch_id为NULL)", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(OaJournalAccountBo bo, HttpServletResponse response) { + List list = iOaJournalAccountService.queryList(bo); + ExcelUtil.exportExcel(list, "日记账(绑定封账批次,未封账数据batch_id为NULL)", OaJournalAccountVo.class, response); + } + + /** + * 获取日记账(绑定封账批次,未封账数据batch_id为NULL)详细信息 + * + * @param journalId 主键 + */ + @GetMapping("/{journalId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long journalId) { + return R.ok(iOaJournalAccountService.queryById(journalId)); + } + + /** + * 新增日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Log(title = "日记账(绑定封账批次,未封账数据batch_id为NULL)", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody OaJournalAccountBo bo) { + return toAjax(iOaJournalAccountService.insertByBo(bo)); + } + + /** + * 修改日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Log(title = "日记账(绑定封账批次,未封账数据batch_id为NULL)", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody OaJournalAccountBo bo) { + return toAjax(iOaJournalAccountService.updateByBo(bo)); + } + + /** + * 删除日记账(绑定封账批次,未封账数据batch_id为NULL) + * + * @param journalIds 主键串 + */ + @Log(title = "日记账(绑定封账批次,未封账数据batch_id为NULL)", businessType = BusinessType.DELETE) + @DeleteMapping("/{journalIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] journalIds) { + return toAjax(iOaJournalAccountService.deleteWithValidByIds(Arrays.asList(journalIds), true)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaAccountingBatch.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaAccountingBatch.java new file mode 100644 index 0000000..c91f10c --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaAccountingBatch.java @@ -0,0 +1,62 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)对象 oa_accounting_batch + * + * @author Joshi + * @date 2025-09-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_accounting_batch") +public class OaAccountingBatch extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 封账批次ID(主键) + */ + @TableId(value = "batch_id") + private Long batchId; + /** + * 批次名称(如:2024年9月封账、2024Q3封账) + */ + private String batchName; + /** + * 封账范围开始日期(该批次包含的日记账起始日期) + */ + private Date startDate; + /** + * 封账范围结束日期(该批次包含的日记账截止日期) + */ + private Date endDate; + /** + * 关联账户ID(逗号分隔,如:BANK_001,CASH_001,空表示所有账户) + */ + private String accountIds; + /** + * 批次状态(0:草稿,1:已封账,2:已取消封账) + */ + private Long status; + /** + * 备注 + */ + private String remark; + /** + * 删除标志(0正常 1删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaJournalAccount.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaJournalAccount.java new file mode 100644 index 0000000..4e25463 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaJournalAccount.java @@ -0,0 +1,75 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)对象 oa_journal_account + * + * @author Joshi + * @date 2025-09-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("oa_journal_account") +public class OaJournalAccount extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 日记账记录ID(主键) + */ + @TableId(value = "journal_id") + private Long journalId; + /** + * 账户ID(关联账户表) + */ + private Long accountId; + /** + * 记账日期 + */ + private Date recordDate; + /** + * 对方科目 + */ + private String oppositeSubject; + /** + * 业务摘要 + */ + private String summary; + /** + * 收入金额(元) + */ + private BigDecimal incomeAmount; + /** + * 支出金额(元) + */ + private BigDecimal expendAmount; + /** + * 账户余额(元) + */ + private BigDecimal balance; + /** + * 封账批次ID(关联accounting_batch表,NULL表示未封账) + */ + private Long batchId; + /** + * 备注 + */ + private String remark; + /** + * 删除标志(0正常 1删除) + */ + @TableLogic + private Long delFlag; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAccountingBatchBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAccountingBatchBo.java new file mode 100644 index 0000000..117c661 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaAccountingBatchBo.java @@ -0,0 +1,62 @@ +package com.ruoyi.oa.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)业务对象 oa_accounting_batch + * + * @author Joshi + * @date 2025-09-09 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaAccountingBatchBo extends BaseEntity { + + /** + * 封账批次ID(主键) + */ + private Long batchId; + + /** + * 批次名称(如:2024年9月封账、2024Q3封账) + */ + private String batchName; + + /** + * 封账范围开始日期(该批次包含的日记账起始日期) + */ + private Date startDate; + + /** + * 封账范围结束日期(该批次包含的日记账截止日期) + */ + private Date endDate; + + /** + * 关联账户ID(逗号分隔,如:BANK_001,CASH_001,空表示所有账户) + */ + private String accountIds; + + /** + * 批次状态(0:草稿,1:已封账,2:已取消封账) + */ + private Long status; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaJournalAccountBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaJournalAccountBo.java new file mode 100644 index 0000000..211ba09 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaJournalAccountBo.java @@ -0,0 +1,78 @@ +package com.ruoyi.oa.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)业务对象 oa_journal_account + * + * @author Joshi + * @date 2025-09-09 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class OaJournalAccountBo extends BaseEntity { + + /** + * 日记账记录ID(主键) + */ + private Long journalId; + + /** + * 账户ID(关联账户表) + */ + private Long accountId; + + /** + * 记账日期 + */ + private Date recordDate; + + /** + * 对方科目 + */ + private String oppositeSubject; + + /** + * 业务摘要 + */ + private String summary; + + /** + * 收入金额(元) + */ + private BigDecimal incomeAmount; + + /** + * 支出金额(元) + */ + private BigDecimal expendAmount; + + /** + * 账户余额(元) + */ + private BigDecimal balance; + + /** + * 封账批次ID(关联accounting_batch表,NULL表示未封账) + */ + private Long batchId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaAccountingBatchVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaAccountingBatchVo.java new file mode 100644 index 0000000..9c1a1d4 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaAccountingBatchVo.java @@ -0,0 +1,75 @@ +package com.ruoyi.oa.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)视图对象 oa_accounting_batch + * + * @author Joshi + * @date 2025-09-09 + */ +@Data +@ExcelIgnoreUnannotated +public class OaAccountingBatchVo { + + private static final long serialVersionUID = 1L; + + /** + * 封账批次ID(主键) + */ + @ExcelProperty(value = "封账批次ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "主=键") + private Long batchId; + + /** + * 批次名称(如:2024年9月封账、2024Q3封账) + */ + @ExcelProperty(value = "批次名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=:2024年9月封账、2024Q3封账") + private String batchName; + + /** + * 封账范围开始日期(该批次包含的日记账起始日期) + */ + @ExcelProperty(value = "封账范围开始日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "该=批次包含的日记账起始日期") + private Date startDate; + + /** + * 封账范围结束日期(该批次包含的日记账截止日期) + */ + @ExcelProperty(value = "封账范围结束日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "该=批次包含的日记账截止日期") + private Date endDate; + + /** + * 关联账户ID(逗号分隔,如:BANK_001,CASH_001,空表示所有账户) + */ + @ExcelProperty(value = "关联账户ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "逗=号分隔,如:BANK_001,CASH_001,空表示所有账户") + private String accountIds; + + /** + * 批次状态(0:草稿,1:已封账,2:已取消封账) + */ + @ExcelProperty(value = "批次状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=:草稿,1:已封账,2:已取消封账") + private Long status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaJournalAccountVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaJournalAccountVo.java new file mode 100644 index 0000000..3fd229f --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaJournalAccountVo.java @@ -0,0 +1,94 @@ +package com.ruoyi.oa.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)视图对象 oa_journal_account + * + * @author Joshi + * @date 2025-09-09 + */ +@Data +@ExcelIgnoreUnannotated +public class OaJournalAccountVo { + + private static final long serialVersionUID = 1L; + + /** + * 日记账记录ID(主键) + */ + @ExcelProperty(value = "日记账记录ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "主=键") + private Long journalId; + + /** + * 账户ID(关联账户表) + */ + @ExcelProperty(value = "账户ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联账户表") + private Long accountId; + + /** + * 记账日期 + */ + @ExcelProperty(value = "记账日期") + private Date recordDate; + + /** + * 对方科目 + */ + @ExcelProperty(value = "对方科目") + private String oppositeSubject; + + /** + * 业务摘要 + */ + @ExcelProperty(value = "业务摘要") + private String summary; + + /** + * 收入金额(元) + */ + @ExcelProperty(value = "收入金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=") + private BigDecimal incomeAmount; + + /** + * 支出金额(元) + */ + @ExcelProperty(value = "支出金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=") + private BigDecimal expendAmount; + + /** + * 账户余额(元) + */ + @ExcelProperty(value = "账户余额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "元=") + private BigDecimal balance; + + /** + * 封账批次ID(关联accounting_batch表,NULL表示未封账) + */ + @ExcelProperty(value = "封账批次ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联accounting_batch表,NULL表示未封账") + private Long batchId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaAccountingBatchMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaAccountingBatchMapper.java new file mode 100644 index 0000000..5f928f2 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaAccountingBatchMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.oa.domain.OaAccountingBatch; +import com.ruoyi.oa.domain.vo.OaAccountingBatchVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)Mapper接口 + * + * @author Joshi + * @date 2025-09-09 + */ +public interface OaAccountingBatchMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaJournalAccountMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaJournalAccountMapper.java new file mode 100644 index 0000000..92e10e9 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaJournalAccountMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.oa.domain.OaJournalAccount; +import com.ruoyi.oa.domain.vo.OaJournalAccountVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)Mapper接口 + * + * @author Joshi + * @date 2025-09-09 + */ +public interface OaJournalAccountMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaAccountingBatchService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaAccountingBatchService.java new file mode 100644 index 0000000..7a3018e --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaAccountingBatchService.java @@ -0,0 +1,49 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.OaAccountingBatch; +import com.ruoyi.oa.domain.vo.OaAccountingBatchVo; +import com.ruoyi.oa.domain.bo.OaAccountingBatchBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)Service接口 + * + * @author Joshi + * @date 2025-09-09 + */ +public interface IOaAccountingBatchService { + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + OaAccountingBatchVo queryById(Long batchId); + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + TableDataInfo queryPageList(OaAccountingBatchBo bo, PageQuery pageQuery); + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + List queryList(OaAccountingBatchBo bo); + + /** + * 新增封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + Boolean insertByBo(OaAccountingBatchBo bo); + + /** + * 修改封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + Boolean updateByBo(OaAccountingBatchBo bo); + + /** + * 校验并批量删除封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaJournalAccountService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaJournalAccountService.java new file mode 100644 index 0000000..eabd8b8 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaJournalAccountService.java @@ -0,0 +1,49 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.OaJournalAccount; +import com.ruoyi.oa.domain.vo.OaJournalAccountVo; +import com.ruoyi.oa.domain.bo.OaJournalAccountBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)Service接口 + * + * @author Joshi + * @date 2025-09-09 + */ +public interface IOaJournalAccountService { + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + OaJournalAccountVo queryById(Long journalId); + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + TableDataInfo queryPageList(OaJournalAccountBo bo, PageQuery pageQuery); + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + List queryList(OaJournalAccountBo bo); + + /** + * 新增日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + Boolean insertByBo(OaJournalAccountBo bo); + + /** + * 修改日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + Boolean updateByBo(OaJournalAccountBo bo); + + /** + * 校验并批量删除日记账(绑定封账批次,未封账数据batch_id为NULL)信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaAccountingBatchServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaAccountingBatchServiceImpl.java new file mode 100644 index 0000000..16ee848 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaAccountingBatchServiceImpl.java @@ -0,0 +1,113 @@ +package com.ruoyi.oa.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.ruoyi.oa.domain.bo.OaAccountingBatchBo; +import com.ruoyi.oa.domain.vo.OaAccountingBatchVo; +import com.ruoyi.oa.domain.OaAccountingBatch; +import com.ruoyi.oa.mapper.OaAccountingBatchMapper; +import com.ruoyi.oa.service.IOaAccountingBatchService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)Service业务层处理 + * + * @author Joshi + * @date 2025-09-09 + */ +@RequiredArgsConstructor +@Service +public class OaAccountingBatchServiceImpl implements IOaAccountingBatchService { + + private final OaAccountingBatchMapper baseMapper; + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Override + public OaAccountingBatchVo queryById(Long batchId){ + return baseMapper.selectVoById(batchId); + } + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + @Override + public TableDataInfo queryPageList(OaAccountingBatchBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询封账批次(管理每次封账的批次信息,一组封账数据对应一个批次)列表 + */ + @Override + public List queryList(OaAccountingBatchBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OaAccountingBatchBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getBatchName()), OaAccountingBatch::getBatchName, bo.getBatchName()); + lqw.eq(bo.getStartDate() != null, OaAccountingBatch::getStartDate, bo.getStartDate()); + lqw.eq(bo.getEndDate() != null, OaAccountingBatch::getEndDate, bo.getEndDate()); + lqw.eq(StringUtils.isNotBlank(bo.getAccountIds()), OaAccountingBatch::getAccountIds, bo.getAccountIds()); + lqw.eq(bo.getStatus() != null, OaAccountingBatch::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Override + public Boolean insertByBo(OaAccountingBatchBo bo) { + OaAccountingBatch add = BeanUtil.toBean(bo, OaAccountingBatch.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setBatchId(add.getBatchId()); + } + return flag; + } + + /** + * 修改封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Override + public Boolean updateByBo(OaAccountingBatchBo bo) { + OaAccountingBatch update = BeanUtil.toBean(bo, OaAccountingBatch.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OaAccountingBatch entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除封账批次(管理每次封账的批次信息,一组封账数据对应一个批次) + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaJournalAccountServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaJournalAccountServiceImpl.java new file mode 100644 index 0000000..30d5fc4 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaJournalAccountServiceImpl.java @@ -0,0 +1,134 @@ +package com.ruoyi.oa.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.ruoyi.oa.domain.bo.OaJournalAccountBo; +import com.ruoyi.oa.domain.vo.OaJournalAccountVo; +import com.ruoyi.oa.domain.OaJournalAccount; +import com.ruoyi.oa.mapper.OaJournalAccountMapper; +import com.ruoyi.oa.service.IOaJournalAccountService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 日记账(绑定封账批次,未封账数据batch_id为NULL)Service业务层处理 + * + * @author Joshi + * @date 2025-09-09 + */ +@RequiredArgsConstructor +@Service +public class OaJournalAccountServiceImpl implements IOaJournalAccountService { + + private final OaJournalAccountMapper baseMapper; + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Override + public OaJournalAccountVo queryById(Long journalId){ + return baseMapper.selectVoById(journalId); + } + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + @Override + public TableDataInfo queryPageList(OaJournalAccountBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询日记账(绑定封账批次,未封账数据batch_id为NULL)列表 + */ + @Override + public List queryList(OaJournalAccountBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(OaJournalAccountBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getAccountId() != null, OaJournalAccount::getAccountId, bo.getAccountId()); + lqw.eq(bo.getRecordDate() != null, OaJournalAccount::getRecordDate, bo.getRecordDate()); + lqw.eq(StringUtils.isNotBlank(bo.getOppositeSubject()), OaJournalAccount::getOppositeSubject, bo.getOppositeSubject()); + lqw.eq(StringUtils.isNotBlank(bo.getSummary()), OaJournalAccount::getSummary, bo.getSummary()); + lqw.eq(bo.getIncomeAmount() != null, OaJournalAccount::getIncomeAmount, bo.getIncomeAmount()); + lqw.eq(bo.getExpendAmount() != null, OaJournalAccount::getExpendAmount, bo.getExpendAmount()); + lqw.eq(bo.getBalance() != null, OaJournalAccount::getBalance, bo.getBalance()); + lqw.eq(bo.getBatchId() != null, OaJournalAccount::getBatchId, bo.getBatchId()); + return lqw; + } + + /** + * 新增日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Override + public Boolean insertByBo(OaJournalAccountBo bo) { + OaJournalAccount add = BeanUtil.toBean(bo, OaJournalAccount.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setJournalId(add.getJournalId()); + } + return flag; + } + + /** + * 修改日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Override + public Boolean updateByBo(OaJournalAccountBo bo) { + OaJournalAccount update = BeanUtil.toBean(bo, OaJournalAccount.class); + validEntityBeforeSave(update); + // 如果BatchId不为空,说明该批次数据已被封账,不能修改 + OaJournalAccount oaJournalAccount = baseMapper.selectById(update.getJournalId()); + if (oaJournalAccount.getBatchId()!=null) { + throw new ServiceException("该批次数据已被封账,不能进行修改操作"); + } + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(OaJournalAccount entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除日记账(绑定封账批次,未封账数据batch_id为NULL) + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + //如果journalId不为空,说明该批次数据已被封账,不能删除 + // 查询要删除的记录中是否有已封账的数据(batch_id不为null的记录) + List journalAccounts = baseMapper.selectList( + new LambdaQueryWrapper() + .in(OaJournalAccount::getJournalId, ids) + .isNotNull(OaJournalAccount::getBatchId) + ); + + // 如果存在已封账的数据,则不能删除 + if (!journalAccounts.isEmpty()) { + throw new ServiceException("选中的数据中包含已封账记录,不能进行删除操作"); + } + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaAccountingBatchMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaAccountingBatchMapper.xml new file mode 100644 index 0000000..3a598e6 --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaAccountingBatchMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaJournalAccountMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaJournalAccountMapper.xml new file mode 100644 index 0000000..9792600 --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaJournalAccountMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + +