ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跨年清单配置

Browse Source
This commit is contained in:
mythxb 2023-11-13 09:24:23 +08:00
parent 15a3e4f625
commit 613520bfa8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
View File

@ -2105,8 +2105,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
listFactor.setCreatedon(new Date()); listFactor.setCreatedon(new Date());
listFactor.setModifiedon(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+""); listFactor.setYellowAlert(5+"");
@ -2115,10 +2114,12 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
//清单类型 //清单类型
listFactor.setType(1); listFactor.setType(1);
if(StringUtils.isNotBlank(changeFactorDto.getSysyear())){ if(Checkstandard.CUSTOM.getStandard() == changeFactorDto.getCheckstandard()){
//不跨年的清单
listFactor.setSysyear(changeFactorDto.getSysyear());
}else{ listFactor.setStartTime(DateUtils.parseString2Date(changeFactorDto.getStartTime(),"yyyy-MM-dd"));
listFactor.setEndTime(DateUtils.parseString2Date(changeFactorDto.getEndTime(),"yyyy-MM-dd"));
//跨年的清单 //跨年的清单
String sysyear = ""; String sysyear = "";
List<String> yearList = DateUtils.getYearBetweenDate(changeFactorDto.getStartTime(),changeFactorDto.getEndTime()); List<String> yearList = DateUtils.getYearBetweenDate(changeFactorDto.getStartTime(),changeFactorDto.getEndTime());
@ -2130,6 +2131,9 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
} }
} }
listFactor.setSysyear(sysyear); listFactor.setSysyear(sysyear);
}else{
//不跨年的清单
listFactor.setSysyear(changeFactorDto.getSysyear());
} }