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