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/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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 52993fb..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
@@ -2317,12 +2317,12 @@
@Override
public TmsBasePageResponse<TmsOrderNoFinishListResponse> orderNoFinishList(TmsOrderNoFinishListRequest param){
TmsBasePageResponse<TmsOrderNoFinishListResponse> infoList = tmsService.getNotFinishOrderList(param);//鏌ヨ鍑哄簱閲�
- if(infoList!=null && infoList.getRows()!=null){
+ /* if(infoList!=null && infoList.getRows()!=null){
for(TmsOrderNoFinishListResponse model :infoList.getRows()){
model.setStatusDesc(TMSContants.TopStatusLevel.getNameByKey(TMSContants.ChildStatusLevel.getParentIndexByStatus(model.getStatus())));
}
- }
+ }*/
return infoList;
}
/**
@@ -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