diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index fe1de8f03..33adf4a4f 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -11,12 +11,11 @@ package com.xdadan.erp.web.emis; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.time.temporal.ChronoUnit; +import java.util.*; import javax.servlet.http.HttpServletResponse; +import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -396,6 +395,7 @@ public class EmisSettleSubBillController extends EmisBaseController + /** * 站点确认账单 */ @@ -408,6 +408,24 @@ public class EmisSettleSubBillController extends EmisBaseController for(int i=0;i m1List = WaybillHelper.wrap(m1,48); - System.out.println(JSON.toJSONString(m1List)); +// try { +//// String m1="江苏省南京市建邺区云龙山路68号苏美达国际大厦21楼"; +//// System.out.println(m1); +//// List m1List = WaybillHelper.wrap(m1,48); +//// System.out.println(JSON.toJSONString(m1List)); +//// +//// } catch (Exception e) { +//// e.printStackTrace(); +//// } + + Date sendDate=WaybillHelper.removeTimeHMS(new Date()); + sendDate = DateUtils.addDays(sendDate,-4); + Date now=WaybillHelper.removeTimeHMS(new Date()); + Long num=now.getTime()-sendDate.getTime();//时间戳相差的毫秒数 + int dayDiff=(int)(num/24/60/60/1000); + System.out.println(dayDiff); + - } catch (Exception e) { - e.printStackTrace(); - } }