From 29c9a7cfc8de40e246409963784d8f7112d953da Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期五, 18 八月 2023 14:56:17 +0800 Subject: [PATCH] #产出计算 --- server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 a5f024f..0a86bd0 100644 --- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java +++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java @@ -384,7 +384,7 @@ 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()){ + if(p.getPlanDate().getTime() < p.getStartDate().getTime()){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+(index+2)+"銆戣銆愯鍒掑紑濮嬫棩鏈熴�戣鏃╀簬銆愯鍒掔粨鏉熸棩鏈熴�戯紒"); } if(StringUtils.isBlank(p.getMaterialCode())){ @@ -399,7 +399,7 @@ Date pDate = DateUtil.getDateFromString(DateUtil.getShortTime(p.getPlanDate()) +" 00:00:00"); Date nDate = DateUtil.getDateFromString(DateUtil.getShortTime(DateUtil.getCurrentDate()) +" 23:59:59"); - if( nDate.getTime() > pDate.getTime()){ + if( nDate.getTime() < pDate.getTime()){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璁″垝鐢熶骇鏃ユ湡蹇呴』涓轰粖澶╀互鍚庣殑鏃ユ湡锛�"); } p.setMaterialCode(p.getMaterialCode().trim()); -- Gitblit v1.9.3