From 85f48b9e6b69f866b22220fa7fec03a90378e4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 7 Feb 2023 13:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 7 +++++++ .../main/java/com/xm/core/ctrl/XmQuestionController.java | 4 ++++ .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 75dce04d..79caa391 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -20,6 +20,7 @@ import com.xm.core.queue.XmMenuSumParentsPushService; import com.xm.core.service.*; import com.xm.core.vo.BatchChangeParentMenuVo; import io.swagger.annotations.*; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -302,6 +303,12 @@ public class XmMenuController { } xmMenu.setCtime(new Date()); xmMenu.setLtime(new Date()); + if(xmMenu.getStartTime()==null){ + xmMenu.setStartTime( xmMenu.getCtime()); + } + if(xmMenu.getEndTime()==null){ + xmMenu.setEndTime(DateUtils.addDays(xmMenu.getCtime(),14)); + } xmMenuService.insert(xmMenu); notifyMsgService.pushMsg(user,xmMenu.getMmUserid(),xmMenu.getMmUsername(),"4",xmMenu.getProductId(),xmMenu.getMenuId(),"您成为需求【"+xmMenu.getMenuName()+"】的负责人，请跟进需求！"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index 4c5c1732..bb0c035c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -21,6 +21,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -193,6 +194,9 @@ public class XmQuestionController { xmQuestionVo.setCreateUserid(user.getUserid()); xmQuestionVo.setCreateUsername(user.getUsername()); xmQuestionVo.setLtime(new Date()); + if(xmQuestionVo.getEndTime()==null){ + xmQuestionVo.setEndTime(DateUtils.addDays(xmQuestionVo.getCreateTime(),7)); + } if(!StringUtils.hasText(xmQuestionVo.getHandlerUserid())){ xmQuestionVo.setHandlerUserid(user.getUserid()); xmQuestionVo.setHandlerUsername(user.getUsername()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 1f6777d5..248442f3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -24,6 +24,7 @@ import com.xm.core.service.client.SysClient; import com.xm.core.service.push.XmPushMsgService; import com.xm.core.vo.*; import io.swagger.annotations.*; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -604,6 +605,13 @@ public class XmTaskController { xmTaskVo.setTaskState("0"); xmTaskVo.setEstate("0"); xmTaskVo.setRate(0); + + if(xmTaskVo.getStartTime()==null){ + xmTaskVo.setStartTime( xmTaskVo.getCreateTime()); + } + if(xmTaskVo.getEndTime()==null){ + xmTaskVo.setEndTime(DateUtils.addDays(xmTaskVo.getCreateTime(),14)); + } if( !StringUtils.hasText(xmTaskVo.getMilestone()) ){ xmTaskVo.setMilestone("0"); }