分布式本地缓存

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -405,7 +405,13 @@ public class XmTaskController {
 				}
 			}
 			can=can.stream().filter(i->!noExecs.stream().filter(k->k.getId().equals(i.getId())).findAny().isPresent()).collect(Collectors.toList());
-
+			if(can.size()>0 && xmTaskMap.containsKey("taskState")){
+				String taskState= (String) xmTaskMap.get("taskState");
+				if("3".equals(taskState)||"4".equals(taskState)||"9".equals(taskState)){
+					xmTaskMap.put("endTime",new Date());
+					xmTaskMap.put("actEndTime",new Date());
+				}
+			}
 			if(can.size()>0){
 				xmTaskMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList()));
 

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -481,7 +481,11 @@ public class XmTaskExecuserController {
 					return ResponseHelper.failed(tips);
 				}
 			}
-
+			String taskState= xmTaskUpdate.getTaskState();
+			if("3".equals(taskState)||"4".equals(taskState)||"9".equals(taskState)){
+				xmTaskUpdate.setEndTime(new Date());
+				xmTaskUpdate.setActEndTime(new Date());
+			}
 			xmTaskService.updateSomeFieldByPk(xmTaskUpdate);
 			if("2".equals(xmTaskDb.getOshare()) && xmTaskDb.getShareFee()!=null && xmTaskDb.getShareFee().compareTo(BigDecimal.ZERO)>0){
 				 mkClient.pushAfterTaskAcceptanceSuccess(xmTaskDb.getExecutorUserid(),xmTaskDb.getExecutorUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());