From 0da3b191bc6aff78ce5dff1059cb7b0044d18f0e Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 26 Oct 2022 14:52:16 +0800
Subject: [PATCH] =?UTF-8?q?61730=20=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1/=E6=B3=95=E8=A7=84=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E5=BE=85=E5=8A=9E=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=88=AA=E6=AD=A2=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E6=A0=87=E8=AF=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessInfoEOServiceImpl.java        | 20 +++++++++++++++++++
 .../modules/todoCenter/vo/ProcessInfoVO.java  |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index 0383bd391..203a27fe5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -396,6 +396,14 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 	 */
 	public void disposeData(List<ProcessInfoVO> datas, String cut){
 		if(CollectionUtils.isNotEmpty(datas)){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date currentDate = new Date();
+			try {
+				currentDate = sdf.parse(sdf.format(currentDate));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+
 			List<String> processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList());
 
 			QueryWrapper<ProcessInfoDetailEO> processInfoDetailQueryWrap = new QueryWrapper<>();
@@ -463,6 +471,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 
 			List<SysUser> sysUserList = this.sysUserService.querySysUserListByIdList(userIdList);
 
+			Date finalCurrentDate = currentDate;
 			datas.forEach(data -> {
 				if(StringUtils.isNotEmpty(data.getFlowType())){
 					data.setFlowTypeShow(FlowTypeEnum.getTextByValue(data.getFlowType(),cut));
@@ -512,6 +521,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 					}).map(ProjectTaskInventoryDetailEO::getId).collect(Collectors.joining(","));
 					data.setPrimaryKeyId(primaryKeyId);
 				}
+
+				//判断当前任务是否过期
+				Date endTime = data.getEndTime();
+				try {
+					endTime = sdf.parse(sdf.format(endTime));
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+				if(finalCurrentDate.after(endTime) || finalCurrentDate.equals(endTime)){
+					data.setEndTimePastDueFlag(true);
+				}
 			});
 		}
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
index e9a5287cc..75577e278 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
@@ -100,4 +100,6 @@ public class ProcessInfoVO implements Serializable {
     private String primaryKeyId;
     /**符合性流程：责任人填写反馈意见*/
     private String personChargeFeedback;
+    /**截止日期 过期标识：true为已经过期 false为没有过期**/
+    private boolean endTimePastDueFlag = false;
 }