61730 项目法规任务/法规评估任务-待办，如果截止小于等于当前日期，处理展示数据标识。

2022-10-26 14:52:16 +08:00
parent e7fefd23f8
commit 0da3b191bc
2 changed files with 22 additions and 0 deletions
@@ -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);
+				}
 			});
 		}
 	}
@@ -100,4 +100,6 @@ public class ProcessInfoVO implements Serializable {
    private String primaryKeyId;
    /**符合性流程：责任人填写反馈意见*/
    private String personChargeFeedback;
+    /**截止日期 过期标识：true为已经过期 false为没有过期**/
+    private boolean endTimePastDueFlag = false;
 }