From 3be66c9343f68b78a75d5ca93c001245484c780a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 17:29:51 +0800
Subject: [PATCH] # 登录用户判断 成品计划添加计划开始 结束日期 过期判断
---
server/src/main/java/doumeemes/dao/business/model/WorkPlans.java | 2 +-
server/src/main/java/doumeemes/core/utils/DateUtil.java | 25 ++++++++++++++++++++++++-
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 4 +++-
server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java | 7 +++++++
server/src/main/java/doumeemes/config/shiro/ShiroRealm.java | 7 ++++++-
5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
index 795623f..9b3e2f5 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
@@ -35,6 +35,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -129,6 +130,10 @@
if(com == null){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴峰紓甯革紒");
}
+
+ if(com.getOepnValidDate().before(new Date())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囦娇鐢ㄦ湁鏁堟湡锛�");
+ }
//濡傛灉鏄紒涓氱敤鎴�
QueryCompanyUserExtDTO c =new QueryCompanyUserExtDTO();
c.setUserId(user.getId());
@@ -136,7 +141,7 @@
c.setCompanyId(authenticationToken.getCompanyId());
cu = companyUserExtService.selectOne(c);
if(cu == null){
- return null;
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氱敤鎴蜂笉瀛樺湪锛�");
}
if(Constants.equalsInteger(cu.getStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氱敤鎴峰凡绂佺敤锛�");
diff --git a/server/src/main/java/doumeemes/core/utils/DateUtil.java b/server/src/main/java/doumeemes/core/utils/DateUtil.java
index eb0a9fa..fb8c603 100644
--- a/server/src/main/java/doumeemes/core/utils/DateUtil.java
+++ b/server/src/main/java/doumeemes/core/utils/DateUtil.java
@@ -10,6 +10,8 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Date;
import java.util.*;
@@ -3002,4 +3004,25 @@
cal.add(Calendar.MINUTE,minutes);
return cal.getTime();
}
-}
\ No newline at end of file
+
+ /**
+ * LocalDateTime to date
+ * @param now
+ * @return
+ */
+ public static LocalDateTime toDateLocalDateTime(Date now){
+ return LocalDateTime.ofInstant(now.toInstant(), ZoneId.systemDefault());
+ }
+
+
+ /**
+ * LocalDateTime to date
+ * @param localDateTime
+ * @return
+ */
+ public static Date toDate(LocalDateTime localDateTime){
+ Date from = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ return from;
+ }
+
+}
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
index 967344f..ee96a6d 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "璁″垝缂栫爜")
private String planCode;
- @ApiModelProperty(value = "璁″垝鏃ユ湡")
+ @ApiModelProperty(value = "璁″垝缁撴潫鏃ユ湡")
@Excel(name="璁″垝鏃ユ湡",orderNum ="1",format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 3a81b32..3b72cd2 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -76,7 +76,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞崟鍙�" )
- @Excel(name="閿�鍞崟鍙�",index = 16,width =15)
private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@@ -153,4 +152,7 @@
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
private List<PlansExtListVO> plansExtListVOList;
+
+ @ApiModelProperty(value = "鏄惁杩囨湡")
+ private Boolean hasExpire;
}
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 1e80882..b955f0b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java
@@ -32,6 +32,7 @@
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;
@@ -172,6 +173,12 @@
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));
--
Gitblit v1.9.3