From 892e5a07fcf11f6acfd813d7be182c1f84d161cf Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 4 Jun 2025 16:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=B4=BB=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkOrderBaohuoController.java | 19 +++++++++++-------- .../pay/domain/bo/PayWorkOrderBaohuoBo.java | 1 + .../ruoyi/pay/domain/vo/ExportBaohuoVo.java | 2 ++ .../pay/domain/vo/PayWorkOrderBaohuoVo.java | 4 ++-- .../pay/mapper/PayWorkOrderBaohuoMapper.java | 3 ++- .../service/IPayWorkOrderBaohuoService.java | 3 ++- .../impl/PayWorkOrderBaohuoServiceImpl.java | 4 ++-- .../mapper/pay/PayWorkOrderBaohuoMapper.xml | 9 +++++++-- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java index 5153e72..cc864fb 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayWorkOrderBaohuoController.java @@ -2,14 +2,14 @@ package com.ruoyi.pay.controller; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Arrays; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.concurrent.TimeUnit; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.pay.domain.PaySalaryReport; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -69,7 +69,7 @@ public class PayWorkOrderBaohuoController extends BaseController { @GetMapping("/sum") public R> sum(@RequestParam(name = "date")String date, @RequestParam(name = "deptId", required = false) Long deptId, - @RequestParam(name = "tenantId", required = true) Long tenantId + @RequestParam(name = "tenantId") Long tenantId ) { return iPayWorkOrderBaohuoService.baohuoSum(date, deptId,tenantId); } @@ -80,13 +80,16 @@ public class PayWorkOrderBaohuoController extends BaseController { @SaCheckPermission("pay:workOrderBaohuo:export") @Log(title = "包活派工单", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(PayWorkOrderBaohuoBo bo, HttpServletResponse response) { - List list = iPayWorkOrderBaohuoService.getWorkOrderListByDate(bo.getExportDate()); + public void export(@RequestParam(name = "exportDate") String exportDate, + @RequestParam(name = "tenantId") Long tenantId, HttpServletResponse response) throws ParseException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + Date exportDate1 = sdf.parse(exportDate); + List list = iPayWorkOrderBaohuoService.getWorkOrderListByDate(tenantId,exportDate1); list.stream().parallel().forEach(vo -> { vo.setAvgAmount(vo.getAmount().divide(new BigDecimal(vo.getWorkerNum()), 2, RoundingMode.HALF_UP)); vo.setWorkTime(vo.getWorkTime().divide(new BigDecimal(vo.getWorkerNum()), 2,RoundingMode.HALF_UP)); }); - ExcelUtil.exportExcel(list, "包活派工单", PayWorkOrderBaohuoVo.class, response); + ExcelUtil.exportExcel(list, "包活派工单", ExportBaohuoVo.class, response); } /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java index 75e3d23..0b9a19b 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java @@ -181,6 +181,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { private String workDate; // 导出日期 + @JsonFormat(pattern = "yyyy-MM") private Date exportDate; private ArrayList woids; // 待查询的工单ID集合 diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java index 4cd6ad8..02c8d99 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java @@ -1,5 +1,7 @@ package com.ruoyi.pay.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.converters.localdate.LocalDateDateConverter; import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; import java.util.Date; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java index c3c7dd9..ab197f4 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/PayWorkOrderBaohuoVo.java @@ -165,8 +165,8 @@ public class PayWorkOrderBaohuoVo { /** * 删除标志（0-可用 1-删除） */ - @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=-可用,1=-删除") + // @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + // @ExcelDictFormat(readConverterExp = "0=-可用,1=-删除") private Integer deleted; /** diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java index 590e23b..5618962 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayWorkOrderBaohuoMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.pay.mapper; import com.ruoyi.pay.domain.PayWorkOrderBaohuo; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import com.ruoyi.pay.domain.vo.PayWorkOrderBaohuoVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Delete; @@ -27,7 +28,7 @@ public interface PayWorkOrderBaohuoMapper extends BaseMapperPlus getWorkOrderListByDate(Date exportDate); + List getWorkOrderListByDate(@Param("tenantId")Long tenantId, @Param("exportDate")Date exportDate); HashSet getWoIdSet(@Param("workDate")String workDate, @Param("empId") Long empId); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java index 0853e2a..c2df8ee 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/IPayWorkOrderBaohuoService.java @@ -3,6 +3,7 @@ package com.ruoyi.pay.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.pay.domain.PaySalaryReport; import com.ruoyi.pay.domain.PayWorkOrderBaohuo; +import com.ruoyi.pay.domain.vo.ExportBaohuoVo; import com.ruoyi.pay.domain.vo.PayWorkOrderBaohuoVo; import com.ruoyi.pay.domain.bo.PayWorkOrderBaohuoBo; import com.ruoyi.common.core.page.TableDataInfo; @@ -53,7 +54,7 @@ public interface IPayWorkOrderBaohuoService { R> baohuoSum(String date, Long deptId,Long tenantId); - List getWorkOrderListByDate(Date exportDate); + List getWorkOrderListByDate(Long tenantId, Date exportDate); HashSet getWoIdSet(String workDate, Long empId); } diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java index 5ff209e..516e07c 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java @@ -611,8 +611,8 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService } @Override - public List getWorkOrderListByDate(Date exportDate) { - return sgrWorkOrderBaohuoMapper.getWorkOrderListByDate(exportDate); + public List getWorkOrderListByDate(Long tenantId,Date exportDate) { + return sgrWorkOrderBaohuoMapper.getWorkOrderListByDate(tenantId,exportDate); } @Override diff --git a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml b/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml index d111bdf..cdbef20 100644 --- a/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml +++ b/ruoyi-pay/src/main/resources/mapper/pay/PayWorkOrderBaohuoMapper.xml @@ -48,14 +48,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT b.instorage_time, b.`name`, a.product_name,b.content,a.unit,a.product_num,a.price,a.amount,a.wo_id, (SELECT count(*) FROM pay_baohuo_employee WHERE wo_id = b.id) as worker_num, (SELECT sum(valid_hours) FROM pay_baohuo_worktime WHERE wo_id = b.id) AS work_time, (SELECT GROUP_CONCAT(emp_name) FROM pay_baohuo_employee WHERE wo_id = b.id) AS works_name FROM pay_baohuo_product a LEFT JOIN pay_work_order_baohuo b ON a.wo_id = b.id - WHERE date_format(#{exportDate},'%y%m') = date_format(b.instorage_time,'%y%m') + + + date_format(#{exportDate},'%y-%m') = date_format(b.instorage_time,'%y-%m') + + and b.tenant_id=#{tenantId} + ORDER BY a.wo_id ASC