diff --git a/src/main/java/com/yxt/yyth/api/empcard/EmpAppletVo.java b/src/main/java/com/yxt/yyth/api/empcard/EmpAppletVo.java index 362b84b..3c522f0 100644 --- a/src/main/java/com/yxt/yyth/api/empcard/EmpAppletVo.java +++ b/src/main/java/com/yxt/yyth/api/empcard/EmpAppletVo.java @@ -69,8 +69,22 @@ public class EmpAppletVo { //1>2 1 、1<2 -1 、1=2 0 int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); if(String.valueOf(k).equals("1")){ - start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15")))); + if(String.valueOf(j).equals("1")){ + start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + }else{ +// start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+2)); + } + }else{ + int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15")))); + if(String.valueOf(j).equals("1")){ + start=sdf.format(DateUtil.offsetDay(new Date(),+1)); + }else{ +// start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+1)); + } start=sdf.format(DateUtil.offsetDay(new Date(),+1)); }