From 8ae7cd430ff9ddb57a8fa86b687caf046d9ccb0a Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 4 Jul 2024 15:22:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BA=8C=E7=BA=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=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 21594af7..321b6d0a 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 @@ -19,6 +19,9 @@ public class ParamsDto { /** 结束日期*/ private String endDate; + /** 结束日期*/ + private String date; + /** 类型*/ private String type; 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 e3f4f699..9f577c41 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 @@ -199,6 +199,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { String month = date.substring(5, 7); // 验收数量 dto.setType("1"); + dto.setDate(year + "-" + month); dto.setStartDate(DateTimeHelper.getFisrtDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); dto.setEndDate(DateTimeHelper.getLastDayOfMonth(Integer.parseInt(year), Integer.parseInt(month))); List> checkList = mapper.getAcceptanceStorage(dto); 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 565d38e7..f2f16a4f 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}