From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 52783f9..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
@@ -56,7 +56,7 @@
@Override
public Map<String, Object> selectAuxiliaryCorrectionHours(Page page, AuxiliaryCorrectionHoursDto auxiliaryCorrectionHoursDto) {
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = null;
+ List<Integer> ids = new ArrayList<>();
map.put("head", PrintChina.printChina(AuxiliaryCorrectionHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryCorrectionHours");
@@ -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