From fe3c26b11d209d046b885930ff1accf6b3ce7c0b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十二月 2024 10:07:41 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1 + server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java index 2c10447..cdb161c 100644 --- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java +++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java @@ -157,6 +157,7 @@ public static final String HK_CHANGNEI_SCREEN_INDEXCODES = "HK_CHANGNEI_SCREEN_INDEXCODES"; public static final String CITY_XH_REASON_ID ="CITY_XH_REASON_ID" ; public static final String ATWL_XH_PLATFORM_ID ="ATWL_XH_PLATFORM_ID" ; + public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE"; public static boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; public static boolean DEALING_HK_SYNCPLATFORM = false; diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java index 3413453..0c83707 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java @@ -2339,6 +2339,12 @@ } Date date = new Date(); Date startDate = DateUtil.addDaysToDate(date,-7); + //鐪嬫澘澶у睆杩�7鏃ュ埌璐ф儏鍐垫棩鏈� 0琛ㄧず褰撳ぉ褰撳墠鎺�7澶╋紝-1琛ㄧず鏈湀鍒�1鍙�-7鍙� + String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode(); + if(StringUtils.equals(flag,"-1")){ + startDate =DateUtil.getBeginDayOfMonth(0); + date = DateUtil.addMonthToDate(startDate,7); + } param.setNcCreateDateFrom(DateUtil.getShortTime(startDate)); param.setNcCreateDateThrough(DateUtil.getShortTime(date)); List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲� -- Gitblit v1.9.3