From c4714a3e9ecc6fd48260e5ab9963a09bc43ad43a Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 13 八月 2024 16:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
index c2ea144..6feafc7 100644
--- a/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
+++ b/src/main/java/com/product/administration/service/WorkAttendanceKanbanService.java
@@ -149,7 +149,7 @@
StringBuilder sb=new StringBuilder();
List<Object> param=new ArrayList<>();
- sb.append(" SELECT a.punch_date,e.bk, ");
+ sb.append(" SELECT a.punch_date,e.bk,f.morning_work,f.morning_work_off,f.afternoon_work,f.afternoon_work_off, ");
sb.append(" CONCAT(if(d.punch_range_one is not null and d.punch_range_one>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
sb.append(" ,',',if(d.punch_range_two is not null and d.punch_range_two>f.distance,'瓒呭嚭鎵撳崱鑼冨洿',0) ");
@@ -193,10 +193,10 @@
if (!bk.contains("1")){
fs.setValue("result_one", "涓婂崍涓婄彮鏈墦鍗�");
}
- if (!bk.contains("2")){
+ if (!bk.contains("2")&&!StringUtils.isEmpty(fs.getString("morning_work_off"))){
fs.setValue("result_two", "涓婂崍涓嬬彮鏈墦鍗�");
}
- if (!bk.contains("3")){
+ if (!bk.contains("3")&&!StringUtils.isEmpty(fs.getString("afternoon_work"))){
fs.setValue("result_three", "涓嬪崍涓婄彮鏈墦鍗�");
}
if (!bk.contains("4")){
--
Gitblit v1.9.2