From 613520bfa861398a73841e326b4cf7fbf9f7310f Mon Sep 17 00:00:00 2001 From: mythxb Date: Mon, 13 Nov 2023 09:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E5=B9=B4=E6=B8=85=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzyc/controller/PcPersonalController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 716b49e..c3986c1 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -2105,8 +2105,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { listFactor.setCreatedon(new Date()); listFactor.setModifiedon(new Date()); - listFactor.setStartTime(DateUtils.parseString2Date(changeFactorDto.getStartTime(),"yyyy-MM-dd")); - listFactor.setEndTime(DateUtils.parseString2Date(changeFactorDto.getEndTime(),"yyyy-MM-dd")); + //清单提醒时间 listFactor.setYellowAlert(5+""); @@ -2115,10 +2114,12 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { //清单类型 listFactor.setType(1); - if(StringUtils.isNotBlank(changeFactorDto.getSysyear())){ - //不跨年的清单 - listFactor.setSysyear(changeFactorDto.getSysyear()); - }else{ + if(Checkstandard.CUSTOM.getStandard() == changeFactorDto.getCheckstandard()){ + + + listFactor.setStartTime(DateUtils.parseString2Date(changeFactorDto.getStartTime(),"yyyy-MM-dd")); + listFactor.setEndTime(DateUtils.parseString2Date(changeFactorDto.getEndTime(),"yyyy-MM-dd")); + //跨年的清单 String sysyear = ""; List yearList = DateUtils.getYearBetweenDate(changeFactorDto.getStartTime(),changeFactorDto.getEndTime()); @@ -2130,6 +2131,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { } } listFactor.setSysyear(sysyear); + }else{ + //不跨年的清单 + listFactor.setSysyear(changeFactorDto.getSysyear()); }