youxiw2000 / trash · Commits

Commit 7939d2474f4e9dcdf0ddc683e5cf15d96577566a

Authored by 273548560@qq.com
1 parent b4990336
build: skipped

11

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
  View file @7939d24
@@ -18,6 +18,7 @@ import com.trash.workflow.service.impl.WorkflowServiceImpl; @@ -18,6 +18,7 @@ import com.trash.workflow.service.impl.WorkflowServiceImpl;
18 import org.activiti.api.process.model.ProcessInstance; 18 import org.activiti.api.process.model.ProcessInstance;
19 import org.activiti.api.process.model.builders.ProcessPayloadBuilder; 19 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
20 import org.activiti.api.process.runtime.ProcessRuntime; 20 import org.activiti.api.process.runtime.ProcessRuntime;
  21 +import org.apache.commons.lang3.time.DateFormatUtils;
21 import org.springframework.beans.factory.annotation.Autowired; 22 import org.springframework.beans.factory.annotation.Autowired;
22 import org.springframework.stereotype.Service; 23 import org.springframework.stereotype.Service;
23 import com.trash.office.mapper.LeaveApplicationMapper; 24 import com.trash.office.mapper.LeaveApplicationMapper;
@@ -220,8 +221,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService @@ -220,8 +221,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
220 workflow.setTitle(leaveApplication.getApplicant()+"的"+leaveApplication.getType()+"申请"); 221 workflow.setTitle(leaveApplication.getApplicant()+"的"+leaveApplication.getType()+"申请");
221 workflow.setType(leaveApplication.getType()); 222 workflow.setType(leaveApplication.getType());
222 workflow.setReason(leaveApplication.getContent()); 223 workflow.setReason(leaveApplication.getContent());
223 - workflow.setStartTime(leaveApplication.getBeginTime());  
224 - workflow.setEndTime(leaveApplication.getEndTime()); 224 + workflow.setStartTime(DateFormatUtils.format(leaveApplication.getBeginDate(),"yyyy-MM-dd HH:mm:ss"));
  225 + workflow.setEndTime(DateFormatUtils.format(leaveApplication.getEndDate(),"yyyy-MM-dd HH:mm:ss"));
225 workflow.setState("0"); 226 workflow.setState("0");
226 workflow.setCreateBy(SecurityUtils.getUsername()); 227 workflow.setCreateBy(SecurityUtils.getUsername());
227 workflow.setCreateTime(DateUtils.getNowDate()); 228 workflow.setCreateTime(DateUtils.getNowDate());