m

youxiw2000
1 parent 66818066
Showing 20 changed files with 1075 additions and 1066 deletions
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActTaskDTO.java
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-system/src/main/java/com/trash/system/service/impl/SysDictTypeServiceImpl.java
trash-ui/dist.7z
trash-ui/dist.zip
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/taskmethod.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/caseOffline/service/impl/CaseOfflineServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/caseOffline/CaseOfflineMapper.xml
@@ -152,8 +152,7 @@ public class ActTaskDTO
 		String route = null;
 		String index = null;
-		String key = this.businessKey.split(":")[0];
-				
+		String key = et.getProcessDefinitionId();
       if(params.get("route")!=null){
           route = params.get("route").toString();
@@ -237,8 +236,7 @@ public class ActTaskDTO
 		String route = null;
 		String index = null;
-		String key = this.businessKey.split(":")[0];
-				
+		String key = task.getProcessDefinitionId();
       if(params.get("route")!=null){
           route = params.get("route").toString();
@@ -70,7 +70,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 	@Autowired
 	private IActWorkflowFormDataService actWorkflowFormDataService;
-	
+
 	@Autowired
 	private ActWorkflowFormDataMapper actWorkflowFormDataMapper;
@@ -84,7 +84,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 	UserGroupManager userGroupManager;
 	HistoricProcessInstanceQuery processInstanceQuery;
-	
+
 	@Autowired
 	private RedisCache redisCache;
@@ -92,174 +92,164 @@ public class ActTaskServiceImpl implements IActTaskService {
 	public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
 		List<ActTaskDTO> actTaskDTOS = new ArrayList<>();
-		
-		 if (ServletUtils.getParameter("role") != null) {
-			 List<String> posts = new ArrayList<>();
-			 posts.add(ServletUtils.getParameter("role"));
-		 	 SecurityUtils.getLoginUser().getUser().setPostIds(posts);
-		 }
-		 if (ServletUtils.getParameter("dept") != null) {
-			 List<String> roles = new ArrayList<>();
-			 roles.add(ServletUtils.getParameter("dept"));
-		 	 SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
-		 }
-		 if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0  || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
-		 	 return list;
-		 }
-		 
+
+		if (ServletUtils.getParameter("role") != null) {
+			List<String> posts = new ArrayList<>();
+			posts.add(ServletUtils.getParameter("role"));
+			SecurityUtils.getLoginUser().getUser().setPostIds(posts);
+		}
+		if (ServletUtils.getParameter("dept") != null) {
+			List<String> roles = new ArrayList<>();
+			roles.add(ServletUtils.getParameter("dept"));
+			SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
+		}
+		if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0
+				|| SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
+			return list;
+		}
+
 		String type = ServletUtils.getParameter("type");
 		String prev = ServletUtils.getParameter("prev");
 		String name = ServletUtils.getParameter("name");
-		if(type != null && type.isEmpty()){
+		if (type != null && type.isEmpty()) {
 			type = null;
 		}
-		if(prev != null && prev.isEmpty()){
+		if (prev != null && prev.isEmpty()) {
 			prev = null;
 		}
-		
-		
+
 		String[] strings;
 		Set<String> keys = new HashSet<String>();
-		
-		if(type != null && !type.isEmpty()){
+
+		if (type != null && !type.isEmpty()) {
 			strings = type.split(",");
 			keys = new HashSet<String>();
-			
-			for(String str:strings ){
+
+			for (String str : strings) {
 				keys.add(str);
 			}
 		}
 		org.activiti.api.runtime.shared.query.Page<Task> pageTasks;
-		
+
 		int pageNum = pageDomain.getPageNum();
 		int pageSize = pageDomain.getPageSize();
-		if(prev == null){
-			pageTasks = taskRuntime.tasks(Pageable.of((pageNum-1) * pageSize,pageSize),null,keys,name);
-		}else{
-			pageTasks = taskRuntime.tasks(Pageable.of(0,999999),null,keys,name);
+		if (prev == null) {
+			pageTasks = taskRuntime.tasks(Pageable.of((pageNum - 1) * pageSize, pageSize), null, keys, name);
+		} else {
+			pageTasks = taskRuntime.tasks(Pageable.of(0, 999999), null, keys, name);
 		}
-		
-			List<Task> tasks = pageTasks.getContent();
-			int totalItems = pageTasks.getTotalItems();
-			
-			list.setTotal(totalItems);
-			
-			if (totalItems != 0) {
-				
-				
-				Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
-				
-				if(processInstanceIdIds.size() > 0){
-					
-				
-					
-					List<Map<String, Object>> maps = actMapper.selectWorkByIds(processInstanceIdIds);
-
-				
-					for(Task task:tasks){
-						try {
-							ActTaskDTO dto = new ActTaskDTO(task,maps.parallelStream().filter(t -> t.get("instance_id").equals(task.getProcessInstanceId())).findAny().get());
-							
-							if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){
-								continue;
-							}
-							
-							list.add(dto);
-						} catch (Exception e) {
-							e.printStackTrace();
+
+		List<Task> tasks = pageTasks.getContent();
+		int totalItems = pageTasks.getTotalItems();
+
+		list.setTotal(totalItems);
+
+		if (totalItems != 0) {
+
+			Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId())
+					.collect(Collectors.toSet());
+
+			if (processInstanceIdIds.size() > 0) {
+
+				List<Map<String, Object>> maps = actMapper.selectWorkByIds(processInstanceIdIds);
+
+				for (Task task : tasks) {
+					try {
+						ActTaskDTO dto = new ActTaskDTO(task, maps.parallelStream()
+								.filter(t -> t.get("instance_id").equals(task.getProcessInstanceId())).findAny().get());
+
+						if (prev != null && !prev.isEmpty()
+								&& (dto.getPrev() == null || !dto.getPrev().contains(prev))) {
+							continue;
 						}
+
+						list.add(dto);
+					} catch (Exception e) {
+						e.printStackTrace();
 					}
 				}
 			}
+		}
+
+		if (prev != null) {
+			list.setTotal(list.size());
+		}
-			if(prev != null){
-				list.setTotal(list.size());
-			}
-			
-			
 		return list;
 	}
 	@Override
 	public Page<ActTaskDTO> selectTaskEndHistoryDefinitionList(PageDomain pageDomain) {
-		
+
 		int pageNum = pageDomain.getPageNum();
 		int pageSize = pageDomain.getPageSize();
-		
+
 		Page<ActTaskDTO> list = new Page<ActTaskDTO>();
 		ProcessEngine pes = ProcessEngines.getDefaultProcessEngine();
 		HistoryService historyService = pes.getHistoryService();
 		String username = securityManager.getAuthenticatedUserId();
-		
+
 		Map map = new HashedMap<>();
 		String type = ServletUtils.getParameter("type");
 		String name = ServletUtils.getParameter("name");
-		if(type != null && type.isEmpty()){
+		if (type != null && type.isEmpty()) {
 			type = null;
 		}
-		if(name != null && name.isEmpty()){
+		if (name != null && name.isEmpty()) {
 			name = null;
 		}
 		map.put("username", username);
-		if(name != null)
+		if (name != null)
 			map.put("name", name);
-		
-
-			List<HistoricProcessInstance> processInstanceList;
-			
-			
-			HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).finished().orderByProcessInstanceStartTime().desc();
-			
-			if(name != null)
-				query.processInstanceNameLike("%"+name+"%");
-			
-			if(type != null && !type.isEmpty()){
-				List<String> types = new ArrayList<String>();
- 				for(String string :type.split(",")){
- 					types.add(string);
- 				}
-				query.processDefinitionKeyIn(types);
-			}
-			
-			
-			list.setTotal(query.count());
-			
-			processInstanceList = query.listPage((pageNum-1) * pageSize,pageSize);
-			
-			
-			
-//			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
-			if (processInstanceList.size() > 0) {
+		List<HistoricProcessInstance> processInstanceList;
-				Set<String> idString = new HashSet<String>();
-				for (HistoricProcessInstance pi : processInstanceList) {
-					idString.add(pi.getId());
-				}
+		HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username)
+				.finished().orderByProcessInstanceStartTime().desc();
-				List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
-				
-				for (HistoricProcessInstance p : processInstanceList) {
-					try {
-						ActTaskDTO dto = new ActTaskDTO(p, 
-								maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
-						
-			
-						
-						list.add(dto);} 
-					catch (Exception e) {
-						System.out.println(p.getBusinessKey());
-						e.printStackTrace();
-					}
-				}
+		if (name != null)
+			query.processInstanceNameLike("%" + name + "%");
-			
+		if (type != null && !type.isEmpty()) {
+			List<String> types = new ArrayList<String>();
+			for (String string : type.split(",")) {
+				types.add(string);
+			}
+			query.processDefinitionKeyIn(types);
 		}
+		list.setTotal(query.count());
+
+		processInstanceList = query.listPage((pageNum - 1) * pageSize, pageSize);
+
+		// List<ActWorkflowFormData> dataList =
+		// actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
+
+		if (processInstanceList.size() > 0) {
+
+			Set<String> idString = new HashSet<String>();
+			for (HistoricProcessInstance pi : processInstanceList) {
+				idString.add(pi.getId());
+			}
+			List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
+
+			for (HistoricProcessInstance p : processInstanceList) {
+				try {
+					ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream()
+							.filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
+
+					list.add(dto);
+				} catch (Exception e) {
+					System.out.println(p.getBusinessKey());
+					e.printStackTrace();
+				}
+			}
+
+		}
 		return list;
 	}
@@ -271,49 +261,43 @@ public class ActTaskServiceImpl implements IActTaskService {
 		int pageNum = pageDomain.getPageNum();
 		int pageSize = pageDomain.getPageSize();
 		String username = securityManager.getAuthenticatedUserId();
-		
+
 		Map map = new HashedMap<>();
 		String type = ServletUtils.getParameter("type");
 		String name = ServletUtils.getParameter("name");
 		map.put("username", username);
-		if(type != null && type.isEmpty()){
+		if (type != null && type.isEmpty()) {
 			type = null;
 		}
-		if(name != null && name.isEmpty()){
+		if (name != null && name.isEmpty()) {
 			name = null;
 		}
-		
 		ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().involvedUser(username);
-		
-		
-		
-		if(name != null)
-			query.processInstanceNameLike("%"+name+"%");
-				
-		if(type != null && !type.isEmpty()){
+
+		if (name != null)
+			query.processInstanceNameLike("%" + name + "%");
+
+		if (type != null && !type.isEmpty()) {
 			Set<String> types = new HashSet<String>();
-				for(String string :type.split(",")){
-					types.add(string);
-				}
+			for (String string : type.split(",")) {
+				types.add(string);
+			}
 			query.processDefinitionKeys(types);
 		}
-		
+
 		List<ProcessInstance> processInstanceList = query.list();
-		
-		
 		list.setTotal(query.count());
-		
-		processInstanceList = query.listPage((pageNum-1) * pageSize,pageSize);
-		
+
+		processInstanceList = query.listPage((pageNum - 1) * pageSize, pageSize);
+
 		if (processInstanceList.size() > 0) {
-			
-			List<String> pids = processInstanceList.parallelStream().map(p->p.getId()).collect(Collectors.toList());
-			
+
+			List<String> pids = processInstanceList.parallelStream().map(p -> p.getId()).collect(Collectors.toList());
+
 			List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceIdIn(pids).list();
-			
 			Set<String> idString = new HashSet<String>();
 			for (ProcessInstance pi : processInstanceList) {
@@ -322,15 +306,18 @@ public class ActTaskServiceImpl implements IActTaskService {
 			List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
-			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
+			List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper
+					.selectActWorkFlowFormDataListByUser(username);
 			if (processInstanceList.size() > 0) {
 				for (ProcessInstance p : processInstanceList) {
 					try {
-						ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get(),
-								dataList.parallelStream().filter(pi ->  p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get(),
-								tasks.parallelStream().filter(t ->  p.getId().equals(t.getProcessInstanceId())).findAny().get());
-	
-						
+						ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream()
+								.filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get(),
+								dataList.parallelStream().filter(pi -> p.getBusinessKey().equals(pi.getBusinessKey()))
+										.findAny().get(),
+								tasks.parallelStream().filter(t -> p.getId().equals(t.getProcessInstanceId())).findAny()
+										.get());
+
 						list.add(dto);
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -339,7 +326,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 			}
 		}
-		
+
 		list.sort(new Comparator<ActTaskDTO>() {
 			@Override
@@ -348,7 +335,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 				return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
 			}
 		});
-		
+
 		return list;
 	}
@@ -357,12 +344,12 @@ public class ActTaskServiceImpl implements IActTaskService {
 		ActWorkflowFormData.setBusinessKey(actTaskDTOS.getBusinessKey());
 		ActWorkflowFormData.setCreateBy(securityManager.getAuthenticatedUserId());
 		ActWorkflowFormData.setControlName("审批");
-		
+
 		ActWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataList(ActWorkflowFormData).get(0);
 		actTaskDTOS.setCheckStatus(ActWorkflowFormData.getControlValue().equals("通过") ? "0" : "1");
 		actTaskDTOS.setCreatedDate(ActWorkflowFormData.getCreateTime());
-		
+
 	}
 	SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
@@ -448,59 +435,60 @@ public class ActTaskServiceImpl implements IActTaskService {
 	private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
-		org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId())
+		final org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId())
 				.singleResult();
-		
+
 		if (task == null)
 			return;
-		
-		if(task != null){
-    		
-			try{
-				
-
-	            List<Mobile> mobileList=new ArrayList<Mobile>();
-	    		
-	
-	    		String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(),task.getName());
-	    				
-	            
-	    		if(number != null){
-	    			String smsString = "工作提醒：您有新的工作流程，请及时处理。";
-	    			Mobile mobile=new Mobile();
-	                mobile.setMobile(number);
-	                mobileList.add(mobile);
-	                
-	                if(processInstance.getProcessDefinitionKey().equals("workflow_constructsite")){
-	                	
-	                	JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1]);
-	                	if(json != null)
-	                		smsString  = "审批提醒：您有新的工作流程需要审批 "+json.getString("areaCodeName")+" "+json.getString("name");
-	                	
-	                }
-	                
-	                if(processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")){
-	                	
-	                	String dname = actMapper.getCaseTypeName("case_offline_type",processInstance.getBusinessKey().split(":")[1]);
-	                	smsString  = "案卷提醒：有一条"+ dname +"的案卷，请及时处理。";
-	                }
-	                
-	                JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-	                if(jsonSmsSend!=null){
-	                    if(jsonSmsSend.getState()==0){
-	                    	System.out.println("发送成功");
-	                    }else{
-	                    	System.out.println(jsonSmsSend.getMessage());
-	                    }
-	                }else{
-	                	System.out.println("发送返回空");
-	                }
-	    		}
-			}catch(Exception e){
-				e.printStackTrace();
-			}
-    		
-    	}
+
+		if (task != null) {
+			new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+
+					List<Mobile> mobileList = new ArrayList<Mobile>();
+
+					String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(), task.getName());
+
+					if (number != null) {
+						String smsString = "工作提醒：您有新的工作流程，请及时处理。";
+						Mobile mobile = new Mobile();
+						mobile.setMobile(number);
+						mobileList.add(mobile);
+
+						if (processInstance.getProcessDefinitionKey().equals("workflow_constructsite")) {
+
+							JSONObject json = RemoteServerUtils.getConstructionInfo(processInstance.getBusinessKey().split(":")[1]);
+							if (json != null)
+								smsString = "审批提醒：您有新的工作流程需要审批 " + json.getString("areaCodeName") + " "
+										+ json.getString("name");
+
+						}
+
+						if (processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")) {
+
+							String dname = actMapper.getCaseTypeName("case_offline_type",
+									processInstance.getBusinessKey().split(":")[1]);
+							smsString = "案卷提醒：有一条" + dname + "的案卷，请及时处理。";
+						}
+
+						JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+						if (jsonSmsSend != null) {
+							if (jsonSmsSend.getState() == 0) {
+								System.out.println("发送成功");
+							} else {
+								System.out.println(jsonSmsSend.getMessage());
+							}
+						} else {
+							System.out.println("发送返回空");
+						}
+					}
+
+				}
+
+			}).start();
+		}
 		task.setDescription(placeCode);
@@ -510,10 +498,14 @@ public class ActTaskServiceImpl implements IActTaskService {
 			taskService.addCandidateUser(task.getId(), placeCode);
 		}
-		task.setDescription(placeCode);
-
 		taskService.saveTask(task);
+		if ("车辆所属企业".equals(task.getName())) {
+			org.activiti.engine.task.Task task1 = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+			taskService.setAssignee(task1.getId(), placeCode);
+			return;
+		}
+
 	}
 	@Override
@@ -51,115 +51,42 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
         List<ActWorkflowFormData> actWorkflowFormData=new ArrayList<>();
         List<Task> tasks = null;
-
-        	
-
-
-        
-        if(businessKey.contains("constructsite")){
-        	String id = businessKey.split(":")[1];
-
-        	
-        	tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite:" + id).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(new Date());
-    			
-    			returnHistoryFromDataDTOS.add(afw);
-    		}
-    		tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_constructsite_edit:" + id).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(new Date());
-    			
-    			returnHistoryFromDataDTOS.add(afw);
-    		}
-
-        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_constructsite:" + id));
-           
-        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_constructsite_edit:" + id));
-        }else if(businessKey.contains("earthsites")){
-
-        	String id = businessKey.split(":")[1];
-        	
-        	tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_earthsites:" + id).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(new Date());
-    			
-    			returnHistoryFromDataDTOS.add(afw);
-    		}
-    		tasks =taskService.createTaskQuery().processInstanceBusinessKey("workflow_earthsites_edit:" + id).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(new Date());
-    			
-    			returnHistoryFromDataDTOS.add(afw);
-    		}
-        	
-        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( "workflow_earthsites:" + id));
-           
-        	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey("workflow_earthsites_edit:" + id));
-        }else{
-        	
-            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(new Date());
-    			
-    			returnHistoryFromDataDTOS.add(afw);
-    		}
-
-        	actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
-        }
-        
+    	getEditData(businessKey,returnHistoryFromDataDTOS,actWorkflowFormData);
+//        
+//        if(businessKey.contains("constructsite")){
+//        	String id = businessKey.split(":")[1];
+//        	getEditData(id,"constructsite",returnHistoryFromDataDTOS,actWorkflowFormData);
+//        }else if(businessKey.contains("earthsites")){
+//        	String id = businessKey.split(":")[1];
+//        	getEditData(id,"earthsites",returnHistoryFromDataDTOS,actWorkflowFormData);
+//        }else if(businessKey.contains("conract")){
+//
+//        	String id = businessKey.split(":")[1];
+//        	getEditData(id,"conract",returnHistoryFromDataDTOS,actWorkflowFormData);
+//        	
+//        }else{
+//        	
+//            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(new Date());
+//    			
+//    			returnHistoryFromDataDTOS.add(afw);
+//    		}
+//
+//        	actWorkflowFormData = actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey);
+//        }
         for(int i =0;i<actWorkflowFormData.size();i++){
@@ -206,7 +133,39 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     }
-    @Override
+    private void getEditData(String businessKey,List<ActWorkflowFormData> returnHistoryFromDataDTOS,List<ActWorkflowFormData> actWorkflowFormData) {
+    	   	
+    	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(new Date());
+			returnHistoryFromDataDTOS.add(afw);
+		}
+		tasks =taskService.createTaskQuery().processInstanceBusinessKey(businessKey.replace(":", "_edit:")).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(new Date());
+			returnHistoryFromDataDTOS.add(afw);
+		}
+
+    	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey( businessKey));
+       
+    	actWorkflowFormData.addAll( actWorkflowFormDataService.selectActWorkflowFormDataByBusinessKey(businessKey.replace(":", "_edit:")));
+		
+	}
+
+
+	@Override
     public List<ActWorkflowFormData> historyFromDataByTime(Map<String,String> map) {
         List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
         List<ActWorkflowFormData> actWorkflowFormData=new ArrayList<>();
@@ -76,12 +76,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public List<SysDictData> selectDictDataByType(String dictType)
     {
-        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
-            return dictDatas;
-        }
-    	dictDatas = dictDataMapper.selectDictDataByType(dictType);
+    	List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
         if (StringUtils.isNotEmpty(dictDatas))
         {
             DictUtils.setDictCache(dictType, dictDatas);
@@ -187,18 +187,28 @@ export default {
         });
-
+          console.log(12312312);
           historyFromData(this.workflow + ":" + id).then(response => {
-
+              debugger;
                let obj = response.data[0];
                 let data  = {
                   reply:obj.controlValue,
                   replyPeople:obj.createBy,
                   replyTime:obj.createTime
                 };
-
               this.replyApprovalProcessList.push(data);
+                if(response.data[response.data.length-1].controlValue.indexOf("待") > -1){
+                  let obj = response.data[response.data.length-1];
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                  this.replyApprovalProcessList.push(data);
+                }
+
+
               listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
                 for(let i in response.rows){
@@ -171,18 +171,20 @@ export default {
       });
     },
     getStatus(item){
-      if(item.advice4){
-        return "结案存档";
+
+      if(item.status == 2){
+        return "被驳回";
       }
-      if(!item.advice1){
-        return "未回复";
+      if(item.status == 1){
+        return "结案存档";
       }
-      if(!item.advice4 && !item.advice3){
+      if(item.status1 && Number(item.status1) == 1){
         return "已回复";
       }
-      if(!item.advice4 && item.advice3){
-        return "审核中";
+      if(item.status1 && Number(item.status1) > 1){
+         return "审核中";
       }
+      return "未回复";
     },
     getSite(item){
       this.remoteQueryData.name = item;
@@ -247,7 +249,7 @@ export default {
     /** 查询线下交办案卷列表 */
     getList() {
       this.loading = true;
-      
+
       if(this.queryParams.createTime){
           this.queryParams.startTime = this.queryParams.createTime[0];
           this.queryParams.endTime = this.queryParams.createTime[1];
@@ -260,7 +262,7 @@ export default {
         }
         query.createTime = null;
-        
+
         if(query.place)
           query.place = query.place + ""
@@ -445,7 +447,7 @@ export default {
       for(var i in this.queryParams){
         query[i] = this.queryParams[i];
       }
-      
+
       if(query.place)
         query.place = query.place + ""
@@ -215,6 +215,7 @@ export default {
             })
           }
           this.form.formData = formData;
+          console.log(this.form.formData);
           if (this.definitionKey == "workflow_threestep") {
@@ -326,18 +327,35 @@ export default {
           this.title = "审批";
         });
       },
-
+      getNotId(obj,id){
+        if(!obj)
+          return false;
+        return obj.controlId!=id;
+      },
+      getLabel(obj,i){
+        if(obj){
+          return obj.controlDefault.split("--__--")[i]
+        }
+        return i == 0 ? "通过" : "驳回";
+      },
       /** 提交按钮 */
       submitForm(formid, value) {
-        this.form.formData[0].controlValue = value;
-        this.form.formData[0].controlId = formid;
-        this.form.id = this.businessKey.split(":")[1];
-        if (this.form.formData[0].controlValue == 0) {
-          this.form.status = 1;
-        } else {
-          this.form.status = 2;
+
+        for(let i in this.form.formData){
+          if(this.form.formData[i].controlType == 'radio'){
+              this.form.formData[i].controlValue = value;
+              this.form.formData[i].controlId = formid;
+              this.form.id = this.businessKey.split(":")[1];
+              if (this.form.formData[i].controlValue == 0) {
+                this.form.status = 1;
+              } else {
+                this.form.status = 2;
+              }
+          }
         }
+
+
         if (this.definitionKey == "workflow_threestep") {
@@ -346,9 +364,6 @@ export default {
               return;
             }
-
-
-
             for (let i = 0; i < 13; i++) {
               if (this.form["sub_img" + i]) {
                 let paths = "";
@@ -408,7 +423,6 @@ export default {
                     break;
                 }
               }
-
             if (this.taskName.indexOf("科员") > -1) {
               query.idx = 0;
               query.sign1Text = text;
@@ -451,6 +465,23 @@ export default {
           postData.tableName = this.businessKey;
           postData.replyImg = this.form.replyImg + "";
           postData.reply = this.form.reply;
+
+          if(!postData.reply){
+            postData.reply = "";
+          }
+
+          let text = "";
+          for (let i = 0; i < this.form.formData.length; i++) {
+            let strings = this.form.formData[i];
+            switch (strings.controlType) {
+              case 'radio':
+                postData.reply = this.form.formData[i].controlDefault.split("--__--")[value] +" "+ postData.reply
+                break;
+            }
+          }
+
+
+
           if(postData.reply==null || postData.reply==""){
             if(value==0){
               postData.reply = "通过";
@@ -459,42 +490,25 @@ export default {
             }
           }
-          addReplyApprovalProcess(postData).then(res => {
-            this.videoSrc1 = [];
-            this.slides1 = [];
-          });
-          let id = this.businessKey.split(":")[1];
-          let query = {
-            id: id,
-          };
-          let adv = this.form.advice;
-
-          if (!adv) {
-            if (value == 0) {
-              adv = "审批通过";
-            } else {
-              adv = "审批驳回";
+          if ( this.taskName == "车辆所属企业" || this.taskName == "渣土办科员" || (this.form.formData[0].controlLable == "是否属实" && this.form.formData[0].controlValue==0)) {
+            if((this.form.formData[0].controlLable == "是否属实" && this.form.formData[0].controlValue==0 && (postData.replyImg == "" || !postData.replyImg || postData.replyImg == "undefined"))
+              || (this.taskName == "渣土办科员" && (postData.replyImg == "" || !postData.replyImg || postData.replyImg == "undefined"))){
+              this.$message("请上传处置附件!")
+              return;
             }
           }
-          if (this.taskName == "渣土办科员") {
-            query.advice1 = adv;
-          } else if (this.taskName == "渣土办分管领导") {
-            query.advice2 = adv;
-          } else if (this.taskName == "治理部部长") {
-            query.advice3 = adv;
-          } else if (this.taskName == "治理部分管领导") {
-            query.advice4 = adv;
-          }
-          updateCaseOffline(query).then(res => {
+            addReplyApprovalProcess(postData).then(res => {
+              this.videoSrc1 = [];
+              this.slides1 = [];
+            });
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
               this.caseOffline = false;
               this.getList();
             });
-          })
           return;
         }
@@ -504,15 +518,32 @@ export default {
           postData.tableName = this.businessKey;
           postData.replyImg = this.form.replyImg + "";
           postData.reply = this.form.reply;
-          if(postData.reply==null || postData.reply==""){
+
+          if(!postData.reply){
+            postData.reply = "";
+          }
+
+          let text = "";
+          for (let i = 0; i < this.form.formData.length; i++) {
+            let strings = this.form.formData[i];
+            switch (strings.controlType) {
+              case 'radio':
+                postData.reply = this.form.formData[i].controlDefault.split("--__--")[value] +" "+ postData.reply
+                break;
+            }
+          }
+
+          if(postData.reply==""){
             if(value==0){
               postData.reply = "通过";
             }else{
               postData.reply = "驳回";
             }
           }
-          if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
-            if(this.taskName == "渣土办科员" && (postData.replyImg == "" || !postData.replyImg || postData.replyImg == "undefined")){
+
+          if ( this.taskName == "车辆所属企业" || this.taskName == "渣土办科员" || (this.form.formData[0].controlLable == "是否属实" && this.form.formData[0].controlValue==0)) {
+            if((this.form.formData[0].controlLable == "是否属实" && this.form.formData[0].controlValue==0 && (postData.replyImg == "" || !postData.replyImg || postData.replyImg == "undefined"))
+              || (this.taskName == "渣土办科员" && (postData.replyImg == "" || !postData.replyImg || postData.replyImg == "undefined"))){
               this.$message("请上传处置附件!")
               return;
             }
@@ -406,8 +406,8 @@
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
       </div>
     </el-dialog>
-    
-    
+
+
     <!--  投放点  -->
     <el-dialog :title="title" :visible.sync="dropInfoOpen" width="500px" append-to-body
                :close-on-click-modal="false">
@@ -426,7 +426,7 @@
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
       </div>
     </el-dialog>
-    
+
     <!--  后勤管理  -->
     <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
                :close-on-click-modal="false">
@@ -515,9 +515,11 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
-                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
-        </el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+                   v-if="this.taskName != '车辆所属企业'
+                   && this.taskName != '渣土办科员' 
+                   && getNotId(form.formData[0],'FormProperty_21sue5n')"
+                   v-text="getLabel(form.formData[0],1)"></el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)" v-text="getLabel(form.formData[0],0)"></el-button>
       </div>
     </el-dialog>
@@ -553,12 +555,13 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
-                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
+                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'
+                    && getNotId(form.formData[0],'FormProperty_21sue5n')" v-text="getLabel(form.formData[0],1)">
         </el-button>
         <el-button type="primary"
         v-loading.fullscreen.lock="modalLoading"
-        @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+        @click="submitForm(form.formData[0].controlId,0)" v-text="getLabel(form.formData[0],0)"></el-button>
       </div>
     </el-dialog>
@@ -864,6 +867,7 @@
         slidesArys: [],
         slides1: [],
         videoSrc1: [],
+        dropInfoOpen:false,
       };
     },
     created() {
@@ -24,7 +24,13 @@
               v-if="hackReset">
       <el-table-column label="行政范围" header-align="center" align="center">
         <template slot-scope="scope">
-          {{ owningRegion != "" && owningRegion != null ? owningRegion : "长沙市" }}
+          <h3>
+          {{ owningRegion != "" && owningRegion != null ? owningRegion+"" : "长沙市" }}</h3>
+
+          <h4>
+            该区域信息数{{allCount[2]}}，回复数{{allCount[3]}}，回率{{allCount[4]}}
+          </h4>
+
         </template>
       </el-table-column>
       <el-table-column property="type" label="预警类型" header-align="center" align="center"></el-table-column>
@@ -53,6 +59,7 @@ export default {
       hackReset: false,
       pickerMinDate: null,
       pickerMaxDate: null,
+      allCount:[]
     }
   },
   created() {
@@ -108,7 +115,7 @@ export default {
           }
         }
       })
-
+      this.allCount = sums;
       return sums;
     },
     handleQuery() {
@@ -43,10 +43,12 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	private ITruckCreditService truckService;
 	@Autowired
 	RedisCache redisCache;
+
 	/**
 	 * 查询企业失信
 	 *
-	 * @param id 企业失信ID
+	 * @param id
+	 *            企业失信ID
 	 * @return 企业失信
 	 */
 	@Override
@@ -57,29 +59,30 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	/**
 	 * 查询企业失信列表
 	 *
-	 * @param companyCredit 企业失信
+	 * @param companyCredit
+	 *            企业失信
 	 * @return 企业失信
 	 */
 	@Override
 	public List<CompanyCredit> selectCompanyCreditList(CompanyCredit companyCredit) {
 		List<CompanyCredit> list = new ArrayList<>();
-		
+
 		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
 		List<String> ids = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-		
-		if(areas.size() > 0) {
+
+		if (areas.size() > 0) {
 			JSONArray array = redisCache.getCacheObject("companyList");
-			if(array != null) {
-				for(Object obj:array) {
-					JSONObject json = (JSONObject)obj;
-					if(areas.indexOf(json.getString("areaCode")) > -1) {
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
 						ids.add(json.getString("id"));
 					}
 				}
 			}
 		}
-		
-		if ( ids.size()> 0) {
+
+		if (ids.size() > 0) {
 			companyCredit.setIds(SecurityUtils.getLoginUser().getUser().getCompanyIds());
 			list = companyCreditMapper.selectCompanyCreditList(companyCredit);
 		}
@@ -89,7 +92,9 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	/**
 	 * 新增企业失信
-	 * @param companyCredit 企业失信
+	 * 
+	 * @param companyCredit
+	 *            企业失信
 	 * @return 结果
 	 */
 	@SuppressWarnings("unchecked")
@@ -134,62 +139,62 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		}
 		updateRemoteCompanyAndTruck(companyCredit, token);
-		
-		
-		
+
 		return;
 	}
 	private void SendSms(CompanyCredit companyCredit) {
 		JSONArray array = redisCache.getCacheObject("companyList");
-		
-		String number = null;
-		for(Object obj:array){
-			JSONObject json = (JSONObject)obj;
-			if(companyCredit.getObjectId().equals(json.getString("id"))){
-				number = json.getString("principalPhoneNo"); //企业安全负责人
-				break;
+
+		new Thread(new Runnable() {
+
+			@Override
+			public void run() {
+				// TODO Auto-generated method stub
+
+				String number = null;
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (companyCredit.getObjectId().equals(json.getString("id"))) {
+						number = json.getString("principalPhoneNo"); // 企业安全负责人
+						break;
+					}
+				}
+
+				if (number != null) {
+					List<Mobile> mobileList = new ArrayList<Mobile>();
+					Mobile mobile = new Mobile();
+					mobile.setMobile(number);
+					mobileList.add(mobile);
+
+					String smsString = "";
+					if (companyCredit.getLostCredit() == 1) {
+						smsString = "失信提醒：" + companyCredit.getName() + "因" + companyCredit.getReason()
+								+ "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+					} else {
+						smsString = "失信解除提醒：" + companyCredit.getName() + "现已解除失信，可以进行渣土业务办理，请知悉。";
+					}
+
+					JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+					if (jsonSmsSend != null) {
+						if (jsonSmsSend.getState() == 0) {
+							System.out.println("发送成功");
+						} else {
+							System.out.println(jsonSmsSend.getMessage());
+						}
+					} else {
+						System.out.println("发送返回空");
+					}
+				}
 			}
-		}
-		
-
-        
-		if(number != null){
-			List<Mobile> mobileList=new ArrayList<Mobile>();
-			Mobile mobile=new Mobile();
-            mobile.setMobile(number);
-            mobileList.add(mobile);
-            
-            String smsString = "";
-            if(companyCredit.getLostCredit() == 1){
-                smsString = "失信提醒："+companyCredit.getName()+"因"+companyCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
-            }else{
-                smsString = "失信解除提醒："+companyCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
-            }
-    		
-            
-            
-            JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-            if(jsonSmsSend!=null){
-                if(jsonSmsSend.getState()==0){
-                	System.out.println("发送成功");
-                }else{
-                	System.out.println(jsonSmsSend.getMessage());
-                }
-            }else{
-            	System.out.println("发送返回空");
-            }
-		}
-		
+		}).start();
 	}
 	@Override
 	public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit, String token) {
 		long credit = companyCredit.getLostCredit();
 		String companyId = companyCredit.getObjectId();
-		
-		
 		List<Map> cpcList = new ArrayList<>();
 		Map cpc = new HashedMap<>();
 		cpc.put("dishonestState", credit);
@@ -232,7 +237,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 						if (credit == 0 && (data.getCreateType() != null && data.getCreateType() == 1)) {
 							data.setLostCredit(credit);
 							data.setReason("公司失信恢复");
-							truckService.updateTruckCredit(data,1);
+							truckService.updateTruckCredit(data, 1);
 							Map upParam = new HashedMap<>();
 							upParam.put("creditStatus", credit);
 							upParam.put("id", truckId);
@@ -260,7 +265,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 					data.setTime(new Date());
-//        			 data.setCreateBy(SecurityUtils.getUsername());
+					// data.setCreateBy(SecurityUtils.getUsername());
 					data.setCreateBy("");
 					data.setReason("公司失信");
@@ -269,7 +274,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 					data.setObjectId(truckId);
-					truckService.insertTruckCredit(data,1);
+					truckService.insertTruckCredit(data, 1);
 					Map upParam = new HashedMap<>();
 					upParam.put("creditStatus", credit);
@@ -289,7 +294,8 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	/**
 	 * 修改企业失信
 	 *
-	 * @param companyCredit 企业失信
+	 * @param companyCredit
+	 *            企业失信
 	 * @return 结果
 	 */
 	@Override
@@ -302,7 +308,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		try {
 			companyCreditMapper.updateCompanyCredit(cc);
-            cc.setTime(new Date());
+			cc.setTime(new Date());
 			cc.setReason(companyCredit.getReason());
 			cc.setLostCredit(0L);
@@ -320,7 +326,8 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	/**
 	 * 批量删除企业失信
 	 *
-	 * @param ids 需要删除的企业失信ID
+	 * @param ids
+	 *            需要删除的企业失信ID
 	 * @return 结果
 	 */
 	@Override
@@ -341,13 +348,13 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		List<CompanyCredit> list = new ArrayList<>();
 		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
 		List<String> ids = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-		
-		if(areas.size() > 0) {
+
+		if (areas.size() > 0) {
 			JSONArray array = redisCache.getCacheObject("companyList");
-			if(array != null) {
-				for(Object obj:array) {
-					JSONObject json = (JSONObject)obj;
-					if(areas.indexOf(json.getString("areaCode")) > -1) {
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
 						ids.add(json.getString("id"));
 					}
 				}
@@ -364,7 +371,8 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	/**
 	 * 删除企业失信信息
 	 *
-	 * @param id 企业失信ID
+	 * @param id
+	 *            企业失信ID
 	 * @return 结果
 	 */
 	@Override
@@ -167,15 +167,23 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
 			RemoteServerUtils.updateConstationCreditAndStatus(map);
 			try {
-				JSONArray array = redis.getCacheObject("constructionList");
-				if (array == null) {
-					array = JSONArray
-							.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
-				}
-				sendCreditSMS(constructionCredit.getObjectId(), constructionCredit.getName(),
-						constructionCredit.getReason(), constructionCredit.getLostCredit(), array, "credit", smsMapper,
-						"constructionCompanyPhone", "projectnCompanyPhone");
+				new Thread(new Runnable() {
+
+					@Override
+					public void run() {
+						JSONArray array = redis.getCacheObject("constructionList");
+
+						if (array == null) {
+							array = JSONArray.parseArray(
+									SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+						}
+
+						sendCreditSMS(constructionCredit.getObjectId(), constructionCredit.getName(),
+								constructionCredit.getReason(), constructionCredit.getLostCredit(), array, "credit",
+								smsMapper, "constructionCompanyPhone", "projectnCompanyPhone");
+					}
+				}).start();
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -88,20 +88,17 @@ public class DriverCreditServiceImpl implements IDriverCreditService {
 			List<String> ids = new ArrayList<>();
 			JSONArray jsonArray = redisCache.getCacheObject("driverList");
-			if(jsonArray == null){
+			if (jsonArray == null) {
 				Map map = new HashMap<>();
 				map.put("size", "99999");
 				map.put("page", "1");
 				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
-				
-				if(jsonArray != null){
+
+				if (jsonArray != null) {
 					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
 				}
-				
+
 			}
-		
-			
-			
 			for (Object obj : jsonArray) {
 				JSONObject json = (JSONObject) obj;
@@ -147,66 +144,71 @@ public class DriverCreditServiceImpl implements IDriverCreditService {
 			JSONArray array = redisCache.getCacheObject("companyList");
-			JSONArray jsonArray = redisCache.getCacheObject("driverList");
-			if(jsonArray == null){
-				Map map = new HashMap<>();
-				map.put("size", "99999");
-				map.put("page", "1");
-				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
-				
-				if(jsonArray != null){
-					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
-				}
-			}
-			
-			String companyId = null;
-
-			for (Object obj : jsonArray) {
+			new Thread(new Runnable() {
-				JSONObject json = (JSONObject) obj;
-				if (json.getString("id").equals(driverCredit.getObjectId())) {
-					companyId = json.getString("companyId");
-					break;
-				}
-			}
+				@Override
+				public void run() {
+					JSONArray jsonArray = redisCache.getCacheObject("driverList");
+					if (jsonArray == null) {
+						Map map = new HashMap<>();
+						map.put("size", "99999");
+						map.put("page", "1");
+						jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
-			if (companyId != null) {
-				String number = null;
-				for (Object obj : array) {
-					JSONObject json = (JSONObject) obj;
-					if (companyId.equals(json.getString("id"))) {
-						number = json.getString("principalPhoneNo"); // 企业安全负责人
-						break;
+						if (jsonArray != null) {
+							redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
+						}
 					}
-				}
-				if (number != null) {
-					List<Mobile> mobileList = new ArrayList<Mobile>();
-					Mobile mobile = new Mobile();
-					mobile.setMobile(number);
-					mobileList.add(mobile);
-
-					String smsString = "";
-					if (driverCredit.getLostCredit() == 1) {
-						smsString = "失信提醒：" + driverCredit.getName() + "因" + driverCredit.getReason()
-								+ "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
-					} else {
-						smsString = "失信解除提醒：" + driverCredit.getName() + "现已解除失信，可以进行渣土业务办理，请知悉。";
+					String companyId = null;
+
+					for (Object obj : jsonArray) {
+
+						JSONObject json = (JSONObject) obj;
+						if (json.getString("id").equals(driverCredit.getObjectId())) {
+							companyId = json.getString("companyId");
+							break;
+						}
 					}
-					JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
-					if (jsonSmsSend != null) {
-						if (jsonSmsSend.getState() == 0) {
-							System.out.println("发送成功");
-						} else {
-							System.out.println(jsonSmsSend.getMessage());
+					if (companyId != null) {
+						String number = null;
+						for (Object obj : array) {
+							JSONObject json = (JSONObject) obj;
+							if (companyId.equals(json.getString("id"))) {
+								number = json.getString("principalPhoneNo"); // 企业安全负责人
+								break;
+							}
+						}
+
+						if (number != null) {
+							List<Mobile> mobileList = new ArrayList<Mobile>();
+							Mobile mobile = new Mobile();
+							mobile.setMobile(number);
+							mobileList.add(mobile);
+
+							String smsString = "";
+							if (driverCredit.getLostCredit() == 1) {
+								smsString = "失信提醒：" + driverCredit.getName() + "因" + driverCredit.getReason()
+										+ "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+							} else {
+								smsString = "失信解除提醒：" + driverCredit.getName() + "现已解除失信，可以进行渣土业务办理，请知悉。";
+							}
+
+							JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+							if (jsonSmsSend != null) {
+								if (jsonSmsSend.getState() == 0) {
+									System.out.println("发送成功");
+								} else {
+									System.out.println(jsonSmsSend.getMessage());
+								}
+							} else {
+								System.out.println("发送返回空");
+							}
 						}
-					} else {
-						System.out.println("发送返回空");
 					}
 				}
-			}
-
+			}).start();
 		}
 		// sentDataToRemoteServer(driverCredit);
@@ -257,7 +259,7 @@ public class DriverCreditServiceImpl implements IDriverCreditService {
 		List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
-		
+
 		if (areas.size() > 0) {
 			JSONArray array = redisCache.getCacheObject("companyList");
 			if (array != null) {
@@ -271,21 +273,20 @@ public class DriverCreditServiceImpl implements IDriverCreditService {
 		}
 		if (companys.size() > 0) {
-			
-			
+
 			List<String> ids = new ArrayList<>();
 			JSONArray jsonArray = redisCache.getCacheObject("driverList");
-			if(jsonArray == null){
+			if (jsonArray == null) {
 				Map map = new HashMap<>();
 				map.put("size", "99999");
 				map.put("page", "1");
 				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
-				
-				if(jsonArray != null){
+
+				if (jsonArray != null) {
 					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
 				}
-				
+
 			}
 			for (Object obj : jsonArray) {
@@ -33,197 +33,196 @@ import com.trash.system.mapper.SysTempMapper;
  * @date 2023-04-25
  */
 @Service
-public class TruckCreditServiceImpl implements ITruckCreditService
-{
-    @Autowired
-    private TruckCreditMapper truckCreditMapper;
-
-    @Autowired
-    RedisCache redisCache;
-    /**
-     * 查询车辆失信
-     *
-     * @param id 车辆失信ID
-     * @return 车辆失信
-     */
-    @Override
-    public TruckCredit selectTruckCreditById(Long id)
-    {
-        return truckCreditMapper.selectTruckCreditById(id);
-    }
-
-    /**
-     * 查询车辆失信列表
-     *
-     * @param truckCredit 车辆失信
-     * @return 车辆失信
-     */
-    @Override
-    public List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit)
-    {	
-    	
-    	List<TruckCredit> list = new ArrayList<>();
-
-			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-			List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
-			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
-			
-			
-			if(areas.size() > 0) {
-				JSONArray array = redisCache.getCacheObject("companyList");
-				if(array == null)
-					array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
-				if(array != null) {
-					for(Object obj:array) {
-						JSONObject json = (JSONObject)obj;
-						if(areas.indexOf(json.getString("areaCode")) > -1) {
-							companys.add(json.getString("id"));
-						}
+public class TruckCreditServiceImpl implements ITruckCreditService {
+	@Autowired
+	private TruckCreditMapper truckCreditMapper;
+
+	@Autowired
+	RedisCache redisCache;
+
+	/**
+	 * 查询车辆失信
+	 *
+	 * @param id
+	 *            车辆失信ID
+	 * @return 车辆失信
+	 */
+	@Override
+	public TruckCredit selectTruckCreditById(Long id) {
+		return truckCreditMapper.selectTruckCreditById(id);
+	}
+
+	/**
+	 * 查询车辆失信列表
+	 *
+	 * @param truckCredit
+	 *            车辆失信
+	 * @return 车辆失信
+	 */
+	@Override
+	public List<TruckCredit> selectTruckCreditList(TruckCredit truckCredit) {
+
+		List<TruckCredit> list = new ArrayList<>();
+
+		List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+		List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+
+		if (areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+			if (array == null)
+				array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
+						companys.add(json.getString("id"));
 					}
 				}
 			}
+		}
-			
-			if (tList.size() > 0 || companys.size() > 0) {
-				List<String> ids = new ArrayList<>();
-				for(String str:tList){
-					ids.add(str);
-				}
-				
-				
-				if(companys.size() > 0){
-					
-					JSONArray jsonArray = redisCache.getCacheObject("truckList");
-					if(jsonArray == null)
-						jsonArray = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("truckList"));
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(companys.indexOf(json.getString("companyID")) > -1){
-							ids.add(json.getString("id"));
-						}
+		if (tList.size() > 0 || companys.size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : tList) {
+				ids.add(str);
+			}
+
+			if (companys.size() > 0) {
+
+				JSONArray jsonArray = redisCache.getCacheObject("truckList");
+				if (jsonArray == null)
+					jsonArray = JSONArray
+							.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("truckList"));
+				for (Object obj : jsonArray) {
+					JSONObject json = (JSONObject) obj;
+					if (companys.indexOf(json.getString("companyID")) > -1) {
+						ids.add(json.getString("id"));
 					}
 				}
-				
-				truckCredit.setIds(ids);
-				
-				
-				list = truckCreditMapper.selectTruckCreditList(truckCredit);
 			}
-		
-        return list;
-    }
-
-    /**
-     * 新增车辆失信
-     *
-     * @param truckCredit 车辆失信
-     * @param isCompany 
-     * @return 结果
-     */
-    @Override
-    public int insertTruckCredit(TruckCredit truckCredit, int isCompany)
-    {	
-
-        int i; 
-
-        TruckCredit cc = new TruckCredit();
-        
-        cc.setStatus(0L);
-        cc.setLostCredit(truckCredit.getLostCredit());
-        cc.setObjectId(truckCredit.getObjectId());
-        
-        List old = truckCreditMapper.selectTruckCreditList(cc);
-        
-        if(old.size() > 0){
-        	i = 1;
-        }else{
-            cc.setTime(new Date());
-        	i = truckCreditMapper.insertTruckCredit(truckCredit);
-        
-        
-        if(isCompany == 0){
-        	
-        
-	        JSONArray array = redisCache.getCacheObject("companyList");
-
-			if(array == null)
-				array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
-			String number = null;
-			for(Object obj:array){
-				JSONObject json = (JSONObject)obj;
-				if(truckCredit.getCompanyId().equals(json.getString("name"))){
-					number = json.getString("principalPhoneNo"); //企业安全负责人
-					break;
+			truckCredit.setIds(ids);
+
+			list = truckCreditMapper.selectTruckCreditList(truckCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 新增车辆失信
+	 *
+	 * @param truckCredit
+	 *            车辆失信
+	 * @param isCompany
+	 * @return 结果
+	 */
+	@Override
+	public int insertTruckCredit(TruckCredit truckCredit, int isCompany) {
+
+		int i;
+
+		TruckCredit cc = new TruckCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(truckCredit.getLostCredit());
+		cc.setObjectId(truckCredit.getObjectId());
+
+		List old = truckCreditMapper.selectTruckCreditList(cc);
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+			cc.setTime(new Date());
+			i = truckCreditMapper.insertTruckCredit(truckCredit);
+
+			new Thread(new Runnable() {
+
+				@Override
+				public void run() {
+					// TODO Auto-generated method stub
+
+					if (isCompany == 0) {
+
+						JSONArray array = redisCache.getCacheObject("companyList");
+
+						if (array == null)
+							array = JSONArray
+									.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+						String number = null;
+						for (Object obj : array) {
+							JSONObject json = (JSONObject) obj;
+							if (truckCredit.getCompanyId().equals(json.getString("name"))) {
+								number = json.getString("principalPhoneNo"); // 企业安全负责人
+								break;
+							}
+						}
+
+						if (number != null) {
+							List<Mobile> mobileList = new ArrayList<Mobile>();
+							Mobile mobile = new Mobile();
+							mobile.setMobile(number);
+							mobileList.add(mobile);
+
+							String smsString = "";
+							if (truckCredit.getLostCredit() == 1) {
+								smsString = "失信提醒：" + truckCredit.getLicensePlate() + "因" + truckCredit.getReason()
+										+ "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+							} else {
+								smsString = "失信解除提醒：" + truckCredit.getLicensePlate() + "现已解除失信，可以进行渣土业务办理，请知悉。";
+							}
+
+							JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+							if (jsonSmsSend != null) {
+								if (jsonSmsSend.getState() == 0) {
+									System.out.println("发送成功");
+								} else {
+									System.out.println(jsonSmsSend.getMessage());
+								}
+							} else {
+								System.out.println("发送返回空");
+							}
+						}
+					}
+
 				}
-			}
-			
-					
-	        
-			if(number != null){
-				List<Mobile> mobileList=new ArrayList<Mobile>();
-				Mobile mobile=new Mobile();
-	            mobile.setMobile(number);
-	            mobileList.add(mobile);
-	            
-	            String smsString = "";
-	            if(truckCredit.getLostCredit() == 1){
-	                smsString = "失信提醒："+truckCredit.getLicensePlate()+"因"+truckCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
-	            }else{
-	                smsString = "失信解除提醒："+truckCredit.getLicensePlate()+"现已解除失信，可以进行渣土业务办理，请知悉。";
-	            }
-	    		
-	            
-	            
-	            JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-	            if(jsonSmsSend!=null){
-	                if(jsonSmsSend.getState()==0){
-	                	System.out.println("发送成功");
-	                }else{
-	                	System.out.println(jsonSmsSend.getMessage());
-	                }
-	            }else{
-	            	System.out.println("发送返回空");
-	            }
-			}
-        }}
-        return i;
-    }
-
-
-    
-    
-    /**
-     * 修改车辆失信
-     *
-     * @param truckCredit 车辆失信
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateTruckCredit(TruckCredit truckCredit,int i)
-    {	
-    	TruckCredit cc = null;
-    	if(truckCredit.getObjectId() != null){
-    		cc = truckCreditMapper.selectTruckCreditByObjectId(truckCredit.getObjectId());
-    	}else{
-    		cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
-    	}
-    	
-    	if(cc == null)
-    		return 0;
-
-        cc.setStatus(1L);
-
-        try {
-            truckCreditMapper.updateTruckCredit(cc);
-
-            cc.setReason(truckCredit.getReason());
-            cc.setTime(new Date());
-            cc.setLostCredit(0L);
-            
-            List<Map> listParam = new ArrayList<>();
-            Map param = new HashMap<>();
+			}).start();
+		}
+		return i;
+	}
+
+	/**
+	 * 修改车辆失信
+	 *
+	 * @param truckCredit
+	 *            车辆失信
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int updateTruckCredit(TruckCredit truckCredit, int i) {
+		TruckCredit cc = null;
+		if (truckCredit.getObjectId() != null) {
+			cc = truckCreditMapper.selectTruckCreditByObjectId(truckCredit.getObjectId());
+		} else {
+			cc = truckCreditMapper.selectTruckCreditById(truckCredit.getId());
+		}
+
+		if (cc == null)
+			return 0;
+
+		cc.setStatus(1L);
+
+		try {
+			truckCreditMapper.updateTruckCredit(cc);
+
+			cc.setReason(truckCredit.getReason());
+			cc.setTime(new Date());
+			cc.setLostCredit(0L);
+
+			List<Map> listParam = new ArrayList<>();
+			Map param = new HashMap<>();
 			param.put("id", cc.getObjectId());
 			param.put("creditStatus", 0);
@@ -231,115 +230,110 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 			listParam.add(param);
 			RemoteServerUtils.updateTruckList(listParam);
-            
-            return insertTruckCredit(cc,i);
-
-        } catch (Exception e) {
-
-        }
-
-        return 0;
-    }
-
-    /**
-     * 批量删除车辆失信
-     *
-     * @param ids 需要删除的车辆失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTruckCreditByIds(Long[] ids)
-    {
-        return truckCreditMapper.deleteTruckCreditByIds(ids);
-    }
-
-
-    @Override
-    public List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit)
-    {
-    	List<TruckCredit> list = new ArrayList<>();
-			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-			List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
-			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
-			
-			
-			if(areas.size() > 0) {
-				JSONArray array = redisCache.getCacheObject("companyList");
-
-				if(array == null)
-					array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
-				
-				if(array != null) {
-					for(Object obj:array) {
-						JSONObject json = (JSONObject)obj;
-						if(areas.indexOf(json.getString("areaCode")) > -1) {
-							companys.add(json.getString("id"));
-						}
+
+			return insertTruckCredit(cc, i);
+
+		} catch (Exception e) {
+
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 批量删除车辆失信
+	 *
+	 * @param ids
+	 *            需要删除的车辆失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteTruckCreditByIds(Long[] ids) {
+		return truckCreditMapper.deleteTruckCreditByIds(ids);
+	}
+
+	@Override
+	public List<TruckCredit> selectTruckCreditHistory(TruckCredit truckCredit) {
+		List<TruckCredit> list = new ArrayList<>();
+		List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+		List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+
+		if (areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+
+			if (array == null)
+				array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
+						companys.add(json.getString("id"));
 					}
 				}
 			}
-			if (tList.size() > 0 || companys.size() > 0) {
-				List<String> ids = new ArrayList<>();
-				for(String str:tList){
-					ids.add(str);
+		}
+		if (tList.size() > 0 || companys.size() > 0) {
+			List<String> ids = new ArrayList<>();
+			for (String str : tList) {
+				ids.add(str);
+			}
+
+			if (companys.size() > 0) {
+
+				JSONArray jsonArray = redisCache.getCacheObject("truckList");
+				JSONArray delete = redisCache.getCacheObject("deletedTrucks");
+
+				if (delete == null) {
+					Map<String, Object> map = new HashMap<>();
+					map.put("size", 99999);
+					map.put("valid", 1);
+					map.put("page", 1);
+
+					delete = RemoteServerUtils.getTruckList(map);
+					redisCache.setCacheObject("deletedTrucks", delete);
 				}
-				
-				
-				if(companys.size() > 0){
-					
-					JSONArray jsonArray = redisCache.getCacheObject("truckList");
-					JSONArray delete= redisCache.getCacheObject("deletedTrucks");
-					
-					if(delete == null){
-						Map<String, Object> map = new HashMap<>();
-						map.put("size", 99999);
-						map.put("valid", 1);
-						map.put("page", 1);
-
-						delete = RemoteServerUtils.getTruckList(map);
-						redisCache.setCacheObject("deletedTrucks", delete);
-					}
-					
-					if(jsonArray != null){
-						if(delete != null)
-							jsonArray.addAll(delete);
-						
-						
-						for(Object obj:jsonArray){
-							JSONObject json = (JSONObject) obj;
-							if(companys.indexOf(json.getString("companyID")) > -1){
-								ids.add(json.getString("id"));
-							}
+
+				if (jsonArray != null) {
+					if (delete != null)
+						jsonArray.addAll(delete);
+
+					for (Object obj : jsonArray) {
+						JSONObject json = (JSONObject) obj;
+						if (companys.indexOf(json.getString("companyID")) > -1) {
+							ids.add(json.getString("id"));
 						}
 					}
 				}
-				
-				truckCredit.setIds(ids);
-				
-				list = truckCreditMapper.selectTruckCreditHistory(truckCredit);
 			}
-        return list;
-    }
-
-    /**
-     * 删除车辆失信信息
-     *
-     * @param id 车辆失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTruckCreditById(Long id)
-    {
-        return truckCreditMapper.deleteTruckCreditById(id);
-    }
-
-    public List<String> getNames(TruckCredit truckCredit){
-        return truckCreditMapper.getNames(truckCredit);
-    }
-    
-    public List<String> getCompanys(TruckCredit truckCredit){
-        return truckCreditMapper.getCompanys(truckCredit);
-    }
+			truckCredit.setIds(ids);
+
+			list = truckCreditMapper.selectTruckCreditHistory(truckCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 删除车辆失信信息
+	 *
+	 * @param id
+	 *            车辆失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteTruckCreditById(Long id) {
+		return truckCreditMapper.deleteTruckCreditById(id);
+	}
+
+	public List<String> getNames(TruckCredit truckCredit) {
+		return truckCreditMapper.getNames(truckCredit);
+	}
+
+	public List<String> getCompanys(TruckCredit truckCredit) {
+		return truckCreditMapper.getCompanys(truckCredit);
+	}
 }
@@ -91,23 +91,24 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
 		JSONArray construList = redisCache.getCacheObject("constructionList");
 		JSONArray companyList = redisCache.getCacheObject("companyList");
-		
-		if(caseOffline.status1 != null){
-			if(caseOffline.status1.equals("0")){
-				caseOffline.status1 = " and advice1 is null";
-			}else if(caseOffline.status1.equals("1")){
-				caseOffline.status1 = " and advice1 is not null and advice3 is null";
-			}else if(caseOffline.status1.equals("2")){
-				caseOffline.status1 = " and advice3 is not null and advice4 is null";
-			}else if(caseOffline.status1.equals("3")){
-				caseOffline.status1 = " and advice4 is not null";
-			}
-		}
-		
+			
 		companyArea.add("x");
 		cArea.add("x");
 		eArea.add("x");
+		if (caseOffline.getStatus1() != null) {
+			if (caseOffline.getStatus1().equals("0")) {
+				caseOffline.setStatus1(" and status1 = 0 and status = 0");
+			} else if (caseOffline.getStatus1().equals("1")) {
+				caseOffline.setStatus1(" and status1 = 1 and status = 0");
+			} else if (caseOffline.getStatus1().equals("2")) {
+				caseOffline.setStatus1(" and status1 > 1 and status = 0");
+			} else if (caseOffline.getStatus1().equals("3")) {
+				caseOffline.setStatus1(" and status = 1");
+			}
+		}
+
+		
 		caseOffline.setCompanyArea(companyArea);
 		caseOffline.setcArea(cArea);
 		caseOffline.seteArea(eArea);
@@ -115,19 +116,6 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         return caseOfflineMapper.selectCaseOfflineList(caseOffline);
     }
-
-    
-    String[] typeName = {
-    		"渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥",
-    		"未洗车出场或者出场清洁不彻底",
-    		"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场",
-    	    "非核准车辆进入渣土处置工地运输渣土",
-    	    "渣土处置工地未按规定时间开停工",
-    	    "渣土处置工地洗车设施等破损、未正常使用及措施不到位的",
-    	    "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
-    	    "无许可消纳（工）",
-    	    "无许可消纳（消）",
-    	    "使用非专用车辆"};
     /**
      * 新增线下交办案卷
@@ -383,23 +383,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
 			return result;
 		}
-		int i = 0;
-		// 根据发送对象判断流程
-		if (violationCaseFile.getSendObject().equals("区管理部门")) {
-
-			if (violationCaseFile.getViolationGrade().equals("一般类")) {
-				i = 1;
-			} else {
-				i = 2;
-			}
-		}
-		if (violationCaseFile.getViolationType().equals("三无车辆进入工地")
-				|| violationCaseFile.getViolationType().equals("三无车辆进入处理场所")
-				|| violationCaseFile.getViolationType().equals("三无车辆运输")) {
-			i = 2;
-		}
-
-		WorkflowService.createCaseFile(violationCaseFile, i);
+		WorkflowService.createCaseFile(violationCaseFile, 0);
 		return result;
 	}
@@ -84,7 +84,6 @@ public interface IWorkflowService
 	public void deleteWorkflowByName(String string);
-	int createCaseFileByTask(ViolationCaseFile violationCaseFile,int index);
 	int createCaseOffline(CaseOffline caseOffline);
@@ -25,6 +25,7 @@ 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.ConstructionCredit;
 import com.trash.business.domain.ConstructionSign;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.service.IConstructionSignService;
@@ -32,13 +33,16 @@ import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.common.core.domain.entity.SysDictData;
 import com.trash.common.core.domain.entity.SysUser;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.framework.web.service.SysLoginService;
+import com.trash.system.service.ISysDictTypeService;
 import com.trash.system.service.ISysUserService;
 import com.trash.workflow.domain.Workflow;
 import com.trash.workflow.mapper.WorkflowMapper;
@@ -77,17 +81,14 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	String siteType[] = { "处理场所", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急处理场所", "回填场" };
 	String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
-	
-	String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; //车企人外区
-	   
-	
+
+	String tcdOutArea = "长沙县,望城区,浏阳市,宁乡市"; // 车企人外区
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-	
 	@Autowired
 	IActWorkflowFormDataService awfServer;
-	
+
 	@Autowired
 	RuntimeService runtimeService;
@@ -100,9 +101,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Override
 	@Transactional
 	public int createWorkFlow(Map<String, Object> data) { // 第三方通用接收接口
-		
+
 		SysUser user = SecurityUtils.getLoginUser().getUser();
-		
+
 		String flowType = data.get("type").toString();
 		Map map = (Map) data.get("data");
@@ -115,24 +116,25 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		String areaCode = null;
 		int index = 0;
 		JSONArray areas = RemoteServerUtils.getAreas();
-		if (map.get("area") != null){
+		if (map.get("area") != null) {
 			areaCode = map.get("area").toString();
-			
-			if(flowType.equals("workflow_vehicle") || flowType.equals("workflow_company") || flowType.equals("workflow_driver")){
-				for(Object obj : areas){
+
+			if (flowType.equals("workflow_vehicle") || flowType.equals("workflow_company")
+					|| flowType.equals("workflow_driver")) {
+				for (Object obj : areas) {
 					JSONObject jsonObject = (JSONObject) obj;
-					if(areaCode.equals(jsonObject.getString("code"))){
-						if(tcdOutArea.contains(jsonObject.getString("name"))){
+					if (areaCode.equals(jsonObject.getString("code"))) {
+						if (tcdOutArea.contains(jsonObject.getString("name"))) {
 							index = 1;
 						}
 						break;
 					}
 				}
-			}else{
-				for(Object obj : areas){
+			} else {
+				for (Object obj : areas) {
 					JSONObject jsonObject = (JSONObject) obj;
-					if(areaCode.equals(jsonObject.getString("code"))){
-						if(outArea.contains(jsonObject.getString("name"))){
+					if (areaCode.equals(jsonObject.getString("code"))) {
+						if (outArea.contains(jsonObject.getString("name"))) {
 							index = 1;
 						}
 						break;
@@ -145,7 +147,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		ActWorkflowFormData awf = null;
 		try {
-			
+
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType)
 					.withName(title).withVariable("route", index).withBusinessKey(businessKey).build());
@@ -167,7 +169,6 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				signService.insertConstructionSign(constructionSign);
 			}
-			
 			Workflow workflow = new Workflow();
 			workflow.setId(businessKey);
@@ -182,15 +183,15 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setCreateBy(user.getUserName());
 			workflow.setCreateName(user.getUserName());
-			awf = insertAwf(user,workflow);
-			
+			awf = insertAwf(user, workflow);
+
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			
-			if(processInstance != null)
+
+			if (processInstance != null)
 				processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
-			
-			if(awf.getId() != null)
+
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			e.printStackTrace();
@@ -199,13 +200,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
-	private ActWorkflowFormData insertAwf(SysUser user ,Workflow workflow) {
-		
-		if(user == null){
+	private ActWorkflowFormData insertAwf(SysUser user, Workflow workflow) {
+
+		if (user == null) {
 			user = new SysUser();
 			user.setUserName("长沙市建筑垃圾智慧监管平台");
 		}
-		
+
 		ActWorkflowFormData awf;
 		awf = new ActWorkflowFormData();
 		awf.setCreateBy(user.getUserName());
@@ -217,7 +218,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		awf.setFormKey("CREATED");
 		awf.setTaskNodeName(user.getUserName() + "发起");
 		awf.setControlValue(workflow.getReason());
-		
+
 		awfServer.insertActWorkflowFormData(awf);
 		return awf;
 	}
@@ -228,9 +229,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		ProcessInstance processInstance = null;
 		ActWorkflowFormData awf = null;
-		
+
 		SysUser user = SecurityUtils.getLoginUser().getUser();
-		
+
 		try {
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
@@ -251,17 +252,16 @@ public class WorkflowServiceImpl implements IWorkflowService {
 				taskService.saveTask(task);
 			}
-			
-			awf = insertAwf(user,workflow);
-			
+			awf = insertAwf(user, workflow);
+
 			workflow.setInstanceId(processInstance.getId());
 			workflow.setCreateTime(new Date());
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
@@ -270,19 +270,19 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
-	
+
 	@Override
 	@Transactional
-	public int createDropPointWorkFlow(Map<String,String> droppoint) { // 三查
+	public int createDropPointWorkFlow(Map<String, String> droppoint) { // 三查
 		ProcessInstance processInstance = null;
 		ActWorkflowFormData awf = null;
 		try {
 			String name = "投放点审批:" + droppoint.get("name");
-			
-			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
-					.withProcessDefinitionKey("workflow_drop_point").withName(name)
-					.withBusinessKey("workflow_drop_point:" + droppoint.get("id")).build());
-			
+
+			processInstance = processRuntime
+					.start(ProcessPayloadBuilder.start().withProcessDefinitionKey("workflow_drop_point").withName(name)
+							.withBusinessKey("workflow_drop_point:" + droppoint.get("id")).build());
+
 			PorcThreeStepTask(processInstance, droppoint.get("area"));
 			Workflow workflow = new Workflow();
@@ -295,15 +295,14 @@ 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);
+			awf = insertAwf(user, workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 		}
@@ -318,34 +317,30 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		ActWorkflowFormData awf = null;
 		try {
 			String name = "报工自查:" + supervision.getName();
-			
-			    	
+
 			JSONArray areas = redisCache.getCacheObject("areas");
-			 
+
 			int route = 0;
-			    	
-			    	
-			  if(areas == null){
-			            areas = RemoteServerUtils.getAreas();
-				        redisCache.setCacheObject("areas", areas);
-			    	}	
-
-				for(Object obj : areas){
-					JSONObject jsonObject = (JSONObject) obj;
-					if(supervision.getPlace().equals(jsonObject.getString("code"))){
-						if(jsonObject.getString("name").contains("湘江新区")){
-							route = 1;
-						}
-						break;
+
+			if (areas == null) {
+				areas = RemoteServerUtils.getAreas();
+				redisCache.setCacheObject("areas", areas);
+			}
+
+			for (Object obj : areas) {
+				JSONObject jsonObject = (JSONObject) obj;
+				if (supervision.getPlace().equals(jsonObject.getString("code"))) {
+					if (jsonObject.getString("name").contains("湘江新区")) {
+						route = 1;
 					}
+					break;
 				}
-			
-			
+			}
+
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
-					.withProcessDefinitionKey("workflow_threestep").withName(name)
-					.withVariable("route", route)
+					.withProcessDefinitionKey("workflow_threestep").withName(name).withVariable("route", route)
 					.withBusinessKey("workflow_threestep:" + supervision.getId()).build());
-			
+
 			PorcThreeStepTask(processInstance, supervision.getPlace());
 			Workflow workflow = new Workflow();
@@ -358,98 +353,92 @@ 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);
+			awf = insertAwf(user, workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 		}
 		return 0;
 	}
-	
-	@Override
-	@Transactional
-	public int createCaseFileByTask(ViolationCaseFile caseFile, int index) { // 违规预警案卷
-
-			if(StringUtils.isEmpty(RemoteServerUtils.remote)) {
-				RemoteServerUtils.remote = trashConfig.getRemotePath();
-			}
-			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());
-		org.activiti.engine.runtime.ProcessInstance instance = null;
-		String title = "案卷号:" + caseFile.getNumber();
-		String flowType = "workflow_casefile";
-		
-		if(index > 0 && caseFile.getOwningRegion().contains("湘江新区")){
-			index += 3;
-		}
-		ActWorkflowFormData awf = null;
-		
-		try {
-			Map map = new HashedMap<>();
-
-			map.put("route", index);
-			instance = runtimeService.createProcessInstanceBuilder().businessKey(flowType + ":" + caseFile.getId())
-					.name(title).variable("route", index).processDefinitionKey(flowType).variables(map).start();
-
-			// runtimeService.startProcessInstanceById(instance.getProcessDefinitionId(),map);
-
-			if (index == 0) {
-				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
-
-				task.setAssignee(caseFile.getAbbreviation());
-
-				task.setDescription(caseFile.getAbbreviation());
-				taskService.saveTask(task);
-			} else {
-				updateProcessKafka(instance, caseFile.getOwningRegion(), trashConfig.getToken());
-			}
-
-			Workflow workflow = new Workflow();
-			workflow.setId(flowType + ":" + caseFile.getId());
-			workflow.setTitle(title);
-			workflow.setReason("平台案卷");
-			workflow.setStartTime(sdf.format(caseFile.getCreateTime()));
-			workflow.setEndTime(sdf.format(caseFile.getCreateTime()));
-			workflow.setType("违规案卷处置流程");
-			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);
-		}
-	}
+//	@Override
+//	@Transactional
+//	public int createCaseFileByTask(ViolationCaseFile caseFile, int index) { // 违规预警案卷
+//
+//		if (StringUtils.isEmpty(RemoteServerUtils.remote)) {
+//			RemoteServerUtils.remote = trashConfig.getRemotePath();
+//		}
+//		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());
+//		org.activiti.engine.runtime.ProcessInstance instance = null;
+//		String title = "案卷号:" + caseFile.getNumber();
+//		String flowType = "workflow_casefile";
+//
+//		if (index > 0 && caseFile.getOwningRegion().contains("湘江新区")) {
+//			index += 3;
+//		}
+//		ActWorkflowFormData awf = null;
+//
+//		try {
+//			Map map = new HashedMap<>();
+//
+//			map.put("route", index);
+//			instance = runtimeService.createProcessInstanceBuilder().businessKey(flowType + ":" + caseFile.getId())
+//					.name(title).variable("route", index).processDefinitionKey(flowType).variables(map).start();
+//
+//			// runtimeService.startProcessInstanceById(instance.getProcessDefinitionId(),map);
+//
+//			if (index == 0) {
+//				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
+//
+//				task.setAssignee(caseFile.getAbbreviation());
+//
+//				task.setDescription(caseFile.getAbbreviation());
+//				taskService.saveTask(task);
+//			} else {
+//				updateProcessKafka(instance, caseFile.getOwningRegion(), trashConfig.getToken());
+//			}
+//
+//			Workflow workflow = new Workflow();
+//			workflow.setId(flowType + ":" + caseFile.getId());
+//			workflow.setTitle(title);
+//			workflow.setReason("平台案卷");
+//			workflow.setStartTime(sdf.format(caseFile.getCreateTime()));
+//			workflow.setEndTime(sdf.format(caseFile.getCreateTime()));
+//			workflow.setType("违规案卷处置流程");
+//			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);
+//		}
+//
+//	}
 	@Override
 	@Transactional
@@ -459,25 +448,38 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "workflow_casefile";
 		try {
+			List<SysDictData> caseType = SpringUtils.getBean(ISysDictTypeService.class)
+					.selectDictDataByType("vio_casefile");
+
+			for (SysDictData d : caseType) {
+				if (caseFile.getViolationType().equals(d.getDictValue())) {
+					if (d.getRemark() != null) {
+						index = 1;
+					}
+					break;
+				}
+			}
-			if(index > 0 && caseFile.getOwningRegion().contains("湘江新区")){
-				index += 3;
+			if(index == 0){
+				if (tcdOutArea.indexOf(caseFile.getOwningRegion()) > -1) {
+					index = 2;
+				}
+
+				if ("湘江新区".equals(caseFile.getOwningRegion())) {
+					index = 3;
+				}
 			}
+
+
+
 			processInstance = processRuntime
 					.start(ProcessPayloadBuilder.start().withProcessDefinitionKey(flowType).withName(title)
 							.withBusinessKey(flowType + ":" + caseFile.getId()).withVariable("route", index).build());
-			if (index == 0) {
-				Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-
-				task.setAssignee(caseFile.getAbbreviation());
-				task.setDescription(caseFile.getAbbreviation());
-				taskService.saveTask(task);
-			} else {
-				updateProcess(processInstance, caseFile.getOwningRegion());
-			}
+			updateProcess(processInstance, caseFile.getOwningRegion());
+			
 			Workflow workflow = new Workflow();
 			workflow.setId(flowType + ":" + caseFile.getId());
@@ -491,19 +493,17 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setCreateTime(new Date());
 			SysUser user = SecurityUtils.getLoginUser().getUser();
-			awf = insertAwf(user,workflow);
+			awf = insertAwf(user, workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
 			e.printStackTrace();
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
 			throw new RuntimeException(e);
 		}
 	}
-	
-
 	@Override
 	@Transactional
 	public int createCaseFile1(ViolationWarningInformation caseFile, int index, int isAuto) { // 违规预警案卷
@@ -513,20 +513,15 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			}
 			loginService.loginByRemote(trashConfig.getToken());
 		}
-		
-		
 		SysUser user = null;
-		
+
 		try {
 			user = SecurityUtils.getLoginUser().getUser();
 		} catch (Exception e) {
-//			e.printStackTrace();
+			// e.printStackTrace();
 		}
-		
-		
-		
-		
+
 		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
 		securityContextImpl.setAuthentication(SecurityContextHolder.getContext().getAuthentication());
@@ -534,11 +529,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "violation_warning";
-		if(index > 0 && caseFile.getOwningRegion().contains("湘江新区")){
+		if (index > 0 && caseFile.getOwningRegion().contains("湘江新区")) {
 			index += 3;
 		}
 		ActWorkflowFormData awf = null;
-		
+
 		try {
 			Map map = new HashedMap<>();
@@ -569,13 +564,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setInstanceId(instance.getId());
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
-			
-			awf = insertAwf(user,workflow);
+			awf = insertAwf(user, workflow);
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			runtimeService.deleteProcessInstance(instance.getId(), "创建失败");
 			throw new RuntimeException(e);
@@ -591,10 +585,46 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		try {
 			String title = "案卷号:" + caseOffline.getNumber();
+			int index = 0;
+
+			List<SysDictData> caseType = SpringUtils.getBean(ISysDictTypeService.class)
+					.selectDictDataByType("case_offline_type");
+
+			for (SysDictData d : caseType) {
+				if (caseOffline.getType().equals(d.getDictValue())) {
+					if (d.getRemark() != null) {
+						index = 1;
+					}
+					break;
+				}
+			}
+			
+			if(index == 0){
+				JSONArray array = RemoteServerUtils.getAreas();
+				String placeName = "";
+				String placeCode = caseOffline.getPlace();
+
+				for (Object obj : array) {
+					if (((JSONObject) (obj)).getString("code").equals(placeCode)) {
+						placeName = ((JSONObject) (obj)).getString("name");
+						if ("湘江新区".equals(placeName)) {
+							index = 3;
+						}
+
+						break;
+					}
+				}
+				
+				if (tcdOutArea.indexOf(placeName) > -1) {
+					index = 2;
+				}
+			}
+			
 			processInstance = processRuntime
 					.start(ProcessPayloadBuilder.start().withProcessDefinitionKey("workflow_caseoffline")
-							.withName(title).withBusinessKey("workflow_caseoffline:" + caseOffline.getId()).build());
+							.withName(title).withBusinessKey("workflow_caseoffline:" + caseOffline.getId())
+							.withVariable("route", index).build());
 			PorcThreeStepTask(processInstance, caseOffline.getPlace());
@@ -610,20 +640,18 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setCreateTime(new Date());
 			SysUser user = null;
-			
+
 			try {
 				user = SecurityUtils.getLoginUser().getUser();
 			} catch (Exception e) {
-//				e.printStackTrace();
+				// e.printStackTrace();
 			}
-			
-			awf = insertAwf(user,workflow);
+			awf = insertAwf(user, workflow);
-			
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			if(awf.getId() != null)
+			if (awf.getId() != null)
 				awfServer.deleteActWorkflowFormDataById(awf.getId());
 			e.printStackTrace();
 			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
@@ -633,36 +661,35 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	}
 	private void updateProcess(ProcessInstance processInstance, String owningRegion) {
-		
-		 JSONArray array = RemoteServerUtils.getAreas();
+		JSONArray array = RemoteServerUtils.getAreas();
-	        String placeCode = null;
+		String placeCode = null;
-	        for (Object obj : array) {
-	            if (((JSONObject) (obj)).getString("name").equals(owningRegion)) {
+		for (Object obj : array) {
+			if (((JSONObject) (obj)).getString("name").equals(owningRegion)) {
-	                placeCode = ((JSONObject) (obj)).getString("code");
+				placeCode = ((JSONObject) (obj)).getString("code");
+
+				break;
+			}
+		}
+
+		if (placeCode != null) {
+			PorcThreeStepTask(processInstance, placeCode);
+		}
-	                break;
-	            }
-	        }
-		
-	        if(placeCode != null){
-	        	PorcThreeStepTask(processInstance,placeCode);
-	        }
-		
 	}
-	
+
 	public void PorcThreeStepTask(ProcessInstance processInstance, String areaCode) {
 		Map map = new HashedMap<>();
 		map.put("type", "CSUserDepartmentType");
 		Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
-		
+
 		List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
-		
+
 		if (list.size() == 1) {
 			taskService.addCandidateUser(task.getId(), areaCode);
 		}
@@ -672,23 +699,20 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		taskService.saveTask(task);
 	}
-
 	void updateProcessKafka(org.activiti.engine.runtime.ProcessInstance processInstance, String placeName,
 			String token) {
-		 JSONArray array = RemoteServerUtils.getAreas(trashConfig.getToken());
-
+		JSONArray array = RemoteServerUtils.getAreas(trashConfig.getToken());
-	        String placeCode = null;
+		String placeCode = null;
-	        for (Object obj : array) {
-	            if (((JSONObject) (obj)).getString("name").equals(placeName)) {
+		for (Object obj : array) {
+			if (((JSONObject) (obj)).getString("name").equals(placeName)) {
-	                placeCode = ((JSONObject) (obj)).getString("code");
+				placeCode = ((JSONObject) (obj)).getString("code");
-	                break;
-	            }
-	        }
-		
+				break;
+			}
+		}
 		if (placeCode != null) {
 			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
@@ -25,6 +25,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="advice3Time"    column="advice3_time"    />
         <result property="advice4Time"    column="advice4_time"    />
         <result property="attach"    column="attach"    />
+        <result property="status1"    column="status1"    />
     </resultMap>
     <sql id="selectCaseOfflineVo">
@@ -32,9 +33,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </sql>
     <select id="selectCaseOfflineList" parameterType="CaseOffline" resultMap="CaseOfflineResult">
-        <include refid="selectCaseOfflineVo"/>
+                select a.*,c.status1 from case_offline a
+        left join (select a.table_name,count(*) status1 from 
+					(select * from reply_approval_process b where table_name like "%workflow_caseoffline%" GROUP BY b.table_name,b.reply_people) a
+					group by a.table_name) c 
+		on CONCAT("workflow_caseoffline:",a.id) = c.table_name
         <where>  
-            <if test="status1 != null "> ${status1}</if>
+            <if test="status1 != null ">${status1}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="place != null  and place != ''">and LOCATE(place , #{place}) > 0</if>
             <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>