From d489e329d2fd9f153bcb475a2167da87d76ec29f Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 18 十二月 2024 09:30:52 +0800 Subject: [PATCH] 统计检测项目修改 --- performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java index d91c8f0..4eb65ab 100644 --- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java +++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java @@ -96,6 +96,9 @@ } } } + if (ids.size()==0){ + ids=null; + } map.put("body", auxiliaryCorrectionHoursMapper.selectAuxiliaryCorrectionHours(page, QueryWrappers.queryWrappers(auxiliaryCorrectionHoursDto).eq("month", auxiliaryCorrectionHoursDto.getMonth()), ids)); return map; } @@ -115,7 +118,7 @@ throw new RuntimeException("绯荤粺娌℃湁鏌ュ埌" + auxiliaryCorrectionHoursDto.getName() + "杩欎釜鐢ㄦ埛淇℃伅!"); } String regex = "\\d{4}-\\d{2}"; - if (Pattern.matches(regex,auxiliaryCorrectionHours.getMonth())) { + if (!Pattern.matches(regex,auxiliaryCorrectionHoursDto.getMonth())) { throw new RuntimeException(auxiliaryCorrectionHoursDto.getMonth() + "鏍煎紡涓嶆纭�,鏈堜唤鏍煎紡搴斾负yyyy-MM"); } BeanUtils.copyProperties(auxiliaryCorrectionHoursDto, auxiliaryCorrectionHours); -- Gitblit v1.9.3