From e211b113496f986d9fb4ee0a366d26a35392affd Mon Sep 17 00:00:00 2001 From: tiezx Date: Fri, 18 Jul 2025 16:52:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=AC=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/QsBatchController.java | 106 ++++++++++++++++ .../net/ferrum/business/domain/QsBatch.java | 59 +++++++++ .../ferrum/business/domain/bo/QsBatchBo.java | 66 ++++++++++ .../ferrum/business/domain/vo/QsBatchVo.java | 65 ++++++++++ .../ferrum/business/mapper/QsBatchMapper.java | 15 +++ .../business/service/IQsBatchService.java | 48 ++++++++ .../service/impl/QsBatchServiceImpl.java | 116 ++++++++++++++++++ .../mapper/business/QsBatchMapper.xml | 23 ++++ 8 files changed, 498 insertions(+) create mode 100644 quotation-admin/src/main/java/net/ferrum/web/controller/business/QsBatchController.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/domain/QsBatch.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/domain/bo/QsBatchBo.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/domain/vo/QsBatchVo.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/mapper/QsBatchMapper.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/service/IQsBatchService.java create mode 100644 quotation-system/src/main/java/net/ferrum/business/service/impl/QsBatchServiceImpl.java create mode 100644 quotation-system/src/main/resources/mapper/business/QsBatchMapper.xml diff --git a/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsBatchController.java b/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsBatchController.java new file mode 100644 index 0000000..f37da36 --- /dev/null +++ b/quotation-admin/src/main/java/net/ferrum/web/controller/business/QsBatchController.java @@ -0,0 +1,106 @@ +package net.ferrum.web.controller.business; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import net.ferrum.common.annotation.RepeatSubmit; +import net.ferrum.common.annotation.Log; +import net.ferrum.common.core.controller.BaseController; +import net.ferrum.common.core.domain.PageQuery; +import net.ferrum.common.core.domain.R; +import net.ferrum.common.core.validate.AddGroup; +import net.ferrum.common.core.validate.EditGroup; +import net.ferrum.common.enums.BusinessType; +import net.ferrum.common.utils.poi.ExcelUtil; +import net.ferrum.business.domain.vo.QsBatchVo; +import net.ferrum.business.domain.bo.QsBatchBo; +import net.ferrum.business.service.IQsBatchService; +import net.ferrum.common.core.page.TableDataInfo; + +/** + * 批次管理 + * + * @author tiezx + * @date 2025-07-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/business/batch") +public class QsBatchController extends BaseController { + + private final IQsBatchService iQsBatchService; + + /** + * 查询批次管理列表 + */ + @SaCheckPermission("business:batch:list") + @GetMapping("/list") + public TableDataInfo list(QsBatchBo bo, PageQuery pageQuery) { + return iQsBatchService.queryPageList(bo, pageQuery); + } + + /** + * 导出批次管理列表 + */ + @SaCheckPermission("business:batch:export") + @Log(title = "批次管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(QsBatchBo bo, HttpServletResponse response) { + List list = iQsBatchService.queryList(bo); + ExcelUtil.exportExcel(list, "批次管理", QsBatchVo.class, response); + } + + /** + * 获取批次管理详细信息 + * + * @param batchId 主键 + */ + @SaCheckPermission("business:batch:query") + @GetMapping("/{batchId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long batchId) { + return R.ok(iQsBatchService.queryById(batchId)); + } + + /** + * 新增批次管理 + */ + @SaCheckPermission("business:batch:add") + @Log(title = "批次管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody QsBatchBo bo) { + return toAjax(iQsBatchService.insertByBo(bo)); + } + + /** + * 修改批次管理 + */ + @SaCheckPermission("business:batch:edit") + @Log(title = "批次管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody QsBatchBo bo) { + return toAjax(iQsBatchService.updateByBo(bo)); + } + + /** + * 删除批次管理 + * + * @param batchIds 主键串 + */ + @SaCheckPermission("business:batch:remove") + @Log(title = "批次管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{batchIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] batchIds) { + return toAjax(iQsBatchService.deleteWithValidByIds(Arrays.asList(batchIds), true)); + } +} diff --git a/quotation-system/src/main/java/net/ferrum/business/domain/QsBatch.java b/quotation-system/src/main/java/net/ferrum/business/domain/QsBatch.java new file mode 100644 index 0000000..b2aaeb9 --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/domain/QsBatch.java @@ -0,0 +1,59 @@ +package net.ferrum.business.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +import net.ferrum.common.core.domain.BaseEntity; + +/** + * 批次管理对象 qs_batch + * + * @author tiezx + * @date 2025-07-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("qs_batch") +public class QsBatch extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 批次ID + */ + @TableId(value = "batch_id") + private Long batchId; + /** + * 批次编号 + */ + private String batchNo; + /** + * 批次名称 + */ + private String batchName; + /** + * 开始时间 + */ + private Date batchStartDate; + /** + * 计划结束时间 + */ + private Date batchPlanEndDate; + /** + * 结束日期 + */ + private Date batchEndDate; + /** + * 删除标志（0代表存在 2代表删除） + */ + @TableLogic + private String delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/quotation-system/src/main/java/net/ferrum/business/domain/bo/QsBatchBo.java b/quotation-system/src/main/java/net/ferrum/business/domain/bo/QsBatchBo.java new file mode 100644 index 0000000..b9e239f --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/domain/bo/QsBatchBo.java @@ -0,0 +1,66 @@ +package net.ferrum.business.domain.bo; + +import net.ferrum.common.core.validate.AddGroup; +import net.ferrum.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import net.ferrum.common.core.domain.BaseEntity; + +/** + * 批次管理业务对象 qs_batch + * + * @author tiezx + * @date 2025-07-18 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class QsBatchBo extends BaseEntity { + + /** + * 批次ID + */ + @NotNull(message = "批次ID不能为空", groups = { EditGroup.class }) + private Long batchId; + + /** + * 批次编号 + */ + @NotBlank(message = "批次编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String batchNo; + + /** + * 批次名称 + */ + @NotBlank(message = "批次名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String batchName; + + /** + * 开始时间 + */ + @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date batchStartDate; + + /** + * 计划结束时间 + */ + @NotNull(message = "计划结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date batchPlanEndDate; + + /** + * 结束日期 + */ + private Date batchEndDate; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/quotation-system/src/main/java/net/ferrum/business/domain/vo/QsBatchVo.java b/quotation-system/src/main/java/net/ferrum/business/domain/vo/QsBatchVo.java new file mode 100644 index 0000000..e49ff8c --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/domain/vo/QsBatchVo.java @@ -0,0 +1,65 @@ +package net.ferrum.business.domain.vo; + +import java.util.Date; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + + +/** + * 批次管理视图对象 qs_batch + * + * @author tiezx + * @date 2025-07-18 + */ +@Data +@ExcelIgnoreUnannotated +public class QsBatchVo { + + private static final long serialVersionUID = 1L; + + /** + * 批次ID + */ + @ExcelProperty(value = "批次ID") + private Long batchId; + + /** + * 批次编号 + */ + @ExcelProperty(value = "批次编号") + private String batchNo; + + /** + * 批次名称 + */ + @ExcelProperty(value = "批次名称") + private String batchName; + + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + private Date batchStartDate; + + /** + * 计划结束时间 + */ + @ExcelProperty(value = "计划结束时间") + private Date batchPlanEndDate; + + /** + * 结束日期 + */ + @ExcelProperty(value = "结束日期") + private Date batchEndDate; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/quotation-system/src/main/java/net/ferrum/business/mapper/QsBatchMapper.java b/quotation-system/src/main/java/net/ferrum/business/mapper/QsBatchMapper.java new file mode 100644 index 0000000..570e325 --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/mapper/QsBatchMapper.java @@ -0,0 +1,15 @@ +package net.ferrum.business.mapper; + +import net.ferrum.business.domain.QsBatch; +import net.ferrum.business.domain.vo.QsBatchVo; +import net.ferrum.common.core.mapper.BaseMapperPlus; + +/** + * 批次管理Mapper接口 + * + * @author tiezx + * @date 2025-07-18 + */ +public interface QsBatchMapper extends BaseMapperPlus { + +} diff --git a/quotation-system/src/main/java/net/ferrum/business/service/IQsBatchService.java b/quotation-system/src/main/java/net/ferrum/business/service/IQsBatchService.java new file mode 100644 index 0000000..0402693 --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/service/IQsBatchService.java @@ -0,0 +1,48 @@ +package net.ferrum.business.service; + +import net.ferrum.business.domain.vo.QsBatchVo; +import net.ferrum.business.domain.bo.QsBatchBo; +import net.ferrum.common.core.page.TableDataInfo; +import net.ferrum.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 批次管理Service接口 + * + * @author tiezx + * @date 2025-07-18 + */ +public interface IQsBatchService { + + /** + * 查询批次管理 + */ + QsBatchVo queryById(Long batchId); + + /** + * 查询批次管理列表 + */ + TableDataInfo queryPageList(QsBatchBo bo, PageQuery pageQuery); + + /** + * 查询批次管理列表 + */ + List queryList(QsBatchBo bo); + + /** + * 新增批次管理 + */ + Boolean insertByBo(QsBatchBo bo); + + /** + * 修改批次管理 + */ + Boolean updateByBo(QsBatchBo bo); + + /** + * 校验并批量删除批次管理信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/quotation-system/src/main/java/net/ferrum/business/service/impl/QsBatchServiceImpl.java b/quotation-system/src/main/java/net/ferrum/business/service/impl/QsBatchServiceImpl.java new file mode 100644 index 0000000..cb9a7e7 --- /dev/null +++ b/quotation-system/src/main/java/net/ferrum/business/service/impl/QsBatchServiceImpl.java @@ -0,0 +1,116 @@ +package net.ferrum.business.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import net.ferrum.common.utils.StringUtils; +import net.ferrum.common.core.page.TableDataInfo; +import net.ferrum.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 net.ferrum.business.domain.bo.QsBatchBo; +import net.ferrum.business.domain.vo.QsBatchVo; +import net.ferrum.business.domain.QsBatch; +import net.ferrum.business.mapper.QsBatchMapper; +import net.ferrum.business.service.IQsBatchService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 批次管理Service业务层处理 + * + * @author tiezx + * @date 2025-07-18 + */ +@RequiredArgsConstructor +@Service +public class QsBatchServiceImpl implements IQsBatchService { + + private final QsBatchMapper baseMapper; + + /** + * 查询批次管理 + */ + @Override + public QsBatchVo queryById(Long batchId){ + return baseMapper.selectVoById(batchId); + } + + /** + * 查询批次管理列表 + */ + @Override + public TableDataInfo queryPageList(QsBatchBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询批次管理列表 + */ + @Override + public List queryList(QsBatchBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(QsBatchBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), QsBatch::getBatchNo, bo.getBatchNo()); + lqw.like(StringUtils.isNotBlank(bo.getBatchName()), QsBatch::getBatchName, bo.getBatchName()); + lqw.between(params.get("beginBatchStartDate") != null && params.get("endBatchStartDate") != null, + QsBatch::getBatchStartDate ,params.get("beginBatchStartDate"), params.get("endBatchStartDate")); + lqw.between(params.get("beginBatchPlanEndDate") != null && params.get("endBatchPlanEndDate") != null, + QsBatch::getBatchPlanEndDate ,params.get("beginBatchPlanEndDate"), params.get("endBatchPlanEndDate")); + lqw.between(params.get("beginBatchEndDate") != null && params.get("endBatchEndDate") != null, + QsBatch::getBatchEndDate ,params.get("beginBatchEndDate"), params.get("endBatchEndDate")); + return lqw; + } + + /** + * 新增批次管理 + */ + @Override + public Boolean insertByBo(QsBatchBo bo) { + QsBatch add = BeanUtil.toBean(bo, QsBatch.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setBatchId(add.getBatchId()); + } + return flag; + } + + /** + * 修改批次管理 + */ + @Override + public Boolean updateByBo(QsBatchBo bo) { + QsBatch update = BeanUtil.toBean(bo, QsBatch.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(QsBatch entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除批次管理 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/quotation-system/src/main/resources/mapper/business/QsBatchMapper.xml b/quotation-system/src/main/resources/mapper/business/QsBatchMapper.xml new file mode 100644 index 0000000..e038155 --- /dev/null +++ b/quotation-system/src/main/resources/mapper/business/QsBatchMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + +