feat(qms): 优化尸体类和controller

-为以下控制器添加了导出模板功能:
  - QcInspectionItemCategoryController
  - QcInspectionItemController
  - QcInspectionItemsController
  - QcInspectionMainController
  - QcInspectionTemplateControlle
  - QcInspectionTypeController
- 导出模板功能允许用户下载无数据的 Excel 模板
- inspectionQty、qualifiedQty、unqualifiedQty将 Integer 改为 BigDecimal
- 移除了部分字段的 NotNull 注解
master
zch 2 days ago
parent f4472d1cf7
commit 599c4f5067

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionItemCategoryController extends BaseController {
ExcelUtil.exportExcel(list, "检测项类别", QcInspectionItemCategoryVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:qcInspectionItemCategory:export")
@Log(title = "检测项类别", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionItemCategoryVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "检测项类别", QcInspectionItemCategoryVo.class, response);
}
/**
*
*

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionItemController extends BaseController {
ExcelUtil.exportExcel(list, "检测项定义", QcInspectionItemVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:qcInspectionItem:export")
@Log(title = "检测项定义", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionItemVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "检测项定义", QcInspectionItemVo.class, response);
}
/**
*
*

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionItemsController extends BaseController {
ExcelUtil.exportExcel(list, "检验项目", QcInspectionItemsVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:inspectionItems:export")
@Log(title = "检验项目", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionItemsVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "检验项目", QcInspectionItemsVo.class, response);
}
/**
*
*

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionMainController extends BaseController {
ExcelUtil.exportExcel(list, "质检主表", QcInspectionMainVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:QcInspectionMain:export")
@Log(title = "质检主表", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionMainVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "质检结果", QcInspectionMainVo.class, response);
}
/**
*
*

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionTemplateController extends BaseController {
ExcelUtil.exportExcel(list, "检测模板主", QcInspectionTemplateVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:qcInspectionTemplate:export")
@Log(title = "检测模板主", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionTemplateVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "检测模板", QcInspectionTemplateVo.class, response);
}
/**
*
*

@ -1,5 +1,6 @@
package org.dromara.qms.controller;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
@ -57,6 +58,17 @@ public class QcInspectionTypeController extends BaseController {
ExcelUtil.exportExcel(list, "检测类型", QcInspectionTypeVo.class, response);
}
/**
*
*/
@SaCheckPermission("qms:qcInspectionType:export")
@Log(title = "检测类型", businessType = BusinessType.EXPORT)
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
List<QcInspectionTypeVo> list = new ArrayList<>();
ExcelUtil.exportExcel(list, "检测类型", QcInspectionTypeVo.class, response);
}
/**
*
*

@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -62,17 +64,17 @@ public class QcInspectionMain extends TenantEntity {
/**
*
*/
private Integer inspectionQty;
private BigDecimal inspectionQty;
/**
*
*/
private Integer qualifiedQty;
private BigDecimal qualifiedQty;
/**
*
*/
private Integer unqualifiedQty;
private BigDecimal unqualifiedQty;
/**
* 0/1

@ -23,7 +23,7 @@ public class QcInspectionItemBo extends BaseEntity {
/**
*
*/
@NotNull(message = "检测项主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "检测项主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long itemId;
/**

@ -23,7 +23,7 @@ public class QcInspectionItemCategoryBo extends BaseEntity {
/**
*
*/
@NotNull(message = "检测项类别主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "检测项类别主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long categoryId;
/**

@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@ -25,7 +27,7 @@ public class QcInspectionMainBo extends BaseEntity {
/**
*
*/
@NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long inspectionId;
/**
@ -61,17 +63,17 @@ public class QcInspectionMainBo extends BaseEntity {
/**
*
*/
private Integer inspectionQty;
private BigDecimal inspectionQty;
/**
*
*/
private Integer qualifiedQty;
private BigDecimal qualifiedQty;
/**
*
*/
private Integer unqualifiedQty;
private BigDecimal unqualifiedQty;
/**
* 0/1

@ -24,7 +24,7 @@ public class QcInspectionResultBo extends BaseEntity {
/**
*
*/
@NotNull(message = "结果主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "结果主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long resultId;
/**

@ -23,7 +23,7 @@ public class QcInspectionTemplateBo extends BaseEntity {
/**
*
*/
@NotNull(message = "模板主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "模板主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long templateId;
/**

@ -23,7 +23,7 @@ public class QcInspectionTypeBo extends BaseEntity {
/**
*
*/
@NotNull(message = "检测类型主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "检测类型主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long typeId;
/**

@ -24,7 +24,7 @@ public class QcTemplateItemBo extends BaseEntity {
/**
*
*/
@NotNull(message = "模板子表主键不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotNull(message = "模板子表主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long templateItemId;
/**

@ -1,5 +1,6 @@
package org.dromara.qms.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.qms.domain.QcInspectionMain;
@ -22,6 +23,7 @@ import java.util.Date;
* @author zch
* @date 2025-07-14
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = QcInspectionMain.class)
@ -76,19 +78,19 @@ public class QcInspectionMainVo implements Serializable {
*
*/
@ExcelProperty(value = "质检数量")
private Integer inspectionQty;
private BigDecimal inspectionQty;
/**
*
*/
@ExcelProperty(value = "合格数")
private Integer qualifiedQty;
private BigDecimal qualifiedQty;
/**
*
*/
@ExcelProperty(value = "不合格数")
private Integer unqualifiedQty;
private BigDecimal unqualifiedQty;
/**
* 0/1

Loading…
Cancel
Save