From 388325473527f7c9aefe496bf13e04590cf2d7a8 Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 4 Jun 2025 12:28:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8C=85=E6=B4=BB=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=97=B6=E6=B7=BB=E5=8A=A0=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/pay/domain/PayBaohuoProduct.java | 12 ++++++++ .../pay/domain/bo/PayBaohuoProductBo.java | 29 +++++++++++++++---- .../pay/domain/vo/PayBaohuoProductVo.java | 16 ++++++++++ .../impl/PayBaohuoProductServiceImpl.java | 3 ++ 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoProduct.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoProduct.java index af7b98c..a5c6d6d 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoProduct.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayBaohuoProduct.java @@ -68,5 +68,17 @@ public class PayBaohuoProduct extends BaseEntity { * 单位-字典 */ private String unit; + /** + * 工序 + */ + private String process; + /** + * 原材料 + */ + private String productMaterial; + /** + * 产品规格 + */ + private String productSpecification; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayBaohuoProductBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayBaohuoProductBo.java index e83893b..b07c85a 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayBaohuoProductBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayBaohuoProductBo.java @@ -25,7 +25,7 @@ public class PayBaohuoProductBo extends BaseEntity { /** * 主键ID */ - @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) private Long id; /** @@ -37,7 +37,7 @@ public class PayBaohuoProductBo extends BaseEntity { /** * 产品ID */ - @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long productId; /** @@ -55,7 +55,7 @@ public class PayBaohuoProductBo extends BaseEntity { /** * 加工数量 */ - @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "加工数量不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal productNum; /** @@ -73,20 +73,37 @@ public class PayBaohuoProductBo extends BaseEntity { /** * 总金额 */ - @NotNull(message = "总金额不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "总金额不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal amount; /** * 单价 */ - @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal price; /** * 单位-字典 */ - @NotBlank(message = "单位-字典不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "单位-字典不能为空", groups = { AddGroup.class, EditGroup.class }) private String unit; + /** + * 工序 + */ + // @NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class }) + private String process; + + /** + * 原材料 + */ + // @NotBlank(message = "原材料不能为空", groups = { AddGroup.class, EditGroup.class }) + private String productMaterial; + + /** + * 产品规格 + */ + // @NotBlank(message = "产品规格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String productSpecification; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayBaohuoProductVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayBaohuoProductVo.java index 228af36..ea5130f 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayBaohuoProductVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayBaohuoProductVo.java @@ -88,5 +88,21 @@ public class PayBaohuoProductVo { @ExcelProperty(value = "单位-字典") private String unit; + /** + * 工序 + */ + @ExcelProperty(value = "工序") + private String process; + /** + * 原材料 + */ + @ExcelProperty(value = "原材料") + private String productMaterial; + + /** + * 产品规格 + */ + @ExcelProperty(value = "产品规格") + private String productSpecification; } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoProductServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoProductServiceImpl.java index 9772ae4..55cfca3 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoProductServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayBaohuoProductServiceImpl.java @@ -71,6 +71,9 @@ public class PayBaohuoProductServiceImpl implements IPayBaohuoProductService { lqw.eq(bo.getAmount() != null, PayBaohuoProduct::getAmount, bo.getAmount()); lqw.eq(bo.getPrice() != null, PayBaohuoProduct::getPrice, bo.getPrice()); lqw.eq(StringUtils.isNotBlank(bo.getUnit()), PayBaohuoProduct::getUnit, bo.getUnit()); + lqw.eq(StringUtils.isNotBlank(bo.getProcess()), PayBaohuoProduct::getProcess, bo.getProcess()); + lqw.eq(StringUtils.isNotBlank(bo.getProductMaterial()), PayBaohuoProduct::getProductMaterial, bo.getProductMaterial()); + lqw.eq(StringUtils.isNotBlank(bo.getProductSpecification()), PayBaohuoProduct::getProductSpecification, bo.getProductSpecification()); return lqw; } From 0564d651c65b66a0e633ddd60a5a7d8530442e6d Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 4 Jun 2025 13:47:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/domain/bo/PaySalaryReportBo.java | 44 +++++++++---------- .../mapper/pay/PaySalaryReportMapper.xml | 11 +++-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySalaryReportBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySalaryReportBo.java index 0bc2e42..33ddd58 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySalaryReportBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PaySalaryReportBo.java @@ -25,7 +25,7 @@ public class PaySalaryReportBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键不能为空", groups = { EditGroup.class }) private Long id; /** @@ -85,97 +85,97 @@ public class PaySalaryReportBo extends BaseEntity { /** * 实际出勤小时数 */ - @NotNull(message = "实际出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "实际出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal actuallyHours; /** * 出勤工时 */ - @NotNull(message = "出勤工时不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "出勤工时不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal dayWorkHours; /** * 包活工时 */ - @NotNull(message = "包活工时不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "包活工时不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal workOrderHours; /** * 加班工时 */ - @NotNull(message = "加班工时不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "加班工时不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal overtimeWorkHours; /** *  日工帮工工时 */ - @NotNull(message = " 日工帮工工时不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = " 日工帮工工时不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal rigongHelpHours; /** * 日工工资 */ - @NotNull(message = "日工工资不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "日工工资不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal dayWorkPay; /** * 包活工资 */ - @NotNull(message = "包活工资不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "包活工资不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal workOrderPay; /** * 加班工资 */ - @NotNull(message = "加班工资不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "加班工资不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal overtime; /** * 帮工工资 */ - @NotNull(message = "帮工工资不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "帮工工资不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal banggongPay; /** * 值班/拉货工资 废弃 */ - @NotNull(message = "值班/拉货工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "值班/拉货工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal zhibanOrLahuo; /** * 节假日工资 废弃 */ - @NotNull(message = "节假日工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "节假日工资 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal holiday; /** * 岗位津贴 废弃 */ - @NotNull(message = "岗位津贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "岗位津贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal post; /** * 话费及其他补贴 废弃 */ - @NotNull(message = "话费及其他补贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "话费及其他补贴 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal phoneCharge; /** * 合同补 废弃 */ - @NotNull(message = "合同补 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "合同补 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal contract; /** * 全勤奖 废弃 */ - @NotNull(message = "全勤奖 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "全勤奖 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal fullTime; /** * 上月差异 废弃 */ - @NotNull(message = "上月差异 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "上月差异 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal diffOfLastMonth; /** @@ -187,13 +187,13 @@ public class PaySalaryReportBo extends BaseEntity { /** * 扣款忘刷迟到 废弃 */ - @NotNull(message = "扣款忘刷迟到 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "扣款忘刷迟到 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal late; /** * 扣款保险/党费 废弃 */ - @NotNull(message = "扣款保险/党费 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "扣款保险/党费 废弃不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal insurance; /** @@ -205,19 +205,19 @@ public class PaySalaryReportBo extends BaseEntity { /** * 员工补贴对象 */ - @NotBlank(message = "员工补贴对象不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "员工补贴对象不能为空", groups = { AddGroup.class, EditGroup.class }) private String allButieData; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String note; /** * 员工工资是否可查 */ - @NotNull(message = "员工工资是否可查不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "员工工资是否可查不能为空", groups = { AddGroup.class, EditGroup.class }) private Long empQuery; diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PaySalaryReportMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PaySalaryReportMapper.xml index a77e590..8a792b1 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PaySalaryReportMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PaySalaryReportMapper.xml @@ -42,8 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"