From c1f55991eba19ba8b24552b5b47f84d6e26f608a Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 4 Jul 2024 09:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java | 3 +++ .../sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java | 1 + .../main/resources/mapper/largeScreen/LargeScreenMapper.xml | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java index c430c3aa..082e7f8e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java @@ -20,6 +20,9 @@ public class ParamsDto { /** 结束日期*/ private String endDate; + /** 结束日期*/ + private String date; + /** * 类型 验收1 入库2 * */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index cec081ab..45a03de0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -454,6 +454,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { dto.setType("1"); dto.setStartDate(DateTimeHelper.getFisrtDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); dto.setEndDate(DateTimeHelper.getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); + dto.setDate(year + "-" + month); List> checkList = mapper.getAcceptanceStorage(dto); valueList.add(commonUtil.totalValue(checkList, dto.getMaType())); // 入库数量 diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index f293805a..4c0aad17 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -52,7 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4' LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id - WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') + WHERE DATE_FORMAT(pci.arrival_time, '%Y-%m') = #{date} + AND mt.del_flag = '0' AND sd.dept_name = #{maTypeName} @@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4' LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1' + AND mt.del_flag = '0' AND sd.dept_name = #{maTypeName}