From 75be542bd1083226425ec89688af87d794413a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Thu, 2 Jan 2025 10:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yh/reportProd/domain/ReportProd.java | 4 ++++ .../yh/reportProd/mapper/ReportProdMapper.xml | 20 ++++++++++++++++++- .../service/impl/ReportProdConverterImpl.java | 2 ++ .../domain/ReportUserProdQuery.java | 5 ++++- .../domain/ReportUserProdVO.java | 8 ++++++++ .../mapper/ReportUserProdMapper.xml | 8 +++++++- .../web/yh/ReportUserProdController.java | 2 ++ 7 files changed, 46 insertions(+), 3 deletions(-) diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/domain/ReportProd.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/domain/ReportProd.java index 2348f65..8265a33 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/domain/ReportProd.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/domain/ReportProd.java @@ -102,4 +102,8 @@ public class ReportProd extends BaseEntity @ApiModelProperty("总价") private BigDecimal totalAmount; + @Excel(name = "工序代码") + @ApiModelProperty("工序代码") + private String priceCode; + } diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml index df8005a..a665425 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml @@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" brp.deleted, brp.price_type, brp.remark, + brp.price_code, brp.total_amount, bp.dept_id as price_dept_id, br.status as report_status, @@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and brp.deleted = false and brp.deleted = #{deleted} and br.status = #{query.reportStatus} + and brp.price_code like concat('%', #{query.priceCode}, '%') and brp.report_id in @@ -101,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" price_type, remark, total_amount, + price_code, #{reportId}, @@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{priceType}, #{remark}, #{totalAmount}, + #{priceCode}, @@ -143,7 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" price_quantity_denominator, price_type, remark, - total_amount + total_amount, + price_code ) values @@ -184,6 +189,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" default, #{i.totalAmount}, default, + #{i.priceCode}, + default, @@ -215,6 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" price_type = #{data.priceType}, remark = #{data.remark}, total_amount = #{data.totalAmount}, + price_code = #{data.priceCode}, @@ -400,6 +408,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + WHEN #{item.id} THEN #{item.priceCode} + + + WHEN #{item.id} THEN `price_code` + + + where id in diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdConverterImpl.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdConverterImpl.java index 80625a7..a7ad9ef 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdConverterImpl.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdConverterImpl.java @@ -52,6 +52,7 @@ public class ReportProdConverterImpl implements ReportProdConverter { bo.setPriceType(vo.getPriceType()); bo.setRemark(vo.getRemark()); bo.setDefectNum(vo.getDefectNum()); + bo.setPriceCode(vo.getPriceCode()); bo.setTotalAmount(vo.getPricePrice().multiply(vo.getNum().add(vo.getDefectNum()))); // 用户产量明细 @@ -102,6 +103,7 @@ public class ReportProdConverterImpl implements ReportProdConverter { bo.setPriceType(vo.getPriceType()); bo.setRemark(vo.getRemark()); bo.setDefectNum(vo.getDefectNum()); + bo.setPriceCode(vo.getPriceCode()); bo.setTotalAmount(vo.getPricePrice().multiply(vo.getNum().add(vo.getDefectNum()))); // 用户产量明细 diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdQuery.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdQuery.java index c3bb3e7..f21e870 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdQuery.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdQuery.java @@ -5,7 +5,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; -import java.time.YearMonth; import java.util.List; /** @@ -32,4 +31,8 @@ public class ReportUserProdQuery extends ReportUserProdVO { @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endDate; + @ApiModelProperty("报表日期范围") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private List reportDateRange; + } diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java index 0ce0ee7..2d25afa 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/domain/ReportUserProdVO.java @@ -45,4 +45,12 @@ public class ReportUserProdVO extends ReportUserProd { @Excel(name = "工资(元)") @ApiModelProperty("工资") private BigDecimal totalPrice; + + @Excel(name = "部门") + @ApiModelProperty("部门名称") + private String deptName; + + @Excel(name = "工序代码") + @ApiModelProperty("工序代码") + private String priceCode; } diff --git a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.xml b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.xml index 82f16d0..d963528 100644 --- a/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.xml +++ b/common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportUserProd/mapper/ReportUserProdMapper.xml @@ -22,7 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" brp.report_id as report_id, br.report_date as report_date, br.status as report_status, - brp.price_price * brup.num as total_price + brp.price_price * brup.num as total_price, + brp.price_code as price_code, + sd.dept_name as dept_name from bst_report_user_prod brup left join sys_user su on su.user_id = brup.user_id left join bst_report_prod brp on brp.id = brup.prod_id @@ -48,6 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + and date(br.report_date) >= #{query.reportDateRange[0]} + and date(br.report_date) <= #{query.reportDateRange[1]} + ${query.params.dataScope} diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/yh/ReportUserProdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/yh/ReportUserProdController.java index 0e9ef89..2adc57c 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/yh/ReportUserProdController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/yh/ReportUserProdController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.yh; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -34,6 +35,7 @@ public class ReportUserProdController extends BaseController */ @PreAuthorize("@ss.hasPermi('yh:reportUserProd:list')") @GetMapping("/list") + @DataScope(deptAlias = "sd") public TableDataInfo list(ReportUserProdQuery query) { startPage();