From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 17 八月 2023 17:21:40 +0800 Subject: [PATCH] 初始化1.0.1 --- server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java index c99011c..1e80882 100644 --- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java +++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java @@ -32,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile; import java.math.BigDecimal; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -173,12 +172,6 @@ i.setFinishUnQualifiedNum(Objects.isNull(plansExtListVO.getUnqulifiedNum())?Constants.ZERO:plansExtListVO.getUnqulifiedNum()); i.setFinishNum(Objects.isNull(plansExtListVO.getDoneNum())?Constants.ZERO:plansExtListVO.getDoneNum()); } - if (Objects.nonNull(i.getPlanDate())){ - i.setHasExpire(DateUtil.toDateLocalDateTime(i.getPlanDate()).toLocalDate().isBefore(LocalDate.now())); - }else { - i.setHasExpire(false); - } - }); } return PageData.from(new PageInfo<>(result)); @@ -372,14 +365,8 @@ if(Constants.formatIntegerNum(p.getNum())<=0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掔敓浜ф暟閲忋�戞暟鎹敊璇紒"); } - if(p.getStartDate() == null){ - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掑紑濮嬫棩鏈熴�戞暟鎹敊璇紝姝g‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒"); - } if(p.getPlanDate() == null){ - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掔粨鏉熸棩鏈熴�戞暟鎹敊璇紝姝g‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒"); - } - if(p.getPlanDate().getTime() <= p.getStartDate().getTime()){ - throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掑紑濮嬫棩鏈熴�戣鏃╀簬銆愯鍒掔粨鏉熸棩鏈熴�戯紒"); + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掓棩鏈熴�戞暟鎹敊璇紝姝g‘鏍煎紡涓猴細yyyy-MM-dd锛堝2022-06-07锛夛紒"); } if(StringUtils.isBlank(p.getMaterialCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愪骇鍝佺紪鐮併�戞暟鎹敊璇紒"); -- Gitblit v1.9.3