m

youxiw2000
1 parent 6397afed
Showing 17 changed files with 219 additions and 152 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-admin/src/main/resources/application-dev.yml
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/taskhismethod.js
trash-ui/src/api/taskmethod.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/activiti/task/sitePaper.vue
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/task/sitePaper.vue
trash-ui/src/views/h5/task/taskCard.vue
trash-ui/src/views/h5/taskhistory/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -244,6 +244,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 			if(name != null)
 				query.processInstanceNameLike(name);
+
 			processInstanceList = query.list();
 package com.trash.activiti.service.impl;
 import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,15 +28,37 @@ import java.util.stream.Collectors;
 public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     @Autowired
     private IActWorkflowFormDataService actWorkflowFormDataService;
-
-
+    
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    
+
+	@Autowired
+	private RuntimeService runtimeService;
+	@Autowired
+	private TaskService taskService;
+	
     @Override
     public List<ActWorkflowFormData> historyDataShow(String businessKey) {
         List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
+        List<Task> tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey).list();
+		
+		if(tasks.size() > 0){
+			
+			ActWorkflowFormData afw = new ActWorkflowFormData();
+			
+			
+			afw.setControlName("审批");
+			afw.setControlValue("待审批");
+			afw.setTaskNodeName(tasks.get(0).getName());
+			afw.setCreateBy(tasks.get(0).getName());
+			afw.setCreateName(tasks.get(0).getName());
+			afw.setCreateTime(tasks.get(0).getCreateTime());
+			
+			returnHistoryFromDataDTOS.add(afw);
+		}
         List<ActWorkflowFormData> actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
@@ -60,6 +85,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     		returnHistoryFromDataDTOS.add(one);
         }
+        
 //        Map<String, List<ActWorkflowFormData>> collect = actWorkflowFormData.stream().collect(Collectors.groupingBy(ActWorkflowFormData::getTaskNodeName));
 //        collect.entrySet().forEach(
 //                entry -> {
@@ -71,7 +97,10 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
 //                    returnHistoryFromDataDTOS.add(returnHistoryFromDataDTO);
 //                }
 //        );
-//        List<HistoryDataDTO> collect1 = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreatedDate().compareTo(y.getCreatedDate())).collect(Collectors.toList());
+//        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((x, y) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
+        
+		
+        
         return returnHistoryFromDataDTOS;
     }
@@ -16,10 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://175.6.47.84:8008
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
-    #remotePath: http://183.66.242.6:14601
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    remotePath: http://183.66.242.6:14601
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -33,7 +33,7 @@ spring:
             # 主库数据源
             master:
                 #url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: root
             # 从库数据源
