From 931976fd111912bddeb6df93e33cd5386ae12be8 Mon Sep 17 00:00:00 2001 From: seaon Date: Wed, 8 Jan 2025 19:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A0=B9=E6=8D=AE=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E6=97=A5=E5=8E=86=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EnterpriseCalendarServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/com/engine/jucailinkq/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java b/src/com/engine/jucailinkq/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java index 6707504..493f20d 100644 --- a/src/com/engine/jucailinkq/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java +++ b/src/com/engine/jucailinkq/attendance/workflow/service/impl/EnterpriseCalendarServiceImpl.java @@ -68,7 +68,7 @@ public class EnterpriseCalendarServiceImpl extends Service implements Enterprise for (int day = 0; day < daysInMonth; day++) { dateInfo = new HashMap<>(); - dateInfo = createDateInfo(calendar); + dateInfo = createDateInfo(calendar, lunarFlag); dateInfo.put("formmodeid",formModeId); dateInfo.put("modeuuid", UUID.randomUUID().toString()); dateInfo.put("modedatacreater","1"); @@ -240,7 +240,7 @@ public class EnterpriseCalendarServiceImpl extends Service implements Enterprise return rows; } - private Map createDateInfo(Calendar calendar) { + private Map createDateInfo(Calendar calendar, String lunarFlag) { Map dateInfo = new HashMap<>(); // 获取阳历年-月-日 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -267,10 +267,16 @@ public class EnterpriseCalendarServiceImpl extends Service implements Enterprise //判断日期类型 String dayType = getDayType(weekIndex, specialDay); dateInfo.put("rq", solarDate); - dateInfo.put("nlrq", lunarDate); + if (lunarFlag.equals("1")) { + dateInfo.put("nlrq", lunarDate); + dateInfo.put("mc", specialDay.equals("") ? null : specialDay); + dateInfo.put("rqlx", dayType); + }else{ + dateInfo.put("nlrq", ""); + dateInfo.put("mc", ""); + dateInfo.put("rqlx", ""); + } dateInfo.put("xq", weekIndex); - dateInfo.put("mc", specialDay.equals("") ? null : specialDay); - dateInfo.put("rqlx", dayType); dateInfo.put("bz", ""); return dateInfo; }