youxiw2000 / trash · Commits

Commit 3a9d1c24ca5bc5847d62c1979e472852fb4940ae

Authored by youxiw2000
1 parent 0d0d0be2
build: skipped

m

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
  View file @3a9d1c2
@@ -60,7 +60,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService { @@ -60,7 +60,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
60 afw.setTaskNodeName(tasks.get(0).getName()); 60 afw.setTaskNodeName(tasks.get(0).getName());
61 afw.setCreateBy(tasks.get(0).getName()); 61 afw.setCreateBy(tasks.get(0).getName());
62 afw.setCreateName(tasks.get(0).getName()); 62 afw.setCreateName(tasks.get(0).getName());
63 - afw.setCreateTime(tasks.get(0).getCreateTime()); 63 + afw.setCreateTime(new Date());
64 64
65 returnHistoryFromDataDTOS.add(afw); 65 returnHistoryFromDataDTOS.add(afw);
66 } 66 }
@@ -69,14 +69,14 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService { @@ -69,14 +69,14 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
69 if(businessKey.contains("constructsite")){ 69 if(businessKey.contains("constructsite")){
70 String id = businessKey.split(":")[1]; 70 String id = businessKey.split(":")[1];
71 71
72 - actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id)); 72 + actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id));
73 73
74 - actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id); 74 + actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id));
75 75
76 76
77 }else{ 77 }else{
78 78
79 - actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey); 79 + actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
80 } 80 }
81 81
82 82
trash-ui/src/main.js
  View file @3a9d1c2
@@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
37 Vue.prototype.parseStatus = parseStatus 37 Vue.prototype.parseStatus = parseStatus
38 Vue.prototype.checkPer = checkPermi 38 Vue.prototype.checkPer = checkPermi
39 39
40 -Vue.prototype.remoteFrame = "http://183.66.242.6:14601"  
41 -// Vue.prototype.remoteFrame = "http://175.6.47.84:8008" 40 +// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
  41 +Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
42 42
43 Vue.prototype.msgSuccess = function (msg) { 43 Vue.prototype.msgSuccess = function (msg) {
44 this.$message({ showClose: true, message: msg, type: "success" }); 44 this.$message({ showClose: true, message: msg, type: "success" });