@@ -79,56 +79,15 @@ public class DriverTask
     @SuppressWarnings("deprecation")
 	private void checkTruckActive() {
-    	int hour = new Date().getHours();
-    	int minute = new Date().getMinutes();
-    	if(hour < 8 && (hour==3 && minute>55)){
-    		return;
+    	if(TOKEN == null){
+    		TOKEN = trashConfig.getToken();
     	}
-    	
-    	SupervisionThreestep param =new SupervisionThreestep();
-    	
-    	param.setType(0L);
-    	param.setStatus(1L);
-    	
-    	String start, end;
-
-		Date date = new Date();
-
-		if (new Date().getHours() < 8) {
-			end = sdf.format(date);
-			date.setDate(date.getDate() - 1);
-			start = sdf.format(date);
-		} else {
-			start = sdf.format(date);
-			date.setDate(date.getDate() + 1);
-			end = sdf.format(date);
-		}
-
-		end += " 8:00:00";
-		start += " 8:00:00";
-
-		try {
-			param.setWorkStartTime(sdf.parse(start));
-			param.setWorkEndTime(sdf.parse(end));
+    	try {
+     	      SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(TOKEN);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			// TODO: handle exception
 		}
-		
-		
-    	
-    	List<SupervisionThreestep> cs = SpringUtils.getBean(SupervisionThreestepMapper.class).selectTodayDataList(param);
-    	for(SupervisionThreestep c:cs){
-        	if(hour < 8 && (hour==3 && minute>55)){
-        		return;
-        	}
-    		try {
-     	       SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c,TOKEN);
-			} catch (Exception e) {
-				// TODO: handle exception
-			}
-    	}
 	}
@@ -35,7 +35,6 @@ export default {
       },
       /** 查询请假列表 */
       getList() {
-        debugger;
         this.loading = true;
         if (this.type == 1) {
           listEndTask(this.queryParams).then(response => {
@@ -94,7 +93,7 @@ export default {
           this.hisfromData = [];
-            this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});
+            // this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});
             for(let i in response.data){
               this.hisfromData.push(response.data[i]);
@@ -177,7 +177,7 @@ export default {
         this.taskName = row.name;
         historyFromData(this.businessKey).then(response => {
           this.hisfromData = [];
-          this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
+          //this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
             for(let i in response.data){
               this.hisfromData.push(response.data[i]);
@@ -214,10 +214,10 @@ export default {
           this.form.formData = formData;
           if (this.definitionKey == "workflow_threestep") {
-            
+
             this.videos = [];
             this.slides = [];
-            
+
             this.open2 = true;
             return;
           }
@@ -318,35 +318,38 @@ export default {
         }
         if (this.definitionKey == "workflow_threestep") {
-
-
-          for (let i = 0; i < 13; i++) {
-            if (this.form["sub_img" + i]) {
-              let paths = "";
-              for (var j = 0; j < this.form["sub_img" + i].length; j++) {
-                paths += this.form["sub_img" + i][j].split(":")[1] + ",";
+          this.$refs["form"].validate(valid => {
+            if (!valid) {
+              return;
+            }
+            for (let i = 0; i < 13; i++) {
+              if (this.form["sub_img" + i]) {
+                let paths = "";
+                for (var j = 0; j < this.form["sub_img" + i].length; j++) {
+                  paths += this.form["sub_img" + i][j].split(":")[1] + ",";
+                }
+                this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
               }
-              this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
             }
-          }
-          if (this.form.status == 1) {
-            activeThreestep(this.form).then(res => {
+            if (this.form.status == 1) {
+              activeThreestep(this.form).then(res => {
+                formDataSave(this.id, this.form.formData).then(response => {
+                  this.msgSuccess("审批成功");
+                  this.open2 = false;
+                  this.taskList = [];
+                  this.getList();
+                });
+              });
+            } else {
               formDataSave(this.id, this.form.formData).then(response => {
                 this.msgSuccess("审批成功");
                 this.open2 = false;
                 this.taskList = [];
                 this.getList();
               });
-            });
-          } else {
-            formDataSave(this.id, this.form.formData).then(response => {
-              this.msgSuccess("审批成功");
-              this.open2 = false;
-              this.taskList = [];
-              this.getList();
-            });
-          }
+            }
+          });
           return;
         }
@@ -58,10 +58,10 @@
     <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
       <threestepInfo :businessKey="businessKey" v-if="open2"/>
-      <el-form :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row type="flex" justify="center">
           <el-col>
-            <el-form-item label="补充说明">
+            <el-form-item label="补充说明" prop="subReason">
               <el-input type="textarea" v-model="form.subReason" maxlength=100 show-word-limit='true'/>
             </el-form-item>
           </el-col>
@@ -784,6 +784,8 @@
       };
     },
     created() {
+      console.log(this);
+      console.log(this.$refs["form"]);
       let dep = {type: "CSUserDepartmentType"};
       getDict(dep).then(res => {
@@ -814,4 +816,3 @@
   }
 </script>
-
@@ -53,7 +53,7 @@
           <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
         </el-row>
-        <el-row class="bd_bottom">
+        <!-- <el-row class="bd_bottom">
           <el-col :span="6" >申报资料</el-col>
           <el-col :span="18" class="bd_left">
             <el-row class="bd_bottom">
@@ -82,7 +82,7 @@
             </el-row>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row class="bd_bottom">
           <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
           <el-col :span="18" class="bd_padding">{{infoData.earthName}}</el-col>
@@ -12,15 +12,15 @@
       </el-col>
     </el-row>
-    <el-row class="card_row">
+    <el-row class="card_row" v-if="task.checkStatus == 0">
       <el-col :span="8" class="card_grid">
-        <div v-if="task.prev">上一节点: {{task.prev}}</div>
+        <div >上一节点: {{task.prev}}</div>
       </el-col>
       <el-col :span="8" class="card_grid" v-if="task.name">
         <div >当前节点: {{task.name}}</div>
       </el-col>
       <el-col :span="8" class="card_grid">
-        <div v-if="task.next">下一节点: {{task.next}}</div>
+        <div >下一节点: {{task.next}}</div>
       </el-col>
     </el-row>
@@ -55,9 +55,9 @@
     <el-dialog :title="title" :visible.sync="open2" width="400px" append-to-body>
       <threestepInfo :businessKey="businessKey" v-if="open2" />
-      <el-form  :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row >
-            <el-form-item label="补充说明">
+            <el-form-item label="补充说明" prop="subReason">
               <el-input type="textarea" v-model="form.subReason" />
             </el-form-item>
         </el-row>
@@ -50,7 +50,7 @@
           <el-col :span="6" class="bd_right bd_padding">处置许可时间</el-col>
           <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
         </el-row>
-        <el-row class="bd_bottom">
+<!--        <el-row class="bd_bottom">
           <el-col :span="6" >申报资料</el-col>
           <el-col :span="18" class="bd_left">
             <el-row class="bd_bottom">
@@ -79,7 +79,7 @@
             </el-row>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row class="bd_bottom">
           <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
           <el-col :span="18" class="bd_padding">{{infoData.earthName}}</el-col>
@@ -6,23 +6,26 @@
     <el-row class="card_row">
       <div class="card_title">{{task.instanceName}}</div>
     </el-row>
-
-    <el-row class="card_row">
+    <el-row class="card_row" v-if="task.checkStatus == 0">
       <el-col :span="24" class="card_grid">
-        <div>时间: {{task.startTime}} - {{task.endTime}}</div>
+        <div >上一节点: {{task.prev}}</div>
       </el-col>
-
-      </el-row>
+      <el-col :span="24" class="card_grid" v-if="task.name">
+        <div >当前节点: {{task.name}}</div>
+      </el-col>
+      <el-col :span="24" class="card_grid">
+        <div >下一节点: {{task.next}}</div>
+      </el-col>
+          </el-row>
       <el-row class="card_row">
       <el-col :span="24" class="card_grid">
         <div>申请类型: {{task.type}}</div>
       </el-col>
+        <el-col :span="24" class="card_grid">
+          <div>接收时间: {{task.createdDate}}</div>
+        </el-col>
     </el-row>
-    <el-row class="card_row">
-      <el-col :span="24">
-        <div>申请理由: {{task.reason}}</div>
-      </el-col>
-    </el-row>
+    
   </el-card></a>
 </template>
@@ -34,6 +34,12 @@
     <el-dialog :title="title" :visible.sync="open2" width="300px" append-to-body>
       <threestepInfo :businessKey="businessKey"  v-if="open2"/>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="审批意见" align="center" prop="controlValue"/>
+        <el-table-column label="审批人" align="center" prop="createName"/>
+        <el-table-column label="审批时间" align="center" prop="createTime"/>
+      </el-table>
       </el-dialog>
     <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
@@ -275,6 +281,7 @@ import taskhismethod from &#39;@/api/taskhismethod&#39;
         company:false,
         driver:false,
         vehicle:false,
+        hisfromData:[],
       };
     },
     created() {
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
@@ -182,6 +183,7 @@ public class TruckActivateController extends BaseController
      */
     @Log(title = "车辆激活", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody TruckActivate truckActivate)
     {
         return truckActivateService.insertTruckActivate(truckActivate);
@@ -68,7 +68,7 @@ public interface ISupervisionThreestepService
      * @return 结果
      */
-    public void checkDataToActiveTruck(SupervisionThreestep supervisionThreestep, String tOKEN);
+    public void checkDataToActiveTruck(String token);
     int deleteSupervisionThreestepById(Long id);
@@ -809,28 +809,24 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	}
 	@Override
-	public void checkDataToActiveTruck(SupervisionThreestep construct,String token){
-		
-		String trucks = construct.getCompanyTrucks();
-		
+	public void checkDataToActiveTruck(String token){
+				
-		String[] truckArray = trucks.split(",");
+		String[] truckArray;
 		String unActiveTruck = "";
-		for(String truckId:truckArray){
-
 			TruckActivate truckActivate = new TruckActivate();
-			truckActivate.setObjectId(truckId); //设置ID
-			truckActivate.setCreateTime(construct.getCheckTime());
 			truckActivate.setStatus(0L);
+			truckActivate.setActivateStatus("0");
 			List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
-			if(taList.size() == 0 || taList.get(0).getActivateTime() == null){
-				unActiveTruck += truckId + ",";
+			for(TruckActivate ta:taList){
+					unActiveTruck += ta.getObjectId() + ",";
 			}
-		}
+			
+		
 		if(!unActiveTruck.isEmpty()){
@@ -841,7 +837,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			truckArray = unActiveTruck.split(",");
-			
 			params.put("vehicleIds", truckArray);
 			params.put("page", 1);
 			params.put("size", 9999);
@@ -850,49 +845,24 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				array = RemoteServerUtils.getTruckOnline(params);
 			else
 				array = RemoteServerUtils.getTruckOnline(params,token);
-				
+			
+			if(array == null)
+				return;
+			
 			for(Object object :array){
 				JSONObject truckObject = (JSONObject)object;
-				for(String truck: truckArray){
+				for(TruckActivate ta:taList){
-					if(truckObject.getString("vehicleId").equals(truck)){
-						TruckActivate truckActivate = new TruckActivate();
-
-						truckActivate.setStatus(0L); //当前数据
-						truckActivate.setObjectId(truck); //设置ID
-
-						List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
-
-						if(taList.size() == 1){
-							if(taList.get(0).getActivateTime() != null){ //已激活
-								continue;
-							}
-							truckActivate = taList.get(0);
-						}
-						
-						truckActivate.setConstruction(construct.getName());
-						truckActivate.setEarthsite(construct.getEarthsitesName());
-						
-						if(truckObject != null)
-							truckActivate.setLicensePlate(truckObject.getString("licenseplateNo"));//设置车牌号
+					if(truckObject.getString("vehicleId").equals(ta.getObjectId())){
-						
-						JSONObject truckInfo = RemoteServerUtils.getTruckInfo(truck,token);
-						if(truckInfo != null)
-							truckActivate.setCompany(truckInfo.getString("companyName"));
 						if(truckObject.getInteger("vehicleStatus") == 1){
-							truckActivate.setActivateTime(new Date());
-						}
-
-						if(taList.size() > 0){
-							truckActivate.setId(taList.get(0).getId());
-							truckActivateMapper.updateTruckActivate(truckActivate);
+							ta.setActivateTime(new Date());
 						}else{
-							truckActivate.setCreateTime(new Date());
-							
-							truckActivateMapper.insertTruckActivate(truckActivate);
+							continue;
 						}
+
+						truckActivateMapper.updateTruckActivate(ta);
 						break;
 					}
@@ -36,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.trash.activiti.domain.ActWorkflowFormData;
+import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.business.domain.ConstructionSign;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.service.IConstructionSignService;
@@ -88,8 +90,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	
 	@Autowired
+	IActWorkflowFormDataService awfServer;
+	
+	@Autowired
 	RuntimeService runtimeService;
 	@Autowired
@@ -132,6 +138,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		}
 		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
 		try {
@@ -158,6 +165,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				signService.insertConstructionSign(constructionSign);
 			}
+			
 			Workflow workflow = new Workflow();
 			workflow.setId(businessKey);
@@ -171,10 +179,16 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setCreateTime(new Date());
 			workflow.setCreateBy(user.getUserName());
+			awf = insertAwf(user,workflow);
+			
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-
-			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+			
+			if(processInstance != null)
+				processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+			
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			e.printStackTrace();
 		}
@@ -182,11 +196,38 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
+	private ActWorkflowFormData insertAwf(SysUser user ,Workflow workflow) {
+		
+		if(user == null){
+			user = new SysUser();
+			user.setUserName("定时器");
+		}
+		
+		ActWorkflowFormData awf;
+		awf = new ActWorkflowFormData();
+		awf.setCreateBy(user.getUserName());
+		awf.setCreateName(user.getUserName());
+		awf.setCreateTime(new Date());
+		awf.setBusinessKey(workflow.getId());
+		awf.setControlId("CREATED");
+		awf.setControlName("发起人");
+		awf.setFormKey("CREATED");
+		awf.setTaskNodeName(user.getUserName() + "发起");
+		awf.setControlValue(workflow.getTitle());
+		
+		awfServer.insertActWorkflowFormData(awf);
+		return awf;
+	}
+
 	@Override
 	@Transactional
 	public int createLeaveWorkFlow(Workflow workflow, int index) {
 		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
+		
+		SysUser user = SecurityUtils.getLoginUser().getUser();
+		
 		try {
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
@@ -207,13 +248,18 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				taskService.saveTask(task);
 			}
+			
+			awf = insertAwf(user,workflow);
+			
 			workflow.setInstanceId(processInstance.getId());
 			workflow.setCreateTime(new Date());
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 			e.printStackTrace();
@@ -226,6 +272,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Transactional
 	public int createThreeStepWorkFlow(SupervisionThreestep supervision) { // 三查
 		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
 		try {
 			String name = "报工自查:" + supervision.getName();
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
@@ -244,10 +291,16 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setInstanceId(processInstance.getId());
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
+			
+
+			SysUser user = SecurityUtils.getLoginUser().getUser();
+			awf = insertAwf(user,workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 		}
@@ -258,6 +311,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Transactional
 	public int createCaseFile(ViolationCaseFile caseFile, int index) { // 三查
 		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "workflow_casefile";
 		try {
@@ -291,9 +345,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
+			SysUser user = SecurityUtils.getLoginUser().getUser();
+			awf = insertAwf(user,workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 			throw new RuntimeException(e);
 		}
@@ -310,6 +368,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			}
 			loginService.loginByRemote(trashConfig.getToken());
 		}
+		
+		
+
+		SysUser user = null;
+		
+		try {
+			user = SecurityUtils.getLoginUser().getUser();
+		} catch (Exception e) {
+//			e.printStackTrace();
+		}
+		
+		
+		
+		
 		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
 		securityContextImpl.setAuthentication(SecurityContextHolder.getContext().getAuthentication());
@@ -320,6 +392,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		if(index > 0 && caseFile.getOwningRegion().contains("湘江新区")){
 			index += 3;
 		}
+		ActWorkflowFormData awf = null;
 		try {
 			Map map = new HashedMap<>();
@@ -350,9 +423,14 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setInstanceId(instance.getId());
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
+			
+
+			awf = insertAwf(user,workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			runtimeService.deleteProcessInstance(instance.getId(), "创建失败");
 			throw new RuntimeException(e);
 		}
@@ -363,6 +441,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Transactional
 	public int createCaseOffline(CaseOffline caseOffline) { // 三查
 		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
 		try {
 			String title = "案卷号:" + caseOffline.getNumber();
@@ -384,8 +463,22 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
+			SysUser user = null;
+			
+			try {
+				user = SecurityUtils.getLoginUser().getUser();
+			} catch (Exception e) {
+//				e.printStackTrace();
+			}
+			
+
+			awf = insertAwf(user,workflow);
+
+			
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			e.printStackTrace();
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 		}