From 3b0d3b5f44be0955b4dd14f12361a35c78d03ed3 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Fri, 28 Mar 2025 13:41:42 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8C=80=EC=B2=B4=EA=B3=B5=ED=9C=B4?= =?UTF-8?q?=EC=9D=BC(~~~~)->=EB=8C=80=EC=B2=B4=EA=B3=B5=ED=9C=B4=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/company/localhost/service/localvacaService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java index f7b9493..d4c4dcb 100644 --- a/src/main/java/io/company/localhost/service/localvacaService.java +++ b/src/main/java/io/company/localhost/service/localvacaService.java @@ -228,7 +228,12 @@ public class localvacaService { dto.put("date", locdateStr); // 변환 불가능한 경우 원본 저장 } - dto.put("name", item.get("dateName")); + String dateName = String.valueOf(item.get("dateName")); + if (dateName.contains("대체공휴일")) { + dto.put("name", "대체공휴일"); + } else { + dto.put("name", dateName); + } return dto; } From e45273a9b3dbfc415b1b47abba8c3273b45379b5 Mon Sep 17 00:00:00 2001 From: ckx6954 Date: Fri, 28 Mar 2025 15:42:18 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localhost/common/config/mybatis/TransactionConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/company/localhost/common/config/mybatis/TransactionConfig.java b/src/main/java/io/company/localhost/common/config/mybatis/TransactionConfig.java index ac038f0..420a440 100644 --- a/src/main/java/io/company/localhost/common/config/mybatis/TransactionConfig.java +++ b/src/main/java/io/company/localhost/common/config/mybatis/TransactionConfig.java @@ -89,7 +89,7 @@ public class TransactionConfig { // naming 설정 txAttributes.setProperty("select*", readOnlyAttribute.toString()); - txAttributes.setProperty("*NewTx*", newTxAttribute.toString()); + txAttributes.setProperty("insert*", newTxAttribute.toString()); txAttributes.setProperty("*NestedTx*", nestedTxAttribute.toString()); txAttributes.setProperty("*", writeTxAttribute.toString()); From 436a4fc49b816e05b60c0dbed0afe5e297e24115 Mon Sep 17 00:00:00 2001 From: yoon Date: Mon, 31 Mar 2025 12:48:22 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=B6=9C=ED=87=B4=EA=B7=BC=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/CommutersMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/CommutersMapper.xml b/src/main/resources/mapper/CommutersMapper.xml index 5234d62..bd21305 100644 --- a/src/main/resources/mapper/CommutersMapper.xml +++ b/src/main/resources/mapper/CommutersMapper.xml @@ -46,8 +46,10 @@ m.MEMBERNAM AS memberName, m.MEMBERPRF AS profile, p.PROJCTNAM, + p.PROJCTARR AS projectAddress, cc.CMNCODNAM AS projctcolor, p2.PROJCTNAM AS leaveProjectName, + p2.PROJCTARR AS leaveProjectAddress, cl.CMNCODNAM AS leaveProjectColor FROM commuters c @@ -62,8 +64,8 @@ LEFT JOIN commoncod cl ON p2.PROJCTCOL = cl.CMNCODVAL AND cl.CMNCODYNP = '1' WHERE - YEAR(c.COMMUTDAY) = #{year} - AND MONTH(c.COMMUTDAY) = #{month} + YEAR(c.COMMUTDAY) = #{year} + AND MONTH(c.COMMUTDAY) = #{month} From a25b751d5e05c4bddd6f5a96c6b3a9a2f63b48d5 Mon Sep 17 00:00:00 2001 From: yoon Date: Mon, 31 Mar 2025 13:03:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=ED=87=B4=EA=B7=BC=EC=9C=84=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/company/localhost/service/CommutersService.java | 1 + src/main/resources/mapper/CommutersMapper.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/company/localhost/service/CommutersService.java b/src/main/java/io/company/localhost/service/CommutersService.java index e9051a0..0143d9e 100644 --- a/src/main/java/io/company/localhost/service/CommutersService.java +++ b/src/main/java/io/company/localhost/service/CommutersService.java @@ -54,6 +54,7 @@ public class CommutersService { if(map.get("commutLve") != null) { map.put("commutLve", null); + map.put("commutOut", null); } else { map.put("commutLve", LocalTime.now()); } diff --git a/src/main/resources/mapper/CommutersMapper.xml b/src/main/resources/mapper/CommutersMapper.xml index bd21305..3aef6ea 100644 --- a/src/main/resources/mapper/CommutersMapper.xml +++ b/src/main/resources/mapper/CommutersMapper.xml @@ -11,7 +11,8 @@ COMMUTCMT, COMMUTLVE, COMMUTDAY, - COMMUTARR + COMMUTARR, + COMMUTOUT ) VALUES ( #{commutSeq}, #{memberSeq}, @@ -19,7 +20,8 @@ #{commutCme}, #{commutLve}, #{commutDay}, - #{commutArr} + #{commutArr}, + #{commutOut}, ) @@ -27,7 +29,8 @@ UPDATE commuters SET COMMUTLVE = #{commutLve}, - PROJCTLVE = #{projctLve} + PROJCTLVE = #{projctLve}, + COMMUTOUT = #{commutOut} WHERE MEMBERSEQ = #{memberSeq} AND COMMUTDAY = CURDATE()