11

273548560@qq.com
1 parent 75b8885d
Showing 4 changed files with 5 additions and 4 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-admin/src/main/resources/application-dev.yml
trash-ui/src/views/activiti/task/index.vue
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
@@ -43,7 +43,6 @@ import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.activiti.service.myTaskService;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.RouteUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.spring.SpringUtils;
@@ -27,7 +27,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: root
+                password: asd0731.
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -81,7 +81,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: 
+        password: bsth123
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -418,7 +418,7 @@
             return;
           }
           if(this.definitionKey == "workflow_leave"){
-            this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
+            this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
             this.leaveApplicationOpen = true;
             return;
           }
@@ -220,6 +220,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
         workflow.setTitle(leaveApplication.getApplicant()+"的"+leaveApplication.getType()+"申请");
         workflow.setType(leaveApplication.getType());
         workflow.setReason(leaveApplication.getContent());
+        workflow.setStartTime(leaveApplication.getBeginTime());
+        workflow.setEndTime(leaveApplication.getEndTime());
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());