m

youxiw2000
1 parent 132a9741
Showing 56 changed files with 2059 additions and 1101 deletions
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.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-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-common/src/main/java/com/trash/common/utils/DictUtils.java
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-common/src/main/java/com/trash/common/utils/SmsSend.java
trash-common/src/main/java/com/trash/common/utils/util/SmsConf.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-system/src/main/java/com/trash/system/service/impl/SysDictTypeServiceImpl.java
trash-ui/dist.7z
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/track.js
trash-ui/src/api/trackTable.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/vio_casefile_info.js
trash-ui/src/api/vio_warning_info.js
@@ -32,4 +32,8 @@ public interface ActReDeploymentMapper {
 		public List<String> selectHistTitles(String name);
+		public String getPhoneNumber(@Param("type")String  type ,@Param("checkpoint") String checkpoint);
+
+		public String getCaseTypeName(@Param("type")String  type ,@Param("id") String id);
+
 }
@@ -4,20 +4,13 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import javax.validation.constraints.Null;
-
-import com.trash.common.utils.StringUtils;
 import org.activiti.api.runtime.shared.identity.UserGroupManager;
 import org.activiti.api.runtime.shared.query.Pageable;
 import org.activiti.api.runtime.shared.security.SecurityManager;
@@ -33,18 +26,13 @@ import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricProcessInstanceQuery;
-import org.activiti.engine.query.QueryProperty;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.activiti.engine.task.IdentityLink;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.stereotype.Service;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.ActTaskDTO;
@@ -56,12 +44,12 @@ import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.activiti.service.myTaskService;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.redis.RedisCache;
-import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
-import com.trash.common.utils.spring.SpringUtils;
-
-import io.jsonwebtoken.lang.Strings;
+import com.trash.common.utils.StringUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 @Service
 public class ActTaskServiceImpl implements IActTaskService {
@@ -451,10 +439,64 @@ public class ActTaskServiceImpl implements IActTaskService {
 		if (desc != null)
 			updateThreesetpTask(processInstance, desc);
+		
+		checkPostSMS(processInstance,task);
 		// 写入数据库
 		return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
 	}
+	
+	
+	
+	private void checkPostSMS(ProcessInstance processInstance,Task task){
+		
+		String key = processInstance.getProcessDefinitionKey();
+		
+		
+    	org.activiti.engine.task.Task tasks =taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+    	
+    	if(tasks != null){
+    		
+            List<Mobile> mobileList=new ArrayList<Mobile>();
+    		
+
+    		String number = actMapper.getPhoneNumber(key,task.getName());
+    				
+            
+    		if(number != null){
+    			String smsString = "【长沙渣管】工作提醒：您有新的工作流程，请及时处理。";
+    			Mobile mobile=new Mobile();
+                mobile.setMobile(number);
+                mobileList.add(mobile);
+                
+                if(key.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("发送返回空");
+                }
+    		}
+    		
+    	}
+    	
+    	
+    	
+    	
+    	
+		
+		System.out.println("判断是否发短信!");
+		
+	}
 	private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
@@ -69,7 +69,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     			afw.setControlName("审批");
-    			afw.setControlValue("待审批");
+    			afw.setControlValue("待处理");
     			afw.setTaskNodeName(tasks.get(0).getName());
     			afw.setCreateBy(tasks.get(0).getName());
     			afw.setCreateName(tasks.get(0).getName());
@@ -85,7 +85,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     			afw.setControlName("审批");
-    			afw.setControlValue("待审批");
+    			afw.setControlValue("待处理");
     			afw.setTaskNodeName(tasks.get(0).getName());
     			afw.setCreateBy(tasks.get(0).getName());
     			afw.setCreateName(tasks.get(0).getName());
@@ -110,7 +110,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     			afw.setControlName("审批");
-    			afw.setControlValue("待审批");
+    			afw.setControlValue("待处理");
     			afw.setTaskNodeName(tasks.get(0).getName());
     			afw.setCreateBy(tasks.get(0).getName());
     			afw.setCreateName(tasks.get(0).getName());
@@ -126,7 +126,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     			afw.setControlName("审批");
-    			afw.setControlValue("待审批");
+    			afw.setControlValue("待处理");
     			afw.setTaskNodeName(tasks.get(0).getName());
     			afw.setCreateBy(tasks.get(0).getName());
     			afw.setCreateName(tasks.get(0).getName());
@@ -148,7 +148,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     			afw.setControlName("审批");
-    			afw.setControlValue("待审批");
+    			afw.setControlValue("待处理");
     			afw.setTaskNodeName(tasks.get(0).getName());
     			afw.setCreateBy(tasks.get(0).getName());
     			afw.setCreateName(tasks.get(0).getName());
@@ -39,6 +39,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
+	<select id="getCaseTypeName"  parameterType="String" resultType="java.lang.String">
+		select dict_label from sys_dict_data where dict_type =  #{type} and dict_value = (
+			select type from case_offline where id = #{id}
+		)
+	</select>
+	
+	
+	<select id="getPhoneNumber"  parameterType="String" resultType="java.lang.String">
+	   	select number from sms where checkpoint = #{checkpoint} and type = #{type}
+	</select>
+	
 	<select id="selectTitles"  parameterType="String" resultType="java.lang.String">
 			select DISTINCT title from workflow
 			<where>
@@ -2,6 +2,7 @@ package com.trash.common.utils;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import com.trash.common.constant.Constants;
 import com.trash.common.core.domain.entity.SysDictData;
@@ -28,7 +29,7 @@ public class DictUtils
      */
     public static void setDictCache(String key, List<SysDictData> dictDatas)
     {
-        SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
+        SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas,5,TimeUnit.MINUTES);
     }
     /**
@@ -32,6 +32,9 @@ import javax.net.ssl.X509TrustManager;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -65,6 +68,7 @@ public class RemoteServerUtils {
 	public static String constructionLicenseById = "/api/siteservice/cs/constructionsites/";
 	public static String ConstructionList = "/api/siteservice/cs/constructionsites/search";
+	public static String ConstructionLedgerList = "/api/siteservice/cs/constructionsites/ledger/list";
 	public static String UpdateConstruction = "/api/siteservice/cs/constructionsites/status";
@@ -153,6 +157,18 @@ public class RemoteServerUtils {
 		return list;
 	}
+	
+	public static JSONArray getConstructionLedgerList(Map map) {
+		JSONArray list = null;
+		Object object = post(ConstructionLedgerList, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
 	public static JSONArray getConstructionList(Map map) {
 		JSONArray list = null;
@@ -804,6 +820,27 @@ public class RemoteServerUtils {
 		return turckList;
 	}
+	
+	
+	public static JSONArray getDriverList() {
+
+		try {
+			Map map = new HashMap<>();
+			Object result = get(DriverListPath, null);
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result.toString());
+				return json.getJSONArray("list");
+
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
 	public static JSONArray getDriverList(String token) {
@@ -1231,7 +1268,7 @@ public class RemoteServerUtils {
 		return get(GETAUTH, null, token.replace("Bearer ", ""));
 	}
-
-
+	
+	
 }
@@ -17,7 +17,7 @@ public class SmsSend {
         try{
             //发送
             Mobile mobile=new Mobile();
-            mobile.setMobile("13800009999");
+            mobile.setMobile("15201713620");
             List<Mobile> mobileList=new ArrayList<Mobile>();
             mobileList.add(mobile);
             //更新提交信息
@@ -8,8 +8,8 @@ public class SmsConf {
 	public static String queyrbalanceUrl = "http://172.31.253.178:5050/ims/sms/queryBalance";//查询发送能力地址
 	public static String smsMoUrl = "http://172.31.253.178:9090/ims/sms/queryMo";//取上行地址
 	public static String smsRptUrl = "http://172.31.253.178:9090/ims/sms/queryRpt";//取回执地址
-	public static String smsUserName="账户名";//账户名
-	public static String smsPasswd="账号密码";//账号密码
+	public static String smsUserName="cssjzljzhjgpt";//账户名
+	public static String smsPasswd="jfQrxC@21";//账号密码
@@ -56,6 +56,9 @@ import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.spring.SpringUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 import com.trash.office.domain.LogisticsManagement;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.LogisticsManagementMapper;
@@ -79,160 +82,150 @@ public class DriverTask {
 	@Autowired
 	private RedisCache redisCache;
-	
-	public void getUpCase(){
+
+	public void getUpCase() {
 		JSONArray array = RemoteServerUtils.getCaseList();
 		Map map = new HashMap<>();
 		List<String> ids = new ArrayList<String>();
-		
-		if(array != null && array.size() > 0){
-			for(Object object:array){
+
+		if (array != null && array.size() > 0) {
+			for (Object object : array) {
 				JSONObject json = (JSONObject) object;
 				try {
-					ViolationCaseFile caseFile  = new ViolationCaseFile(json);
-					
-					
+					ViolationCaseFile caseFile = new ViolationCaseFile(json);
+
 					for (Object fileObj : json.getJSONArray("attchList")) {
-						
-						JSONObject fileJSON = (JSONObject)fileObj;
-			            UploadFile uploadFile = new UploadFile();
-			            uploadFile.setTableName("violation_case_file");
-			            uploadFile.setTableNumber(caseFile.getId().toString());
-			            uploadFile.setFileName(fileJSON.getString("attchFileName"));
-			            uploadFile.setFilePath(fileJSON.getString("attchFilePath"));
-			            
-			            SpringUtils.getBean(UploadFileMapper.class).insertUploadFile(uploadFile);
-			        }
-					
-					
+
+						JSONObject fileJSON = (JSONObject) fileObj;
+						UploadFile uploadFile = new UploadFile();
+						uploadFile.setTableName("violation_case_file");
+						uploadFile.setTableNumber(caseFile.getId().toString());
+						uploadFile.setFileName(fileJSON.getString("attchFileName"));
+						uploadFile.setFilePath(fileJSON.getString("attchFilePath"));
+
+						SpringUtils.getBean(UploadFileMapper.class).insertUploadFile(uploadFile);
+					}
+
 					SpringUtils.getBean(ViolationCaseFileMapper.class).insertViolationCaseFile(caseFile);
-					
 					ids.add(caseFile.getId());
-					
+
 				} catch (BeansException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
+
 			}
-			
+
 			map.put("taskIds", ids);
 			map.put("taskType", "Q2");
 			RemoteServerUtils.updateUpCase(map);
 		}
-		
-		
-		
+
 	}
-	
-	public void getUpCaseState(){
-		
-		
-		getCaseStateIntoDB("/api/thirdApi/query/urgeList","urgeUser","urgeDesc","urgeTime","Q5");
-		
-		getCaseStateIntoDB("/api/thirdApi/query/superviseList","supUser","supDesc","supTime","Q4");
-		
-		
+	public void getUpCaseState() {
+
+		getCaseStateIntoDB("/api/thirdApi/query/urgeList", "urgeUser", "urgeDesc", "urgeTime", "Q5");
+
+		getCaseStateIntoDB("/api/thirdApi/query/superviseList", "supUser", "supDesc", "supTime", "Q4");
+
 		JSONArray array = RemoteServerUtils.getUpCaseResult();
 		Map map = new HashMap<>();
 		List<String> ids = new ArrayList<String>();
-		
-		if(array != null && array.size() > 0){
-			for(Object object:array){
+
+		if (array != null && array.size() > 0) {
+			for (Object object : array) {
 				JSONObject json = (JSONObject) object;
-				
-				ViolationCaseFile casefile = SpringUtils.getBean(ViolationCaseFileMapper.class).selectViolationCaseFileById(json.getString("thirdCaseId"));
-				
-				if(casefile == null){
+
+				ViolationCaseFile casefile = SpringUtils.getBean(ViolationCaseFileMapper.class)
+						.selectViolationCaseFileById(json.getString("thirdCaseId"));
+
+				if (casefile == null) {
 					continue;
-				}else{
-					
-			    	Date d = new Date(json.getString("reportTime"));
-					
+				} else {
+
+					Date d = new Date(json.getString("reportTime"));
+
 					ids.add(json.getString("acceptId"));
-					
+
 					ReplyApprovalProcess rap = new ReplyApprovalProcess();
-					rap.setTableName("workflow_casefile:"+json.getString("thirdCaseId"));
+					rap.setTableName("workflow_casefile:" + json.getString("thirdCaseId"));
 					rap.setReplyPeople("综管服");
 					rap.setReply(json.getString("replyContent"));
 					rap.setReplyTime(new Date(json.getString("handleTime")));
-	
+
 					JSONArray images = json.getJSONArray("attchList");
 					String path = "";
-					try{
-						for(Object obj:images){
+					try {
+						for (Object obj : images) {
 							JSONObject img = (JSONObject) obj;
 							path += img.getString("attchFilePath") + ",";
 						}
-					}catch(Exception e){
+					} catch (Exception e) {
 						e.printStackTrace();
 					}
-					rap.setReplyImg(path.substring(0, path.length()-1));
+					rap.setReplyImg(path.substring(0, path.length() - 1));
 				}
 			}
-			
 			map.put("taskIds", ids);
 			map.put("taskType", "Q1");
 			RemoteServerUtils.updateUpCase(map);
 		}
-		
-		
 	}
-	private void getCaseStateIntoDB(String url,String arg0,String arg1,String arg2,String type) {
-		try{
-		
+	private void getCaseStateIntoDB(String url, String arg0, String arg1, String arg2, String type) {
+		try {
+
 			JSONArray array = RemoteServerUtils.getUpCaseState(url);
 			Map map = new HashMap<>();
 			List<String> ids = new ArrayList<String>();
-			
-			if(array != null && array.size() > 0){
+
+			if (array != null && array.size() > 0) {
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-				for(Object object:array){
+				for (Object object : array) {
 					JSONObject json = (JSONObject) object;
-					
+
 					ViolationCaseFile caseFile = new ViolationCaseFile();
-					
+
 					caseFile.setNumber(json.getString("evtId"));
-					
-					List<ViolationCaseFile> list = SpringUtils.getBean(ViolationCaseFileMapper.class).selectViolationCaseFileList(caseFile);
-					
-					if(list.size() == 0){
+
+					List<ViolationCaseFile> list = SpringUtils.getBean(ViolationCaseFileMapper.class)
+							.selectViolationCaseFileList(caseFile);
+
+					if (list.size() == 0) {
 						continue;
 					}
-					
+
 					ReplyApprovalProcess rap = new ReplyApprovalProcess();
-					rap.setTableName("workflow_casefile:"+list.get(0).getId());
+					rap.setTableName("workflow_casefile:" + list.get(0).getId());
 					rap.setReplyPeople(json.getString(arg0));
 					rap.setReply(json.getString(arg1));
 					try {
 						rap.setReplyTime(sdf.parse(json.getString(arg2)));
 					} catch (ParseException e) {
-						
+
 						rap.setReplyTime(new Date());
-						
+
 						e.printStackTrace();
 					}
-					
+
 					SpringUtils.getBean(ReplyApprovalProcessMapper.class).insertReplyApprovalProcess(rap);
-					
+
 					ids.add(json.getString("taskId"));
 				}
-				
+
 				map.put("taskIds", ids);
 				map.put("taskType", type);
 				RemoteServerUtils.updateUpCase(map);
 			}
-			
-			}catch(Exception e){
-				e.printStackTrace();
-			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
-	
 	Map<String, String> paramsMap = new HashMap<String, String>();
@@ -280,8 +273,8 @@ public class DriverTask {
 			paramsMap.put("type_" + i + "_timeout", arr[i * 3]);
 			paramsMap.put("type_" + i + "_season", arr[i * 3 + 1]);
 			paramsMap.put("type_" + i + "_pect", arr[i * 3 + 2]);
-		}		
-		
+		}
+
 		JSONArray areas = redisCache.getCacheObject("areaList");
 		Map<String, String> area = new HashMap<>();
@@ -289,112 +282,109 @@ public class DriverTask {
 			JSONObject json = (JSONObject) object;
 			area.put(json.getString("code"), json.getString("name"));
 		}
-		
-		try{
+
+		try {
 			int type = 5;
-			LogisticsManagement logisticsManagement= new LogisticsManagement();
-			
+			LogisticsManagement logisticsManagement = new LogisticsManagement();
+
 			Date d = new Date();
-			
+
 			d.setMonth(d.getMonth() - (Integer.parseInt(paramsMap.get("type_" + type + "_season")) * 3));
 			d.setDate(0);
 			d.setHours(23);
 			d.setMinutes(59);
 			d.setSeconds(59);
-			
+
 			logisticsManagement.setCreateTime(d);
-			
-			List<LogisticsManagement> logs = SpringUtils.getBean(LogisticsManagementMapper.class).selectLogisticsManagementList(logisticsManagement);
-			
+
+			List<LogisticsManagement> logs = SpringUtils.getBean(LogisticsManagementMapper.class)
+					.selectLogisticsManagementList(logisticsManagement);
+
 			Collections.shuffle(logs);
 			double pect = Double.parseDouble(paramsMap.get("type_" + type + "_pect")) / 100;
 			logs = logs.subList(0, (int) (logs.size() * pect));
-			
-			for(LogisticsManagement l:logs){
-				
-				String title =(l.getType().equals("0") ? "用章申请" : l.getType().equals("1")  ? "物品申请" : "采购申请");
-				
+
+			for (LogisticsManagement l : logs) {
+
+				String title = (l.getType().equals("0") ? "用章申请" : l.getType().equals("1") ? "物品申请" : "采购申请");
+
 				insertData(l.getId() + "", title, type, "综合管理部", l.getDeptName());
 			}
-			
-		}catch(Exception e){
+
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
-		try{
+
+		try {
 			int type = 6;
-			CaseOffline caseOffline= new CaseOffline();
-			
+			CaseOffline caseOffline = new CaseOffline();
+
 			Date d = new Date();
-			
+
 			d.setMonth(d.getMonth() - (Integer.parseInt(paramsMap.get("type_" + type + "_season")) * 3));
 			d.setDate(0);
 			d.setHours(23);
 			d.setMinutes(59);
 			d.setSeconds(59);
-			
+
 			caseOffline.setCreateTime(d);
-			
+
 			List<CaseOffline> logs = SpringUtils.getBean(CaseOfflineMapper.class).selectCaseOfflineList(caseOffline);
-			
+
 			Collections.shuffle(logs);
 			double pect = Double.parseDouble(paramsMap.get("type_" + type + "_pect")) / 100;
 			logs = logs.subList(0, (int) (logs.size() * pect));
-			
-			for(CaseOffline l:logs){
+
+			for (CaseOffline l : logs) {
 				insertData(l.getId() + "", "电子交办案卷:" + l.getSiteName(), type, "治理事务部", area.get(l.getPlace()));
 			}
-			
-		}catch(Exception e){
+
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
-		try{
+
+		try {
 			int type = 7;
-			ViolationCaseFile caseOffline= new ViolationCaseFile();
-			
+			ViolationCaseFile caseOffline = new ViolationCaseFile();
+
 			Date d = new Date();
-			
+
 			d.setMonth(d.getMonth() - (Integer.parseInt(paramsMap.get("type_" + type + "_season")) * 3));
 			d.setDate(0);
 			d.setHours(23);
 			d.setMinutes(59);
 			d.setSeconds(59);
-			
+
 			caseOffline.setCreateTime(d);
-			
-			List<ViolationCaseFile> logs = SpringUtils.getBean(ViolationCaseFileMapper.class).selectViolationCaseFileList(caseOffline);
-			
+
+			List<ViolationCaseFile> logs = SpringUtils.getBean(ViolationCaseFileMapper.class)
+					.selectViolationCaseFileList(caseOffline);
+
 			Collections.shuffle(logs);
 			double pect = Double.parseDouble(paramsMap.get("type_" + type + "_pect")) / 100;
 			logs = logs.subList(0, (int) (logs.size() * pect));
-			
-			for(ViolationCaseFile l:logs){
+
+			for (ViolationCaseFile l : logs) {
 				insertData(l.getId() + "", "违规案卷:" + l.getProjectName(), type, "科技信息部", l.getOwningRegion());
 			}
-			
-		}catch(Exception e){
+
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
-		
-		
 		Gson g = new Gson();
 		JSONArray array;
-
-
 		array = redisCache.getCacheObject("truckList");// 车辆
 		if (array != null && array.size() > 0) {
@@ -485,49 +475,48 @@ public class DriverTask {
 				}
 			}
 		}
-		
-	
+
 	}
 	public List ShuffleData(Gson g, JSONArray array, int type) {
 		List<JSONObject> list = g.fromJson(array.toJSONString(), new TypeToken<List<JSONObject>>() {
 		}.getType());
-		
+
 		Date d = new Date();
-		
+
 		d.setMonth(d.getMonth() - (Integer.parseInt(paramsMap.get("type_" + type + "_season")) * 3));
 		d.setDate(0);
 		d.setHours(23);
 		d.setMinutes(59);
 		d.setSeconds(59);
-		
-		try{
-			list = list.parallelStream().filter(p->{
+
+		try {
+			list = list.parallelStream().filter(p -> {
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				String editTime = p.getString("editedAt");
 				String createdTime = p.getString("createdAt");
 				long newTime = 0;
-				try{
-					if(editTime == null){
-						if(createdTime == null){
+				try {
+					if (editTime == null) {
+						if (createdTime == null) {
 							return false;
-						}else{
+						} else {
 							newTime = simpleDateFormat.parse(p.getString("createdAt")).getTime();
 						}
-					}else{
+					} else {
 						newTime = simpleDateFormat.parse(p.getString("editedAt")).getTime();
 					}
-				}catch(Exception e){
+				} catch (Exception e) {
 					e.printStackTrace();
 				}
 				return d.getTime() < newTime;
-				
-				}).collect(Collectors.toList());
-		}catch(Exception e){
+
+			}).collect(Collectors.toList());
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-			
+
 		Collections.shuffle(list);
 		double pect = Double.parseDouble(paramsMap.get("type_" + type + "_pect")) / 100;
@@ -669,7 +658,7 @@ public class DriverTask {
 						listParam.add(param);
-						SpringUtils.getBean(ITruckCreditService.class).insertTruckCredit(truckCredit);
+						SpringUtils.getBean(ITruckCreditService.class).insertTruckCredit(truckCredit, 0);
 					}
 				} catch (BeansException e) {
 					// TODO Auto-generated catch block
@@ -747,6 +736,156 @@ public class DriverTask {
 		for (CompanyCredit c : companyList) {
 			SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c, TOKEN);
 		}
+
+		try {
+			checkToSendSMS(); // 检查驾驶员信用
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
+	private void checkToSendSMS() {
+		if (RemoteServerUtils.remote == null) {
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		
+		
+		Map<String, Object> map = new HashMap<>();
+		map.put("size", 99999);
+		map.put("page", 1);
+		JSONArray cList = redisCache.getCacheObject("constructionList");
+		if(cList == null){
+			cList = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
+			redisCache.setCacheObject("constructionList", cList,60,TimeUnit.MINUTES);
+		}
+		
+		JSONArray eList = redisCache.getCacheObject("earthSitesList");
+		if(eList == null){
+			eList = RemoteServerUtils.getEarthSitesList(map, trashConfig.getToken());
+			redisCache.setCacheObject("earthSitesList", cList,60,TimeUnit.MINUTES);
+		}
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		long now = 0;
+		try {
+			now = sdf.parse(sdf.format(new Date())).getTime();
+		} catch (ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		
+		if(cList != null){
+			for(Object obj:cList){
+				try{
+					
+				JSONObject json = (JSONObject) obj;
+				long endTime = 0;
+				try {
+					now = sdf.parse(sdf.format(new Date())).getTime();
+					endTime = sdf.parse(json.getString("effectiveEnd")).getTime();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+				// 1 * 60 分 60  时 24
+				
+				if((endTime - now) == 15*1000*60*60*24){
+					List<Mobile> mobileList = new ArrayList<>();
+						
+
+//						String p = json.getString("constructionCompanyPhone");
+//			            if(p != null){
+//							Mobile mobile=new Mobile();
+//				            mobile.setMobile(p);
+//				            mobileList.add(mobile);
+//			            }
+//					
+//						String p1 = json.getString("projectnCompanyPhone");
+//			            if(p1 != null){
+//			            	Mobile mobile2=new Mobile();
+//				            mobile2.setMobile(p1);
+//				            mobileList.add(mobile2);
+//			            }
+
+	            	Mobile mobile2=new Mobile();
+		            mobile2.setMobile("19520553054");
+		            mobileList.add(mobile2);
+					
+			            String smsString = "【长沙渣管】到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
+							
+							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) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+
+		if(eList != null){
+			for(Object obj:eList){
+				try{
+					
+				
+				JSONObject json = (JSONObject) obj;
+				long endTime = 0;
+				try {
+					endTime = sdf.parse(json.getString("effectiveEnd")).getTime();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if((endTime - now) == 15*1000*60*60*24){
+					List<Mobile> mobileList = new ArrayList<>();
+						String p = json.getString("principalPhoneNo");
+			            if(p != null){
+//							Mobile mobile=new Mobile();
+//				            mobile.setMobile(p);
+//				            mobileList.add(mobile);
+				            
+			            	Mobile mobile2=new Mobile();
+				            mobile2.setMobile("19520553054");
+				            mobileList.add(mobile2);
+				            
+				            String smsString = "【长沙渣管】到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
+							
+							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();
+			}
+			}
+		}
+		
+		
+		
 	}
 	public void checkAllTask() {
@@ -804,8 +943,8 @@ public class DriverTask {
 		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("companyList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("companyList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
@@ -819,8 +958,8 @@ public class DriverTask {
 		map.put("contractStatus", 1);
 		map.put("auditStatus", 1);
 		JSONArray jsonArray = RemoteServerUtils.getContractList(map, trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("contractList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("contractList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
@@ -835,8 +974,8 @@ public class DriverTask {
 		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("constructionList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("constructionList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
@@ -851,8 +990,8 @@ public class DriverTask {
 		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map, trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("earthSitesList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("earthSitesList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
@@ -869,8 +1008,8 @@ public class DriverTask {
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getTruckList(map, trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("truckList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("truckList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
@@ -885,8 +1024,8 @@ public class DriverTask {
 		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
-		if(jsonArray != null){
-			redisCache.setCacheObject("areaList", jsonArray,60,TimeUnit.MINUTES);
+		if (jsonArray != null) {
+			redisCache.setCacheObject("areaList", jsonArray, 60, TimeUnit.MINUTES);
 		}
 	}
 }
@@ -81,7 +81,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         {
             return dictDatas;
         }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
+    	dictDatas = dictDataMapper.selectDictDataByType(dictType);
         if (StringUtils.isNotEmpty(dictDatas))
         {
             DictUtils.setDictCache(dictType, dictDatas);
 import {getAdviceList, getCaseOffline} from "@/api/caseOffline/caseOffline";
 import {getArea,} from "@/api/dict";
-
+import {listData} from "@/api/system/dict/data"
 import {getToken} from "@/utils/auth";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
@@ -48,16 +48,6 @@ export default {
       // 表单校验
       rules: {},
       caseType: [
-        {code: 7, name: "无许可消纳（工）"},
-        {code: 8, name: "无许可消纳（消）"},
-        {code: 9, name: "使用非专用车辆"},
-        {code: 0, name: "渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥"},
-        {code: 1, name: "未洗车出场或者出场清洁不彻底"},
-        {code: 2, name: "渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
-        {code: 3, name: "非核准车辆进入渣土处置工地运输渣土"},
-        {code: 4, name: "渣土处置工地未按规定时间开停工"},
-        {code: 5, name: "渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
-        {code: 6, name: "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
       ],
       fileList: [],
       areas: [],
@@ -89,7 +79,12 @@ export default {
       replyApprovalProcessList:[],
     };
   },
-  created() {
+  created() {
+    listData({dictType:"case_offline_type"}).then(res=>{
+      this.caseType = res.rows;
+
+    });
+
     let id = this.businessKey.split(":");
     if (id.length == 2) {
@@ -104,7 +99,8 @@ export default {
       this.replyApprovalProcessList = response.rows;
     });
   },
-  methods: {
+  methods: {
+
     getSite(item) {
       this.form.objectId = item.id;
     },
@@ -120,8 +116,8 @@ export default {
     },
     getCaseType(type) {
       for (let i in this.caseType) {
-        if (this.caseType[i].code == Number(type))
-          return this.caseType[i].name
+        if (this.caseType[i].dictValue == Number(type))
+          return this.caseType[i].dictLabel
       }
     },
 import { listCaseOffline, getCaseOffline, delCaseOffline, addCaseOffline, updateCaseOffline, exportCaseOffline } from "@/api/caseOffline/caseOffline";
-
 import h5Info from "@/views/h5/caseOffline/caseOfflineInfo";
-
 import h5Page from '@/views/h5/Pagination';
+import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-
-
-  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
   import {
     getArea,
     earthsitesList,
     constructionsitesList,
+    truckList,
     getDict,
   } from "@/api/dict";
   import {
     getThreestep,
   } from "@/api/business/threestep";
+
+  import {listData} from "@/api/system/dict/data"
   import {
     getToken
@@ -66,18 +65,7 @@ export default {
       // 表单校验
       rules: {
       },
-      caseType:[
-        {code: 7, name: "无许可消纳（工）"},
-        {code: 8, name: "无许可消纳（消）"},
-        {code: 9, name: "使用非专用车辆"},
-        {code:0,name:"渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥"},
-        {code:1,name:"未洗车出场或者出场清洁不彻底"},
-        {code:2,name:"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场"},
-        {code:3,name:"非核准车辆进入渣土处置工地运输渣土"},
-        {code:4,name:"渣土处置工地未按规定时间开停工"},
-        {code:5,name:"渣土处置工地洗车设施等破损、未正常使用及措施不到位的"},
-        {code:6,name:"渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"},
-      ],
+      caseType:null,
       fileList:[],
       areas: [],
       upload: {
@@ -105,9 +93,15 @@ export default {
       }
     };
   },
-  created() {
+  created() {
+
+    listData({dictType:"case_offline_type"}).then(res=>{
+      this.caseType = res.rows;
+
+        });
     this.getList();
+
       if(window.location.search){
         let businessKey = window.location.search.split("=")[1];
         if(window.location.search.split("=")[0] == "?businessKey"){
@@ -131,8 +125,6 @@ export default {
       }
-
-
     constructionsitesList(this.remoteQueryData).then(res => {
        this.data[0]= res.result.list;
     });
@@ -141,9 +133,51 @@ export default {
         this.data[1]= res.result.list;
     });
   },
-  methods: {
+  methods: {
+    androidPrint(){
+
+      let id = this.businessKey.split(":");
+
+      if (id.length == 2) {
+        id = id[1];
+      }
+      getCaseOffline(id).then(response => {
+        let data = response.data;
+
+        var title ="电子交办单";
+        var content ={
+          "交办时间": data.createTime,
+          "案卷类型":this.getCaseType(data.type),
+          "所属区域": this.getAreaName(data.place),
+          "类型":this.siteType == 0 ? "工地" : "处理场所",
+          "工地名称": data.siteName,
+          "问题描述":data.caseDec,
+          "位置描述": data.number,
+          "案卷编号": data.locationDec,
+          "采集人":data.createBy,};//将 content 对象转换为字符串
+          var contentStr=JSON.stringify(content);// 调用安卓端方法，并传递参数
+
+        window.JsInterface.print(title,contentStr)
+
+      });
+    },
+    getStatus(item){
+      if(item.advice4){
+        return "结案存档";
+      }
+      if(!item.advice1){
+        return "未回复";
+      }
+      if(!item.advice4 && !item.advice3){
+        return "已回复";
+      }
+      if(!item.advice4 && item.advice3){
+        return "审核中";
+      }
+    },
     getSite(item){
       this.remoteQueryData.name = item;
+      this.form.siteName = item;
       if(this.form.siteType == 0){
         constructionsitesList(this.remoteQueryData).then(res => {
            this.data[0]= res.result.list;
@@ -152,8 +186,10 @@ export default {
                this.form.objectId = res.result.list[i].id;
              }
            }
+
+            this.$forceUpdate();
         });
-      }else{
+      }else if(this.form.siteType == 1){
         earthsitesList(this.remoteQueryData).then(res => {
             this.data[1]= res.result.list;
             for(let i in res.result.list){
@@ -161,9 +197,40 @@ export default {
                 this.form.objectId = res.result.list[i].id;
               }
             }
+
+            this.$forceUpdate();
         });
-      }
+      }else if(this.form.siteType == 2){
+
+        let query = {
+          'page':1,
+          'size':9999,
+          'dishonestState':0,
+          'valid':0,
+          'licenseplateNo':this.remoteQueryData.name
+        }
+        truckList(query).then(res => {
+
+            let trucks = [];
+
+            for(let i in res.result.list){
+
+              let t = {
+                'name':res.result.list[i].licenseplateNo
+              }
+
+              trucks.push(t);
+
+              if(res.result.list[i].licenseplateNo == item){
+                this.form.objectId = res.result.list[i].id;
+              }
+            }
+
+            this.data[2]= trucks;
+            this.$forceUpdate();
+        });
+      }
@@ -171,7 +238,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];
@@ -263,10 +330,8 @@ export default {
    },
     getCaseType(type){
       for(let i in this.caseType){
-
-
-        if(this.caseType[i].code==type)
-          return this.caseType[i].name
+        if(this.caseType[i].dictValue==type)
+          return this.caseType[i].dictLabel
       }
     },
     /** 新增按钮操作 */
@@ -332,13 +397,13 @@ export default {
         this.queryParams.startTime = this.queryParams.createTime[0];
         this.queryParams.endTime = this.queryParams.createTime[1];
       }
-      
+
       const query = {};
-      
+
       for(var i in this.queryParams){
         query[i] = this.queryParams[i];
       }
-      
+
       query.createTime = null;
       this.$confirm('是否确认导出所有线下交办案卷数据项?', "警告", {
           confirmButtonText: "确定",
@@ -252,6 +252,9 @@ export default {
             createTime: list[i].createTime,
             selfCheckTime: list[i].selfCheckTime,
             place: list[i].place,
+            workAreaCodeName: list[i].workAreaCodeName,
+            siteInvestmentTypeName: list[i].siteInvestmentTypeName,
+            address: list[i].address,
             status: list[i].status,
             ename: list[i].ename,
             eplace: list[i].eplace,
@@ -427,7 +430,8 @@ export default {
       this.queryParams.subReason = null;
       this.queryParams.place = null;
       this.queryParams.earthsitesName = null;
-      this.queryParams.name = null;
+      this.queryParams.name = null;
+      this.queryParams.workAreaCodeName = null;
       this.resetForm("queryForm");
     },
@@ -13,7 +13,7 @@ import companyInfo from &quot;@/views/activiti/task/companyInfo&quot;;
 import logisticsInfo from "@/views/office/logistics/logisticsInfo";
-import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
 import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
 import {historyFromDataByTime} from '@/api/activiti/historyFormdata'
@@ -17,7 +17,7 @@ import companyInfo from &quot;@/views/activiti/task/companyInfo&quot;;
 import logisticsInfo from "@/views/office/logistics/logisticsInfo";
-import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
 import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
 import {historyFromDataByTime} from '@/api/activiti/historyFormdata'
@@ -122,6 +122,9 @@ export default {
         if(arr[j].split("=")[0] == "objValue"){
             this.queryParams.construction = arr[j].split("=")[1];
         }
+        if(arr[j].split("=")[0] == "siteId"){
+            this.queryParams.constructionId = arr[j].split("=")[1];
+        }
       }
     }
@@ -8,7 +8,7 @@ import {
   deleteUpCase,
   delayUpCase,
 } from "@/api/casefile/violationCaseFile";
-import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
 import h5Info from "@/views/h5/task/violationCaseFileInfo";
 import h5Page from "@/views/h5/Pagination";
@@ -82,36 +82,7 @@ export default {
           {required: true, message: "必填", trigger: "blur"}
         ],
       },
-      caseType: [{code: 0, name: "进入非专用车辆"},
-        {code: 1, name: "无许可手续（工）"},
-        {code: 2, name: "无许可手续（消）"},
-        {code: 3, name: "黄土覆盖情况"},
-        {code: 4, name: "出入口路面污染"},
-        {code: 5, name: "出入口道路硬化"},
-        {code: 6, name: "车辆冲洗是否到位"},
-        {code: 7, name: "雾炮机是否正常开启"},
-        {code: 8, name: "使用非专用车运输"},
-        {code: 9, name: "监控点位未对准"},
-        {code: 10, name: "工地预警-未报开工作业"},
-        {code: 11, name: "工地预警-视频设备离线超时报警"},
-        {code: 12, name: "工地预警-三无车辆进入工地"},
-        {code: 13, name: "工地预警-未按时间作业"},
-        {code: 14, name: "处理场所预警-未报开工作业"},
-        {code: 15, name: "处理场所预警-视频设备离线超时报警"},
-        {code: 16, name: "处理场所预警-三无车辆进入处理场所"},
-        {code: 17, name: "处理场所预警-未到指定的处理场所作业"},
-        {code: 18, name: "离线运输报警（工）"},
-        {code: 19, name: "离线运输报警（消）"},
-        {code: 20, name: "未激活车辆作业"},
-        {code: 21, name: "未核准作业车辆作业"},
-        {code: 22, name: "未按线路行驶"},
-        {code: 23, name: "闯禁行驶"},
-        {code: 24, name: "失信车辆作业"},
-        {code: 25, name: "卫星定位异常"},
-        {code: 26, name: "超速提醒"},
-        {code: 27, name: "其他3"},
-        {code: 28, name: "其他4"},
-        {code: 29, name: "其他5"}],
+      caseType: [],
       projectNameList: {},
       isLoading: false,
       fileEntityList: [],
@@ -166,7 +137,12 @@ export default {
     }
   },
-  created() {
+  created() {
+    this.listData({dictType:"vio_casefile"}).then(res=>{
+      this.caseType = res.rows;
+    });
+
+
     getArea().then(res => {
       this.areas = res.result;
     });
@@ -222,6 +198,37 @@ export default {
     this.getList();
   },
   methods: {
+    getAreaName(code){
+      for(let i in this.areas){
+        if(this.areas[i].code == code){
+          this.form.owningRegion = this.areas[i].name;
+          this.form.place = this.areas[i].code ;
+          break;
+        }
+      }
+    },
+    getCaseStatus(item){
+      if(item.status == 1){
+        return "结案存档";
+      }
+      if(!item.readBy){
+        return "未回复";
+      }
+      if(item.status1 && Number(item.status1) == 1){
+        return "已回复";
+      }
+      if(item.status1 && Number(item.status1) > 1){
+         return "待审核";
+      }
+    },
+    getCaseType(type){
+      for(let i in this.caseType){
+        if(this.caseType[i].dictValue == type){
+          return this.caseType[i].dictLabel;
+        }
+      }
+      return type;
+    },
     openFunction(obj,idx){
       this.object = obj;
       if(idx == 1){
@@ -233,7 +240,6 @@ export default {
       }
     },
     deleteUpCase(){
-      debugger;
       if(!this.form.describe){
         this.$message("请填写理由!");
         return;
@@ -593,8 +599,15 @@ export default {
           let companyName = formData.companyName ? formData.companyName : "";
           let projectName = formData.projectName ? formData.projectName : "";
-
-          this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
+          
+          for(let i in this.caseType){
+            if(this.caseType[i].dictValue == formData.violationType){
+              this.form.describe = code + companyName + "在" + projectName + "出现" + this.caseType[i].dictLabel;
+              break;
+            }
+          }
+          
+          
           this.rules.companyName = null;
           this.rules.projectName = null;
         }
@@ -31,10 +31,20 @@ export default {
     }
   },
   created() {
-
+    this.listData({dictType:"vio_casefile"}).then(res=>{
+      this.caseType = res.rows;
+    });
     this.init();
   },
   methods: {
+    getCaseType(type){
+      for(let i in this.caseType){
+        if(this.caseType[i].dictValue == type){
+          return this.caseType[i].dictLabel;
+        }
+      }
+      return type;
+    },
     submit(){
         let postData = {};
@@ -42,13 +52,13 @@ export default {
         postData.replyImg = this.form.replyImg + "";
         postData.reply = this.form.reply;
-         
+
         addReplyApprovalProcess(postData).then(res => {
           this.videoSrc1 = [];
           this.slides1 = [];
-          
+
           updateViolationCaseFile({id: this.form.id,status:1}).then(res => {
-            
+
           })
         });
     },
@@ -66,16 +76,16 @@ export default {
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
         this.fileEntityList.map(item => {
-          
-          
+
+
           if (item.name.indexOf(".jpg") > -1 || item.name.indexOf(".png") > -1 || item.name.indexOf(".jpeg") > -1) {
             if(item.url.startsWith("https:")){
               this.slide1.push(item.url);
             }else{
               this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
             }
-            
-            
+
+
           }
           if (item.name.indexOf(".mp4") > -1 || item.name.indexOf(".avi") > -1) {
             if(item.url.startsWith("https:")){
@@ -35,6 +35,14 @@ export default {
     this.init();
   },
   methods: {
+    getCaseType(type){
+      for(let i in this.caseType){
+        if(this.caseType[i].dictValue == type){
+          return this.caseType[i].dictLabel;
+        }
+      }
+      return type;
+    },
     init() {
       let id = this.idInfo.split(":");
@@ -7,12 +7,13 @@ import {
   exportViolationWarningInformation
 } from "@/api/casefile/violationWarningInformation";
-import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
 import h5Page from '@/views/h5/Pagination';
 import h5Info from "@/views/h5/task/violationWarningInformationInfo";
+import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
 import {
   earthsitesList,
@@ -104,74 +105,8 @@ export default {
           trigger: "blur"
         }],
       },
-      caseType: [{
-          code: 0,
-          name: "工地预警-未报开工作业"
-        },
-        {
-          code: 1,
-          name: "工地预警-视频设备离线超时报警"
-        },
-        {
-          code: 2,
-          name: "工地预警-三无车辆进入工地"
-        },
-        {
-          code: 3,
-          name: "工地预警-未按时间作业"
-        },
-        {
-          code: 4,
-          name: "处理场所预警-未报开工作业"
-        },
-        {
-          code: 5,
-          name: "处理场所预警-视频设备离线超时报警"
-        },
-        {
-          code: 6,
-          name: "处理场所预警-三无车辆进入处理场所"
-        },
-        {
-          code: 7,
-          name: "处理场所预警-未到指定的处理场所作业"
-        },
-        {
-          code: 8,
-          name: "离线运输报警(工)"
-        },
-        {
-          code: 9,
-          name: "离线运输报警(消)"
-        },
-        {
-          code: 10,
-          name: "未激活车辆作业"
-        },
-        {
-          code: 11,
-          name: "未核准作业车辆作业"
-        },
-        {
-          code: 12,
-          name: "未按线路行驶"
-        },
-        {
-          code: 13,
-          name: "闯禁行驶"
-        },
-        {
-          code: 14,
-          name: "失信车辆作业"
-        },
-        {
-          code: 15,
-          name: "卫星定位异常"
-        },
-        {
-          code: 16,
-          name: "超速提醒"
-        }
+      caseType: [
+
       ],
       projectNameList: {},
       isLoading: false,
@@ -217,7 +152,11 @@ export default {
     }
   },
-  created() {
+  created() {
+    this.listData({dictType:"vio_warning"}).then(res=>{
+      this.caseType = res.rows;
+    });
+
     getAreaList().then(res => {
       this.areas = res.data;
     });
@@ -236,7 +175,7 @@ export default {
     getCompanyList(this.remoteQueryData).then(res => {
       this.companyList = res.data;
     });
-    debugger;
+
     if(window.location.search){
       let params = window.location.search.replace("?","");
       let arr = params.split("&");
@@ -271,12 +210,41 @@ export default {
     this.getList();
   },
-  methods: {
+  methods: {
+    getCaseStatus(item){
+      if(item.status == 1){
+        return "结案存档";
+      }
+      if(!item.readBy){
+        return "未回复";
+      }
+      if(item.status1 && Number(item.status1) == 1){
+        return "已回复";
+      }
+      if(item.status1 && Number(item.status1) > 1){
+         return "待审核";
+      }
+    },
+    getAreaName(code){
+      for(let i in this.areas){
+        if(this.areas[i].code == code){
+          this.form.owningRegion = this.areas[i].name;
+          this.form.place = this.areas[i].code ;
+          break;
+        }
+      }
+    },
     selectArea(item) {
-
       this.form.owningRegion = item.name;
-
-    },
+    },
+      getCaseType(type){
+        for(let i in this.caseType){
+          if(this.caseType[i].dictValue == type){
+            return this.caseType[i].dictLabel;
+          }
+        }
+        return type;
+      },
     /** 查询违规预警信息列表 */
     getList() {
       this.loading = true;
@@ -628,9 +596,14 @@ export default {
             let companyName = formData.companyName ? formData.companyName : "";
             let projectName = formData.projectName ? formData.projectName : "";
-
-            this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
-
+            
+            for(let i in this.caseType){
+              if(this.caseType[i].dictValue == formData.violationType){
+                this.form.describe = code + companyName + "在" + projectName + "出现" + this.caseType[i].dictLabel;
+                break;
+              }
+            }
+            
           this.rules.companyName = null;
           this.rules.projectName = null;
         }
 <template>
   <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{ hasTagsView: false }" class="main-container">
-      <tags-view v-if="needTagsView" />
       <app-main />
-
-    </div>
   </div>
 </template>
@@ -146,4 +141,3 @@ export default {
   width: 100%;
 }
 </style>
-
@@ -17,7 +17,8 @@ import permission from &#39;./directive/permission&#39;
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
+import { getDicts,listData } from "@/api/system/dict/data";
+
 import { checkPermi } from "@/utils/permission";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree,parseStatus } from "@/utils/trash";
@@ -27,6 +28,7 @@ import RightToolbar from &quot;@/components/RightToolbar&quot;
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
+Vue.prototype.listData = listData
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
@@ -654,8 +654,8 @@
   import logisticsInfo from "@/views/office/logistics/logisticsInfo";
   import handleInfo from "@/views/office/handle/handleInfo";
   import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-  import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
-  import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+  import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
+  import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
   import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
   import companyInfo from "@/views/activiti/task/companyInfo";
   import driverInfo from "@/views/activiti/task/driverInfo";
@@ -192,8 +192,8 @@ import contractInfo from &quot;@/views/activiti/task/contractInfo&quot;;
 import logisticsInfo from "@/views/office/logistics/logisticsInfo";
 import handleInfo from "@/views/office/handle/handleInfo";
 import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
-import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
+import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
 import supervisionInfo from "../task/SupervisionInfo";
 import companyInfo from "@/views/activiti/task/companyInfo";
@@ -46,15 +46,24 @@
                  <el-option v-for="item in enames" :label="item" :value="item" />
                </el-select>
           </el-form-item>
-      </el-col>
-        <el-col :span="6">
+      </el-col>
+
+        <el-col :span="4">
+      <el-form-item label="作业区域" >
+        <el-select v-model="queryParams.workAreaCodeName" placeholder="作业区域 "  size="small">
+           <el-option label="中心区域" value="中心区域" />
+           <el-option label="外环区域" value="外环区域" />
+        </el-select>
+      </el-form-item>
+        </el-col>
+        <el-col :span="4">
       <el-form-item label="工地区属" >
         <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
           <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4">
       <el-form-item label="处理场所区属" >
         <el-select v-model="queryParams.subReason" placeholder="工地所属区域 "  size="small">
           <el-option v-for="item in areas" :label="item.name" :value="item.name" />
@@ -63,7 +72,7 @@
       </el-col>
       </el-row>
       <el-row v-if="this.queryParams.his > 1">
-             <el-col :span="6">
+             <el-col :span="4">
                <el-form-item label="名称" >
                  <!-- <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small" /> -->
@@ -73,12 +82,21 @@
                </el-form-item>
            </el-col>
-             <el-col :span="6">
+             <el-col :span="4">
            <el-form-item label="区属" >
              <el-select v-model="queryParams.place" placeholder="工地所属区域 "  size="small">
                <el-option v-for="item in areas" :label="item.name" :value="item.code" />
              </el-select>
            </el-form-item>
+
+             </el-col>
+             <el-col :span="4" v-if="this.queryParams.his == 2">
+           <el-form-item label="作业区域" >
+             <el-select v-model="queryParams.workAreaCodeName" placeholder="工地所属区域 "  size="small">
+                <el-option label="中心区域" value="中心区域" />
+                <el-option label="外环区域" value="外环区域" />
+             </el-select>
+           </el-form-item>
       </el-col>
            </el-row>
       <el-row>
@@ -126,8 +144,9 @@
         </el-table-column>
         <el-table-column label="所属区域" align="center" prop="place" />
+        <el-table-column label="作业区域" align="center" prop="workAreaCodeName" />
         <el-table-column label="工地报工" align="center" prop="status" />
-        <el-table-column label="申请报工时间" align="center" prop="selfCheckTime" width="180"/>
+        <el-table-column label="巡查通过时间" align="center" prop="selfCheckTime" width="180"/>
         <el-table-column label="处理场所名称" align="center" prop="ename" >
             <template slot-scope="scope">
               <a @click="getInfo(scope.row,1);">{{ scope.row.ename}}</a>
@@ -136,7 +155,7 @@
         </el-table-column>
         <el-table-column label="所属区域" align="center" prop="eplace" />
         <el-table-column label="处理场所报工" align="center" prop="estatus" />
-        <el-table-column label="申请报工时间" align="center" prop="eselfCheckTime" width="180"/>
+        <el-table-column label="巡查通过时间" align="center" prop="eselfCheckTime" width="180"/>
         <el-table-column label="备注" align="center" prop="descript"/>
     </el-table>
@@ -152,7 +171,8 @@
       <el-table-column label="管辖区" align="center" prop="place">
       </el-table-column>
-
+      <el-table-column label="作业区域" align="center" prop="workAreaCodeName" v-show="queryParams.his == 2 ">
+      </el-table-column>
       <el-table-column label="自查时间" align="center" prop="selfCheckTime" width="180">
         <template slot-scope="scope">
           <span>{{scope.row.selfCheckTime}}</span>
@@ -15,6 +15,12 @@
          <el-option v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
+      <el-form-item label="作业区域" v-if="this.type==0">
+        <el-select v-model="queryParams.workAreaCodeName" placeholder="工地所属区域 "  size="small">
+           <el-option label="中心区域" value="中心区域" />
+           <el-option label="外环区域" value="外环区域" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -53,7 +59,8 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column :label="pageLabel" align="center" prop="name" />
       <el-table-column :label="pageType" align="center" prop="projectType" />
-      <el-table-column label="所属区域" align="center" prop="place" />
+      <el-table-column label="所属区域" align="center" prop="place"  />
+      <el-table-column label="作业区域" align="center" prop="workAreaCodeName" v-if="this.type==0"/>
       <el-table-column label="操作时间" align="center" prop="createTime" />
       <el-table-column label="操作人" align="center" prop="createBy" />
       <el-table-column label="状态" align="center" prop="status">
@@ -210,6 +217,7 @@ export default {
         this.threeHistoryList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.$forceUpdate();
       });
     },
     // 取消按钮
@@ -190,7 +190,8 @@
             <el-input v-model="form.img0" type="hidden"></el-input>
             <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="6">
+            <span style="color: red;">*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
             <br/>
             <el-image v-for="item in slides[1]"
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="案卷类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择案卷类型" size="small">
-          <el-option v-for="item in caseType" :label="item.name" :value="item.code"/>
+            <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue"/>
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="place">
@@ -17,6 +17,14 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           end-placeholder="结束日期">
         </el-date-picker>
+      </el-form-item>
+      <el-form-item label="状态" prop="status1">
+        <el-select v-model="queryParams.status1" placeholder="状态" size="small">
+            <el-option label="未回复" value="0"/>
+            <el-option label="已回复" value="1"/>
+            <el-option label="审核中" value="2"/>
+            <el-option label="结案存档" value="3"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -54,7 +62,14 @@
       <el-table-column label="案卷类型" align="center" prop="type"/>
       <el-table-column label="所属区域" align="center" prop="place"/>
       <el-table-column label="时间" align="center" prop="createTime" width="180">
-      </el-table-column>
+      </el-table-column>
+
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+            <span>{{getStatus(scope.row)}}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -81,7 +96,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="案卷类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择案卷类型">
-            <el-option v-for="item in caseType" :label="item.name" :value="item.code"/>
+            <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue"/>
           </el-select>
         </el-form-item>
         <el-form-item label="所属区域" prop="place">
@@ -93,13 +108,14 @@
           <el-select v-model="form.siteType" placeholder="请选择类型">
             <el-option label="工地" value="0"/>
             <el-option label="处理场所" value="1"/>
+            <el-option label="车辆" value="2"/>
           </el-select>
         </el-form-item>
-        <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
+        <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
           <el-select
             :popper-append-to-body="false" class="product-style"
             v-model="form.siteName" placeholder="请选择类型"
-            allow-create  filterable @change="getSite">
+            allow-create  filterable :filter-method="getSite">
             <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name"/>
           </el-select>
         </el-form-item>
@@ -10,7 +10,7 @@
       </el-form-item>
       <el-form-item label="违规类型" prop="violationType">
         <el-select v-model="queryParams.violationType" placeholder="请选择违规类型"  size="small">
-          <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+          <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
         </el-select>
       </el-form-item>
@@ -33,7 +33,7 @@
       </el-form-item>
       <el-form-item label="日期" prop="createTime">
-        <el-date-picker  size="small"  
+        <el-date-picker  size="small"
         v-model="queryParams.createTime" type="datetimerange"
           start-placeholder="开始日期"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -45,6 +45,14 @@
           <el-option label="平台数据" value="0" />
           <el-option label="综管数据" value="1" />
         </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status1">
+        <el-select v-model="queryParams.status1" placeholder="状态" size="small">
+            <el-option label="未回复" value="0"/>
+            <el-option label="已回复" value="1"/>
+            <el-option label="审核中" value="2"/>
+            <el-option label="结案存档" value="3"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -98,9 +106,19 @@
         <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"处理场所":"企业"}}</span>
       </template>
       </el-table-column>
-      <el-table-column label="违规类型" align="center" prop="violationType" />
+      <el-table-column label="违规类型" align="center" prop="violationType">
+        <template slot-scope="scope">
+          <span>{{getCaseType(scope.row.violationType)}}</span>
+        </template>
+
+        </el-table-column>
       <el-table-column label="日期" align="center" prop="createTime">
-      </el-table-column>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status1">
+        <template slot-scope="scope">
+            <span>{{getCaseStatus(scope.row)}}</span>
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -211,7 +229,7 @@
           <el-col :span="11">
             <el-form-item label="违规类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                  <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+                <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -232,7 +250,9 @@
                 :filterable="true"
                 :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"
                  :filter-method="getRemoteDate">
-                  <el-option v-for="item in projectNameList[form.violationObjectType]" :key="item.name" :label="item.name" :value="item.name" :title="item.name"></el-option>
+                  <el-option v-for="item in projectNameList[form.violationObjectType]" 
+                  :key="item.name" :label="item.name" :value="item.name" :title="item.name"
+                  @click.native="getAreaName(item.areaCode)"></el-option>
                 </el-select>
             </el-form-item>
           </el-col>
-<template>
-  <el-form ref="form" :model="form" label-width="115px">
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="案卷编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item label="违规对象类型" prop="violationObjectType">
-          <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;"
-                     :disabled="true">
-            <el-option label="工地" value="0"/>
-            <el-option label="处理场所" value="1"/>
-            <el-option label="企业" value="2"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="所属区域" prop="owningRegion">
-          <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
-            <el-option label="区域1" value="区域1"/>
-            <el-option label="区域2" value="区域2"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-            <el-option label="违规1" value="违规1"/>
-            <el-option label="违规2" value="违规2"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="违规等级" prop="violationGrade">
-          <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
-            <el-option label="一般类" value="一般类"/>
-            <el-option label="重点类" value="重点类"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item label="项目名称" prop="projectName">
-          <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
-
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="企业名称" prop="companyName">
-          <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item label="发送时间" prop="createTime">
-          <el-input :value="form.createTime" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="发送人" prop="createBy">
-          <el-input :value="form.createBy" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
-        <el-form-item label="接收人" prop="receive">
-          <el-input :value="form.readBy" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
-        <el-form-item label="阅读时间" prop="createBy">
-          <el-input :value="form.readTime" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="22">
-        <el-form-item label="违规描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-form-item label="推送对象">
-      <el-radio-group v-model="form.sendObject" :disabled="true">
-        <el-radio label="区管理部门">区管理部门</el-radio>
-        <el-radio label="运输企业">运输企业</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <el-row>
-      <el-col :offset="3">
-        <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
-      </el-col>
-    </el-row>
-    <el-table :data="replyApprovalProcessList" v-if="entryType==0">
-      <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
-      <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyImg" label="图片预览" header-align="center" align="center">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="openImage(scope.row.replyImg)"
-            v-if="scope.row.replyImg!=null && scope.row.replyImg!='undefined'"
-            v-hasPermi="['casefile:violationWarningInformation:view']"
-          >查看
-          </el-button>
-          <span v-if="scope.row.replyImg==null || scope.row.replyImg=='undefined'">暂无</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog title="查看附件" :visible.sync="open" append-to-body>
-      <el-image v-for="item in slide1"
-                style="width: 150px; height: 100px; margin: 5px;"
-                :src="item"
-                :preview-src-list="slide1"
-                :z-index="2000">
-      </el-image>
-      <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"  v-for="item in videoSrc" >
-        <video width="100%" controls="controls" height="100%" :src="item"></video>
-      </div>
-      <el-table :data="fileEntityList">
-        <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="small" type="success"
-              icon="el-icon-download"
-              @click="downloadFA(scope.row)"
-              v-hasPermi="['office:management:edit']"
-              v-if="form.id!=null"
-              round>下载
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
-      <div v-for="item in img" style="border: 1px black solid;text-align: center;">
-
-        <el-image style="width: 250px; height: 250px; margin: 5px;"
-                  v-if="item.indexOf('.jpg')>-1||item.indexOf('.png')>-1||item.indexOf('.jpeg')>-1||item.indexOf('.gif')>-1"
-                  :src="showFile(item)"
-                  :preview-src-list="[showFile(item)]"
-                  :z-index="2000">
-        </el-image>
-        <div style="display: inline-block;margin: 5px;position: relative; width: 250px;height: 250px;overflow:hidden;" v-if="item.indexOf('.mp4')>-1||item.indexOf('.avi')>-1">
-          <video width="100%" controls="controls" height="100%" :src="showFile(item)"></video>
-        </div>
-        <a @click="downloadFile(item);" style="color: blue;"> 下载: {{ item.split("/")[item.split("/").length - 1] }}  </a>
-      </div>
-    </el-dialog>
-  </el-form>
-</template>
-
-<script src="@/api/vio_casefile_info">
-</script>
-
-<style scoped>
-
-</style>
@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="违规类型" prop="violationType">
         <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
-          <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+          <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="违规对象" prop="projectName">
@@ -33,6 +33,14 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           end-placeholder="结束日期">
         </el-date-picker>
+      </el-form-item>
+      <el-form-item label="状态" prop="status1">
+        <el-select v-model="queryParams.status1" placeholder="状态" size="small">
+            <el-option label="未回复" value="0"/>
+            <el-option label="已回复" value="1"/>
+            <el-option label="审核中" value="2"/>
+            <el-option label="结案存档" value="3"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -84,8 +92,17 @@
           <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"处理场所":"企业"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="违规类型" align="center" prop="violationType" />
+      <el-table-column label="违规类型" align="center" prop="violationType">
+        <template slot-scope="scope">
+          <span>{{getCaseType(scope.row.violationType)}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="日期" align="center" prop="createTime"/>
+      <el-table-column label="状态" align="center" prop="status1">
+        <template slot-scope="scope">
+            <span>{{getCaseStatus(scope.row)}}</span>
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -151,7 +168,7 @@
           <el-col :span="11">
             <el-form-item label="违规类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+                <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -170,7 +187,7 @@
               <el-select v-model="form.projectName" :filterable="true"
               :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
                 <el-option v-for="item in projectNameList[form.violationObjectType]"
-                :label="item.name" :value="item.name" :title="item.name"></el-option>
+                :label="item.name" :value="item.name" :title="item.name" @click.native="getAreaName(item.areaCode)"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
 <template>
-
   <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        
         <el-form-item label="案卷类型" prop="type">
           <el-input v-model="form.type" type="textarea"  :rows="3" disabled />
         </el-form-item>
@@ -48,7 +48,7 @@
         </el-table>
-      </el-form>    
+      </el-form>
       <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
       <img :src="picImage" width="100%" height="400px" />
     </el-dialog>
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="案卷类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择案卷类型"  size="small">
-          <el-option v-for="item in caseType" :label="item.name" :value="item.code" />
+          <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="place">
@@ -80,7 +80,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="案卷类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择案卷类型">
-            <el-option v-for="item in caseType" :label="item.name" :value="item.code" />
+            <el-option v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
           </el-select>
         </el-form-item>
         <el-form-item label="所属区域" prop="place">
@@ -92,10 +92,12 @@
           <el-select v-model="form.siteType" placeholder="请选择类型">
               <el-option label="工地" value="0" />
               <el-option label="处理场所" value="1" />
+              <el-option label="车辆" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable @change="getSite">
+        <el-form-item :label="form.siteType==0?'工地名称':form.siteType==1?'处理场所名称':'车牌号'" prop="siteName">
+          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable 
+            :filter-method="getSite">
               <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" />
           </el-select>
         </el-form-item>
@@ -124,6 +126,8 @@
   <el-dialog title="查看详情" :visible.sync="open2" width="300px" append-to-body>
+
+    <el-button @click="androidPrint();">打印</el-button>
     <h5Info :businessKey="businessKey" v-if="open2" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancel">取 消</el-button>
@@ -21,11 +21,8 @@
           </el-select>
         </el-form-item>
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-            <el-option label="违规1" value="违规1" />
-            <el-option label="违规2" value="违规2" />
-          </el-select>
+        <el-form-item label="违规类型" prop="violationType">
+            <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
         </el-form-item>
@@ -19,9 +19,8 @@
           </el-select>
         </el-form-item>
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-          </el-select>
+        <el-form-item label="违规类型" prop="violationType">
+            <el-input :value="getCaseType(form.violationType)" :disabled="true"/>
         </el-form-item>
@@ -150,7 +150,8 @@
             <el-input v-model="form.img0" type="hidden"></el-input>
             <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12">
+            <span style="color: red;">*</span>
             <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
             <el-image v-for="item in slides[1]"
                       style="width: 100px; height: 100px; margin: 5px;"
@@ -10,7 +10,7 @@
       </el-form-item>
       <el-form-item label="违规类型" prop="violationType">
         <el-select v-model="queryParams.violationType" placeholder="请选择违规类型"  size="small">
-          <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+            <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
         </el-select>
       </el-form-item>
@@ -51,7 +51,7 @@
           >
          <el-row class="card_row">
            <el-col :span="24" class="card_grid">
-            <div class="card_title" style="font-weight: bold;">违规类型:{{item.violationType}}</div>
+            <div class="card_title" style="font-weight: bold;">违规类型:{{getCaseType(item.violationType)}}</div>
            </el-col>
          </el-row>
          <el-row class="card_row" style="margin-top:10px;margin-bottom:10px;">
@@ -123,7 +123,7 @@
           <el-col :span="11">
             <el-form-item label="违规类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                  <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
+                  <el-option  v-for="item in caseType" :label="item.dictLabel" :value="item.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -139,7 +139,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规对象" prop="projectName">
-              <el-select v-model="form.projectName" :filterable="true"  
+              <el-select v-model="form.projectName" :filterable="true"
               placeholder="请输入项目名称" style="width: 100%;" @change="getRemoteDate">
                 <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name"
                   v-if="form.place == item.areaCode" />
@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -36,6 +37,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.SupervisionThreestep;
+import com.trash.business.domain.SupervisionThreestepWithWorkArea;
 import com.trash.business.domain.dayWork;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.common.utils.RemoteServerUtils;
@@ -56,359 +58,373 @@ import com.trash.common.core.redis.RedisCache;
  */
 @RestController
 @RequestMapping("/business/threestep")
-public class SupervisionThreestepController extends BaseController
-{
-    @Autowired
-    private ISupervisionThreestepService supervisionThreestepService;
-    
-    @Autowired
-    RedisCache redisCache;
-
-    /**
-     * 查询三查机制列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(SupervisionThreestep supervisionThreestep)
-    {
-        startPage();
-
-	        
-        List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
-        return getDataTable(list);
-    }
-    
-    @PostMapping("/list")
-    public AjaxResult postList(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-
-        SupervisionThreestep list = supervisionThreestepService.getSupervisionThreestepInfo(supervisionThreestep);
-        return AjaxResult.success(list);
-    }
-    
-    @PostMapping("/getByObjects")
-    public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep)
-    {	
-    	AjaxResult ajaxResult = AjaxResult.success();
-    	try {
-        	ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
+public class SupervisionThreestepController extends BaseController {
+	@Autowired
+	private ISupervisionThreestepService supervisionThreestepService;
+
+	@Autowired
+	RedisCache redisCache;
+
+	/**
+	 * 查询三查机制列表
+	 */
+	@GetMapping("/list")
+	public TableDataInfo list(SupervisionThreestep supervisionThreestep) {
+		startPage();
+
+		List<SupervisionThreestep> list = supervisionThreestepService
+				.selectSupervisionThreestepList(supervisionThreestep);
+		return getDataTable(list);
+	}
+
+	@PostMapping("/list")
+	public AjaxResult postList(@RequestBody SupervisionThreestep supervisionThreestep) {
+
+		SupervisionThreestep list = supervisionThreestepService.getSupervisionThreestepInfo(supervisionThreestep);
+		return AjaxResult.success(list);
+	}
+
+	@PostMapping("/getByObjects")
+	public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep) {
+		AjaxResult ajaxResult = AjaxResult.success();
+		try {
+			ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-    	
-        return ajaxResult;
-    	
-    }
-    
-    String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
-    
-    /**
-     * 查询三查机制列表
-     */
-    @GetMapping("/dayWorkList")
-    public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep)
-    {
-//        startPage();
-    	PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        
-        if("430100".equals(supervisionThreestep.getPlace())){
-        	supervisionThreestep.setPlace(null);
-        }
-        if("长沙市".equals(supervisionThreestep.getSubReason())){
-        	supervisionThreestep.setSubReason(null);
-        }
-    	
-    	JSONArray areas = redisCache.getCacheObject("areas");
-    	
-    	if(areas == null){
-            areas = RemoteServerUtils.getAreas();
-	        redisCache.setCacheObject("areas", areas);
-    	}
-
-        List<Map<String,String>> list = supervisionThreestepService.selectDayWorkList(supervisionThreestep);
-        
-        int count = 0;
-        int count1 = 0;
-        String place = "长沙市";
-        String place1 = "长沙市";
-        String string = "今日";
-        
-        if(supervisionThreestep.getSubReason()!=null){
-        	
-        	place1 = supervisionThreestep.getSubReason();
-        }
-        
-        if(supervisionThreestep.getHis().equals("1")){
-        	string = "";
-        }
-        
-        
-        List<String> names = new ArrayList<>();
-        List<String> enames = new ArrayList<>();
-        
-        for(Map<String, String> m:list){
-        	
-        	if(names.indexOf(m.get("name")) == -1){
-
-            	names.add(m.get("name"));
-        	}
-        	
-        	if(enames.indexOf(m.get("ename")) == -1){
-
-            	enames.add(m.get("ename"));
-        	}
-        	
-        	
-        	for(Object object:areas){
-        		JSONObject area = (JSONObject)object;
-        		
-        		if(supervisionThreestep.getPlace() != null){
-        			if(supervisionThreestep.getPlace().equals(area.get("code").toString())){
-        				place = area.get("name").toString();
-        			}
-        		}
-        		
-        		if( area.get("code").toString().equals( m.get("place"))){
-        			m.put("place", area.get("name").toString());
-        		}
-        		if( area.get("code").toString().equals( m.get("eplace"))){
-        			m.put("eplace", area.get("name").toString());
-        		}
-        	}
-        	
-        	for(String out:outside){
-        		if(out.equals(m.get("eplace"))){
-        			if(m.get("status").equals("开工")){
-        				m.put("estatus", "开工");
-        				m.put("eselfCheckTime", m.get("selfCheckTime"));
-        			}
-        			
-        		}
-        	}
-        	
-        	if(m.get("status").equals("开工")){
-        		count += 1;
-        	}
-        	if(m.get("estatus").equals("开工")){
-        		count1 += 1;
-        	}
-        }
-        
-        TableDataInfo info = getDataTable(list);
-        
-        if(list.size() > (pageNum)*pageSize){
-        	list = list.subList((pageNum -1)*pageSize, (pageNum)*pageSize);
-        }else{
-        	list = list.subList((pageNum -1)*pageSize, list.size());
-        }
-        
-        info.setRows(list);
-        
-        info.setNames(names);
-        info.setEnames(enames);
-        
-        info.setMsg(string + place+"工地开工数量" + count + "  "  + place1+"处理场所开工数量" + count1);
-        
-        return info;
-    }
-    
-    
-    @PostMapping("/exportDayWorkHistoryList")
-    public AjaxResult exportDayWorkHistoryList(@RequestBody List<dayWork> list)
-    {
-    	
-        ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class);
-        return util.exportExcel(list, "历史开工报表");
-        
-    }
-    
-    @PostMapping("/exportDayWorkList")
-    public AjaxResult exportDayWorkList(@RequestBody List<dayWork> list)
-    {
-        ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class);
-        return util.exportExcel(list, "日开工报表");
-    }
-    
-    
-    @PostMapping("/todayDataList")
-    public List<SupervisionThreestep> todayDataList(@RequestBody SupervisionThreestep supervisionThreestep)
-    {        
-        return supervisionThreestepService.selectTodayDataList(supervisionThreestep);
-    }
-    
-    
-
-    /**
-     * 查询三查机制列表
-     */
-    @PostMapping("/dayWorkList")
-    public AjaxResult days(@RequestBody SupervisionThreestep supervisionThreestep)
-    {        
-    	List<Map> list= supervisionThreestepService.selectDayWorkListByType(supervisionThreestep);
-    	AjaxResult result = AjaxResult.success(list);
-    	result.put("result", AjaxResult.success(list).get("data"));
-    	result.put("data", null);
-        return result;
-    }
-    
-    /**
-     * 导出三查机制列表
-     */
-    @Log(title = "三查机制", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(SupervisionThreestep supervisionThreestep)
-    {
-        List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
-        
-        
-
-    	for(int i = 0;i<list.size();i++){
-        	list.get(i).setId((long)i+1);
-        }
-        
-        JSONArray array = RemoteServerUtils.getAreas();
-        
-        for(Object object :array){
-        	JSONObject jsonObject = (JSONObject)object;
-        	for(SupervisionThreestep sThreestep : list){
-        		if(jsonObject.getString("code").equals(sThreestep.getPlace())){
-        			sThreestep.setPlace(jsonObject.getString("name"));
-        		}
-        	}
-        }
-        List<String> withOut = new ArrayList<String>();
-        String str ="报工抽查";
-        if(supervisionThreestep.getStatus() == null){
-        	withOut.add("checkEndTime");
-        	str ="报工自查";
-        }
-
-        
-        ExcelUtil<SupervisionThreestep> util = new ExcelUtil<SupervisionThreestep>(SupervisionThreestep.class);
-        
-        return util.exportExcel(list, str,withOut);
-    }
-
-    /**
-     * 获取三查机制详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(supervisionThreestepService.selectSupervisionThreestepById(id));
-    }
-
-    @GetMapping(value = "names")
-    public List<String> names(SupervisionThreestep supervisionThreestep)
-    {
-        return supervisionThreestepService.getNames(supervisionThreestep);
-    }
-    /**
-     * 新增三查机制
-     */
-    @Log(title = "三查机制", businessType = BusinessType.INSERT)
-    @PostMapping
-    @RepeatSubmit
-    public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-    	
-    	int i = supervisionThreestepService.insertSupervisionThreestep(supervisionThreestep);
-    	
-    	if(i==-1){
-    		return AjaxResult.error("无法重复报工");
-    	}
-    	if(i==-2){
-    		return AjaxResult.error("当前时间无法报工");
-    	}
-    	
-    	if(i==-3){
-    		return AjaxResult.error("项目已超期!");
-    	}
-    	if(i==-4){
-    		return AjaxResult.error("报工数据异常,请刷新页面重新提交!");
-    	}
-    	
-        return toAjax(i);
-    }
-
-    /**
-     * 修改三查机制
-     */
-    @Log(title = "三查机制", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-        return toAjax(supervisionThreestepService.updateSupervisionThreestep(supervisionThreestep));
-    }
-    
-    @Log(title = "三查机制", businessType = BusinessType.UPDATE)
-    @PostMapping(value="/active")
-    public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-    	
-    	supervisionThreestep.setCheckTime(new Date());
-        return toAjax(supervisionThreestepService.activeSupervisionThreestep(supervisionThreestep));
-    }
-
-    /**
-     * 删除三查机制
-     */
-    @Log(title = "三查机制", businessType = BusinessType.DELETE)
+
+		return ajaxResult;
+
+	}
+
+	String[] outside = { "长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县" };
+
+	/**
+	 * 查询三查机制列表
+	 */
+	@GetMapping("/dayWorkList")
+	public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep) {
+		// startPage();
+		PageDomain pageDomain = TableSupport.buildPageRequest();
+		Integer pageNum = pageDomain.getPageNum();
+		Integer pageSize = pageDomain.getPageSize();
+
+		if ("430100".equals(supervisionThreestep.getPlace())) {
+			supervisionThreestep.setPlace(null);
+		}
+		if ("长沙市".equals(supervisionThreestep.getSubReason())) {
+			supervisionThreestep.setSubReason(null);
+		}
+
+		JSONArray areas = redisCache.getCacheObject("areas");
+
+		if (areas == null) {
+			areas = RemoteServerUtils.getAreas();
+			redisCache.setCacheObject("areas", areas);
+		}
+
+		List<Map<String, String>> list = supervisionThreestepService.selectDayWorkList(supervisionThreestep);
+
+		int count = 0;
+		int count1 = 0;
+		String place = "长沙市";
+		String place1 = "长沙市";
+		String string = "今日";
+
+		if (supervisionThreestep.getSubReason() != null) {
+
+			place1 = supervisionThreestep.getSubReason();
+		}
+
+		if (supervisionThreestep.getHis().equals("1")) {
+			string = "";
+		}
+
+		List<String> names = new ArrayList<>();
+		List<String> enames = new ArrayList<>();
+
+		for (Map<String, String> m : list) {
+
+			if (names.indexOf(m.get("name")) == -1) {
+
+				names.add(m.get("name"));
+			}
+
+			if (enames.indexOf(m.get("ename")) == -1) {
+
+				enames.add(m.get("ename"));
+			}
+
+			for (Object object : areas) {
+				JSONObject area = (JSONObject) object;
+
+				if (supervisionThreestep.getPlace() != null) {
+					if (supervisionThreestep.getPlace().equals(area.get("code").toString())) {
+						place = area.get("name").toString();
+					}
+				}
+
+				if (area.get("code").toString().equals(m.get("place"))) {
+					m.put("place", area.get("name").toString());
+				}
+				if (area.get("code").toString().equals(m.get("eplace"))) {
+					m.put("eplace", area.get("name").toString());
+				}
+			}
+
+			for (String out : outside) {
+				if (out.equals(m.get("eplace"))) {
+					if (m.get("status").equals("开工")) {
+						m.put("estatus", "开工");
+						m.put("eselfCheckTime", m.get("selfCheckTime"));
+					}
+
+				}
+			}
+
+			if (m.get("status").equals("开工")) {
+				count += 1;
+			}
+			if (m.get("estatus").equals("开工")) {
+				count1 += 1;
+			}
+		}
+
+		TableDataInfo info = getDataTable(list);
+
+		if (list.size() > (pageNum) * pageSize) {
+			list = list.subList((pageNum - 1) * pageSize, (pageNum) * pageSize);
+		} else {
+			list = list.subList((pageNum - 1) * pageSize, list.size());
+		}
+
+		info.setRows(list);
+
+		info.setNames(names);
+		info.setEnames(enames);
+
+		info.setMsg(string + place + "工地开工数量" + count + "  " + place1 + "处理场所开工数量" + count1);
+
+		return info;
+	}
+
+	@PostMapping("/exportDayWorkHistoryList")
+	public AjaxResult exportDayWorkHistoryList(@RequestBody List<dayWork> list) {
+		ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class);
+		return util.exportExcel(list, "历史开工报表");
+	}
+
+	@PostMapping("/exportDayWorkList")
+	public AjaxResult exportDayWorkList(@RequestBody List<dayWork> list) {
+		ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class);
+		return util.exportExcel(list, "日开工报表");
+	}
+
+	@PostMapping("/todayDataList")
+	public List<SupervisionThreestep> todayDataList(@RequestBody SupervisionThreestep supervisionThreestep) {
+		return supervisionThreestepService.selectTodayDataList(supervisionThreestep);
+	}
+
+	/**
+	 * 查询三查机制列表
+	 */
+	@PostMapping("/dayWorkList")
+	public AjaxResult days(@RequestBody SupervisionThreestep supervisionThreestep) {
+		List<Map> list = supervisionThreestepService.selectDayWorkListByType(supervisionThreestep);
+		AjaxResult result = AjaxResult.success(list);
+		result.put("result", AjaxResult.success(list).get("data"));
+		result.put("data", null);
+		return result;
+	}
+
+	/**
+	 * 导出三查机制列表
+	 */
+	@Log(title = "三查机制", businessType = BusinessType.EXPORT)
+	@GetMapping("/export")
+	public AjaxResult export(SupervisionThreestep supervisionThreestep) {
+		List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
+
+		JSONArray array = RemoteServerUtils.getAreas();
+		
+		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
+		if (constructionList == null) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("size", 99999);
+			map.put("page", 1);
+			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			if (constructionList != null) {
+				redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
+			}
+		}
+
+		for (int i = 0; i < list.size(); i++) {
+			List<String> objIds = new ArrayList<String>();
+			for(Object obj:constructionList){
+				objIds.add(((JSONObject)obj).getString("id"));
+			}
+			list.get(i).setWorkAreaCodeName(((JSONObject)constructionList.get(objIds.indexOf(list.get(i).getObjectId()))).getString("workAreaCodeName"));
+			
+			list.get(i).setId((long) i + 1);
+
+			for (Object object : array) {
+				JSONObject jsonObject = (JSONObject) object;
+				if (jsonObject.getString("code").equals(list.get(i).getPlace())) {
+					list.get(i).setPlace(jsonObject.getString("name"));
+				}
+			}
+			
+		}
+
+		List<String> withOut = new ArrayList<String>();
+		
+		if (supervisionThreestep.getHis() != null && supervisionThreestep.getHis().equals("2")) {
+			List<SupervisionThreestepWithWorkArea> list2 = new ArrayList<>();
+			
+			for(SupervisionThreestep t:list){
+				
+				SupervisionThreestepWithWorkArea s = new SupervisionThreestepWithWorkArea();
+				s.setId(t.getId());
+				s.setBeginTime(t.getBeginTime());
+				s.setCheckEndTime(t.getCheckEndTime());
+				s.setStatus(t.getStatus());
+				s.setCheckTime(t.getCheckTime());
+				s.setName(t.getName());
+				s.setType(t.getType());
+				s.setPlace(t.getPlace());
+				s.setSelfCheckTime(t.getSelfCheckTime());
+				s.setWorkAreaCodeName(t.getWorkAreaCodeName());
+				
+				list2.add(s);
+			}
+			
+
+			ExcelUtil<SupervisionThreestepWithWorkArea> util = new ExcelUtil<SupervisionThreestepWithWorkArea>(SupervisionThreestepWithWorkArea.class);
+
+			return util.exportExcel(list2, "报工记录", withOut);
+		}
+		
+		String str = "报工抽查";
+		if (supervisionThreestep.getStatus() == null) {
+			withOut.add("checkEndTime");
+			str = "报工自查";
+		}
+
+		
+		
+		ExcelUtil<SupervisionThreestep> util = new ExcelUtil<SupervisionThreestep>(SupervisionThreestep.class);
+
+		return util.exportExcel(list, str, withOut);
+	}
+
+	/**
+	 * 获取三查机制详细信息
+	 */
+	@GetMapping(value = "/{id}")
+	public AjaxResult getInfo(@PathVariable("id") Long id) {
+		return AjaxResult.success(supervisionThreestepService.selectSupervisionThreestepById(id));
+	}
+
+	@GetMapping(value = "names")
+	public List<String> names(SupervisionThreestep supervisionThreestep) {
+		return supervisionThreestepService.getNames(supervisionThreestep);
+	}
+
+	/**
+	 * 新增三查机制
+	 */
+	@Log(title = "三查机制", businessType = BusinessType.INSERT)
+	@PostMapping
+	@RepeatSubmit
+	public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep) {
+
+		int i = supervisionThreestepService.insertSupervisionThreestep(supervisionThreestep);
+
+		if (i == -1) {
+			return AjaxResult.error("无法重复报工");
+		}
+		if (i == -2) {
+			return AjaxResult.error("当前时间无法报工");
+		}
+
+		if (i == -3) {
+			return AjaxResult.error("项目已超期!");
+		}
+		if (i == -4) {
+			return AjaxResult.error("报工数据异常,请刷新页面重新提交!");
+		}
+
+		return toAjax(i);
+	}
+
+	/**
+	 * 修改三查机制
+	 */
+	@Log(title = "三查机制", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody SupervisionThreestep supervisionThreestep) {
+		return toAjax(supervisionThreestepService.updateSupervisionThreestep(supervisionThreestep));
+	}
+
+	@Log(title = "三查机制", businessType = BusinessType.UPDATE)
+	@PostMapping(value = "/active")
+	public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep) {
+
+		supervisionThreestep.setCheckTime(new Date());
+		return toAjax(supervisionThreestepService.activeSupervisionThreestep(supervisionThreestep));
+	}
+
+	/**
+	 * 删除三查机制
+	 */
+	@Log(title = "三查机制", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(supervisionThreestepService.deleteSupervisionThreestepByIds(ids));
-    }
-    
-    @RequestMapping(value = "/upload")
-    public String upload(@RequestParam("file") MultipartFile file) throws IOException {
-        return supervisionThreestepService.upload(file);
-    }
-    
-    
-    @RequestMapping(value = "/download")
-    public void download(@RequestParam("path") String path,HttpServletResponse response, HttpServletRequest request) throws IOException {  
-	    try
-	    {
-	        String realFileName = path.split("/")[path.split("/").length-1];
-	        String filePath = trashConfig.getUploadPath() + path.replace("/profile/upload", "");
-	
-	        response.setCharacterEncoding("utf-8");
-	        response.setContentType("multipart/form-data");
-	        response.setHeader("Content-Disposition","attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
-	        FileUtils.writeBytes(filePath, response.getOutputStream());
-
-	    }
-	    catch (Exception e)
-	    {
-	        e.printStackTrace();
-	    }
-    }
-    
-    @RequestMapping(value = "/getBase64")
-    public String getBase64(@RequestParam("path") String path) throws IOException {  
-	    try
-	    {
-	        String realFileName = path.split("/")[path.split("/").length-1];
-	        String filePath = trashConfig.getUploadPath() + path.replace("/profile/upload", "");
-	        
-	        File file = new File(filePath);
-	        
-	        
-	        FileInputStream fileInputStream = new FileInputStream(file);
-	        
-	        byte[] bytes = new byte[fileInputStream.available()];
-	        
-	        fileInputStream.read(bytes);
-	        
-	        return Base64Utils.encodeToString(bytes);
-
-	    }
-	    catch (Exception e)
-	    {
-	        e.printStackTrace();
-	    }
-	    return null;
-    }
+	public AjaxResult remove(@PathVariable Long[] ids) {
+		return toAjax(supervisionThreestepService.deleteSupervisionThreestepByIds(ids));
+	}
+
+	@RequestMapping(value = "/upload")
+	public String upload(@RequestParam("file") MultipartFile file) throws IOException {
+		return supervisionThreestepService.upload(file);
+	}
+
+	@RequestMapping(value = "/download")
+	public void download(@RequestParam("path") String path, HttpServletResponse response, HttpServletRequest request)
+			throws IOException {
+		try {
+			String realFileName = path.split("/")[path.split("/").length - 1];
+			String filePath = trashConfig.getUploadPath() + path.replace("/profile/upload", "");
+
+			response.setCharacterEncoding("utf-8");
+			response.setContentType("multipart/form-data");
+			response.setHeader("Content-Disposition",
+					"attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
+			FileUtils.writeBytes(filePath, response.getOutputStream());
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@RequestMapping(value = "/getBase64")
+	public String getBase64(@RequestParam("path") String path) throws IOException {
+		try {
+			String realFileName = path.split("/")[path.split("/").length - 1];
+			String filePath = trashConfig.getUploadPath() + path.replace("/profile/upload", "");
+
+			File file = new File(filePath);
+
+			FileInputStream fileInputStream = new FileInputStream(file);
+
+			byte[] bytes = new byte[fileInputStream.available()];
+
+			fileInputStream.read(bytes);
+
+			return Base64Utils.encodeToString(bytes);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
@@ -120,7 +120,7 @@ public class TruckCreditController extends BaseController
     {
         truckCredit.setCreateBy(SecurityUtils.getUsername());
         truckCredit.setTime(new Date());
-        return toAjax(truckCreditService.insertTruckCredit(truckCredit));
+        return toAjax(truckCreditService.insertTruckCredit(truckCredit,0));
     }
     /**
@@ -130,7 +130,7 @@ public class TruckCreditController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TruckCredit truckCredit)
     {
-        return toAjax(truckCreditService.updateTruckCredit(truckCredit));
+        return toAjax(truckCreditService.updateTruckCredit(truckCredit,0));
     }
     /**
@@ -76,6 +76,8 @@ public class SupervisionThreestep extends BaseEntity
     /** 运输车辆 */
     private String companyTrucks;
+    private String workAreaCodeName;
+    
     private String img0;
     private String img1;
@@ -145,6 +147,16 @@ public class SupervisionThreestep extends BaseEntity
 	private String his;
+	
+	
+	public String getWorkAreaCodeName() {
+		return workAreaCodeName;
+	}
+
+	public void setWorkAreaCodeName(String workAreaCodeName) {
+		this.workAreaCodeName = workAreaCodeName;
+	}
+
 	private List<String> ids;
+package com.trash.business.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.druid.sql.visitor.functions.If;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * 三查机制对象 supervision_threestep
+ * 
+ * @author trash
+ * @date 2023-04-24
+ */
+public class SupervisionThreestepWithWorkArea extends BaseEntity
+{
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/** 序号 */
+    @Excel(name = "序号")
+    private Long id;
+
+    /** 项目类型 处理场所/工地 */
+    @Excel(name = "项目类型",readConverterExp = "0=工地,1=处理场所")
+    private Long type;
+
+    /** 工地名称 */
+    @Excel(name = "项目名称")
+    private String name;
+    /** 管辖区 */
+    @Excel(name = "管辖区")
+    private String place;
+
+    /** 自查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "自查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date selfCheckTime;
+
+    /** 检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "巡查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date checkTime;
+   
+
+    /** 检查时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "抽查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date checkEndTime;
+    
+
+    @Excel(name = "报工状态",readConverterExp = "0=待巡查,1=巡查通过,2=巡查驳回,3=停工")
+    private Long status;
+    
+
+    @Excel(name = "工作区域")
+    private String workAreaCodeName;
+
+  
+	
+	public String getWorkAreaCodeName() {
+		return workAreaCodeName;
+	}
+
+	public void setWorkAreaCodeName(String workAreaCodeName) {
+		this.workAreaCodeName = workAreaCodeName;
+	}
+
+	private List<String> ids;
+	
+	
+   
+
+	public List<String> getIds() {
+		return ids;
+	}
+
+	public void setIds(List<String> ids) {
+		this.ids = ids;
+	}
+
+	
+
+	public Date getCheckEndTime() {
+		return checkEndTime;
+	}
+
+	public void setCheckEndTime(Date checkEndTime) {
+		this.checkEndTime = checkEndTime;
+	}
+
+	public Long getStatus() {
+		return status;
+	}
+
+	public void setStatus(Long status) {
+		this.status = status;
+	}
+
+	/** 现场负责人 */
+    private String person;
+
+    /** 电话 */
+    private String phone;
+    
+
+    
+    private String createBy;
+    
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(Long type) 
+    {
+        this.type = type;
+    }
+
+    public Long getType() 
+    {
+        return type;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setSelfCheckTime(Date selfCheckTime) 
+    {
+        this.selfCheckTime = selfCheckTime;
+    }
+
+    public Date getSelfCheckTime() 
+    {
+        return selfCheckTime;
+    }
+    public void setCheckTime(Date checkTime) 
+    {
+        this.checkTime = checkTime;
+    }
+
+    public Date getCheckTime() 
+    {
+        return checkTime;
+    }
+    
+    public void setPerson(String person) 
+    {
+        this.person = person;
+    }
+
+    public String getPerson() 
+    {
+        return person;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    
+    
+
+    public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String create_by) {
+		this.createBy = create_by;
+	}
+
+}
@@ -34,6 +34,10 @@ public class ThreestepHistory extends BaseEntity
     /** 所属区域 */
     @Excel(name = "所属区域")
     private String place;
+
+    /** 所属区域 */
+    @Excel(name = "工作区域")
+    private String workAreaCodeName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -71,7 +75,17 @@ public class ThreestepHistory extends BaseEntity
     @Excel(name = "联系方式 ")
     private String person1Number;
-    public Date getCreateTime() {
+    
+    
+    public String getWorkAreaCodeName() {
+		return workAreaCodeName;
+	}
+
+	public void setWorkAreaCodeName(String workAreaCodeName) {
+		this.workAreaCodeName = workAreaCodeName;
+	}
+
+	public Date getCreateTime() {
 		return createTime;
 	}
@@ -43,6 +43,16 @@ public class dayWork extends BaseEntity
     /** 管辖区 */
     @Excel(name = "所属区域")
     private String eplace;
+    
+    /** 管辖区 */
+    @Excel(name = "作业区域")
+    private String workAreaCodeName;
+    
+    @Excel(name = "投资类型")
+    private String siteInvestmentTypeName;
+    
+    @Excel(name = "施工地址")
+    private String address;
     @Excel(name = "开工状态")
     private String estatus;
@@ -54,6 +64,31 @@ public class dayWork extends BaseEntity
     @Excel(name = "备注")
     private String descript;
+    
+
+	public String getWorkAreaCodeName() {
+		return workAreaCodeName;
+	}
+
+	public void setWorkAreaCodeName(String workAreaCodeName) {
+		this.workAreaCodeName = workAreaCodeName;
+	}
+
+	public String getSiteInvestmentTypeName() {
+		return siteInvestmentTypeName;
+	}
+
+	public void setSiteInvestmentTypeName(String siteInvestmentTypeName) {
+		this.siteInvestmentTypeName = siteInvestmentTypeName;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
 	public String getName() {
 		return name;
+package com.trash.business.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.trash.activiti.domain.vo.ActReDeploymentVO;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 汇讯数码科技(深圳)有限公司
+ * 创建日期:2020/10/23-15:47
+ * 版本   开发者     日期
+ * 1.0    Danny    2020/10/23
+ */
+public interface SmsMapper {
+
+		public String getPhoneNumber(@Param("type")String  type ,@Param("checkpoint") String checkpoint);
+
+}
@@ -2,7 +2,9 @@ package com.trash.business.service;
 import java.util.List;
+import com.alibaba.fastjson.JSONArray;
 import com.trash.business.domain.ConstructionCredit;
+import com.trash.business.mapper.SmsMapper;
 /**
  * 三查机制Service接口
@@ -65,4 +67,6 @@ public interface IConstructionCreditService
 	List<String> getPlaces(ConstructionCredit constructionCredit);
 	List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit);
+	
+	void sendCreditSMS(String objectId , String name,String reason,long lost,JSONArray array,String smsType,SmsMapper smsMapper,String phone,String phone1);
 }
@@ -28,7 +28,7 @@ public interface ITruckCreditService {
      * @param truckCredit 车辆失信
      * @return 结果
      */
-    int insertTruckCredit(TruckCredit truckCredit);
+    int insertTruckCredit(TruckCredit truckCredit,int isCompany);
     /**
      * 修改车辆失信
@@ -36,7 +36,7 @@ public interface ITruckCreditService {
      * @param truckCredit 车辆失信
      * @return 结果
      */
-    int updateTruckCredit(TruckCredit truckCredit);
+    int updateTruckCredit(TruckCredit truckCredit,int i);
     /**
      * 删除车辆失信
@@ -21,6 +21,9 @@ import com.trash.business.service.ITruckCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 /**
  * 企业失信Service业务层处理
@@ -130,7 +133,9 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 		}
 		updateRemoteCompanyAndTruck(companyCredit, token);
-
+		
+		
+		
 		return;
 	}
@@ -138,7 +143,51 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit, String token) {
 		long credit = companyCredit.getLostCredit();
 		String companyId = companyCredit.getObjectId();
+		
+		JSONArray array = redisCache.getCacheObject("companyList");
+		
+		String number = null;
+		for(Object obj:array){
+			JSONObject json = (JSONObject)obj;
+			if(companyId.equals(json.getString("id"))){
+				number = json.getString("principalPhoneNo"); //企业安全负责人
+				break;
+			}
+		}
+		
+		List<Mobile> mobileList=new ArrayList<Mobile>();
+		
+		//TODO...test
+		number = "19520553054"; //LPF!
+				
+        
+		if(number != null){
+			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("发送返回空");
+            }
+		}
+		
 		List<Map> cpcList = new ArrayList<>();
 		Map cpc = new HashedMap<>();
 		cpc.put("dishonestState", credit);
@@ -181,7 +230,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 						if (credit == 0 && (data.getCreateType() != null && data.getCreateType() == 1)) {
 							data.setLostCredit(credit);
 							data.setReason("公司失信恢复");
-							truckService.updateTruckCredit(data);
+							truckService.updateTruckCredit(data,1);
 							Map upParam = new HashedMap<>();
 							upParam.put("creditStatus", credit);
 							upParam.put("id", truckId);
@@ -218,7 +267,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 					data.setObjectId(truckId);
-					truckService.insertTruckCredit(data);
+					truckService.insertTruckCredit(data,1);
 					Map upParam = new HashedMap<>();
 					upParam.put("creditStatus", credit);
@@ -15,10 +15,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.mapper.ConstructionCreditMapper;
+import com.trash.business.mapper.SmsMapper;
 import com.trash.business.service.IConstructionCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 /**
  * 三查机制Service业务层处理
@@ -31,7 +35,10 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
 {
     @Autowired
     private ConstructionCreditMapper constructionCreditMapper;
-
+    
+    @Autowired
+    SmsMapper smsMapper;
+    
     @Autowired
     RedisCache redis;
@@ -134,7 +141,6 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
     public int insertConstructionCredit(ConstructionCredit constructionCredit)
     {	
-    	
     	List<Map> map = new ArrayList<Map>();
     	ConstructionCredit cc = new ConstructionCredit();
@@ -150,19 +156,137 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
         if(old.size() > 0){
         	i = 1;
         }else{
-        	
-        	Map param = new HashMap();
-        	param.put("objectId", constructionCredit.getObjectId());
-        	param.put("creditStatus", constructionCredit.getLostCredit());
-        	map.add(param);
-        	
-        	RemoteServerUtils.updateConstationCreditAndStatus(map);
             i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
         }
+        
+
+    	Map param = new HashMap();
+    	param.put("objectId", constructionCredit.getObjectId());
+    	param.put("creditStatus", constructionCredit.getLostCredit());
+    	map.add(param);
+    	RemoteServerUtils.updateConstationCreditAndStatus(map);
+    	
+    	JSONArray array = redis.getCacheObject("constructionList");
+    	
+		sendCreditSMS(constructionCredit.getObjectId(),
+				constructionCredit.getName(),constructionCredit.getReason(),
+				constructionCredit.getLostCredit(),array,"credit",smsMapper,"constructionCompanyPhone","projectnCompanyPhone");
         return  i;
     }
+    
+
+   
+
+    public void sendCreditSMS(String objectId , String name,String reason,long lost,JSONArray array,String smsType,SmsMapper smsMapper,String phone,String phone1) {
+		
+		String number = null;
+		List<Mobile> mobileList=new ArrayList<Mobile>();
+		String areaCode = null;
+		
+		for(Object obj:array){
+			JSONObject json = (JSONObject)obj;
+			if(objectId.equals(json.getString("id"))){
+
+	            areaCode = json.getString("areaCode");
+	            
+				String p = json.getString(phone);
+				if(p!=null){
+					Mobile mobile=new Mobile();
+		            mobile.setMobile(p);
+		            mobileList.add(mobile);
+				}
+				
+				if(phone1!=null){
+					String p1 = json.getString(phone1);
+		            if(p1 != null){
+		            	Mobile mobile2=new Mobile();
+			            mobile2.setMobile(p1);
+			            mobileList.add(mobile2);
+		            }
+				}
+	            
+				
+				break;
+			}
+		}
+		
+		
+		
+		mobileList.clear();
+		
+		//TODO...test
+		number = "19520553054"; //LPF!
+		Mobile mobile=new Mobile();
+        mobile.setMobile(number);
+        mobileList.add(mobile);
+        
+		if(number != null){
+            
+            String smsString = "";
+            if(lost == 1){
+                smsString = "【长沙渣管】失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+            }else{
+                smsString = "【长沙渣管】失信解除提醒："+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
+            }
+            
+            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("发送返回空");
+            }
+		}
+		
+		number = smsMapper.getPhoneNumber(smsType, areaCode);
+		
+		if(number!=null){
+			String[] nums = number.split(",");
+			
+			for(String string:nums){
+				mobile=new Mobile();
+		        mobile.setMobile(number);
+		        mobileList.add(mobile);
+			}
+		}
+		
+		
+		mobileList.clear();
+		
+		//TODO...test
+		number = "19520553054"; //LPF!
+		mobile=new Mobile();
+        mobile.setMobile(number);
+        mobileList.add(mobile);
+        
+		if(mobileList.size() > 0){
+            
+            String smsString = "";
+            if(lost == 1){
+                smsString = "【长沙渣管】失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请加强监管。";
+            }else{
+                smsString = "【长沙渣管】失信解除提醒：你辖区内"+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
+            }
+            
+            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("发送返回空");
+            }
+		}
+		
+	}
+    
 	/**
      * 修改三查机制
      * 
@@ -19,6 +19,9 @@ import com.trash.common.config.trashConfig;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +36,9 @@ public class DriverCreditServiceImpl implements IDriverCreditService
 {
     @Autowired
     private DriverCreditMapper driverCreditMapper;
+    
+    @Autowired
+    RedisCache redisCache;
     /**
      * 查询驾驶员失信
@@ -65,7 +71,7 @@ public class DriverCreditServiceImpl implements IDriverCreditService
     	List<DriverCredit> list = new ArrayList<>();
 			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
 			if(areas.size() > 0) {
@@ -133,6 +139,69 @@ List&lt;String&gt; areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
             i = driverCreditMapper.insertDriverCredit(driverCredit);
         }
+        JSONArray array = redisCache.getCacheObject("companyList");
+        
+
+		JSONArray drivers = RemoteServerUtils.getDriverList();
+		String companyId = null;
+
+		for(Object obj:drivers){
+
+			JSONObject json = (JSONObject)obj;
+			if(json.getString("id").equals(driverCredit.getObjectId())){
+				companyId = json.getString("companyId");
+			}
+		}
+        
+		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;
+				}
+			}
+			
+			List<Mobile> mobileList=new ArrayList<Mobile>();
+
+			
+			//TODO...test
+			number = "19520553054"; //LPF!
+					
+	        
+			if(number != null){
+				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("发送返回空");
+	            }
+			}
+		}
+		
+        
+        
+        
+        
+        
 //        sentDataToRemoteServer(driverCredit);
         return i;
@@ -9,11 +9,13 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.business.mapper.EarthsitesCreditMapper;
+import com.trash.business.mapper.SmsMapper;
 import com.trash.business.mapper.TruckCreditMapper;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.domain.EarthsitesCredit;
+import com.trash.business.service.IConstructionCreditService;
 import com.trash.business.service.IEarthsitesCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
@@ -31,6 +33,13 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     @Autowired
     private EarthsitesCreditMapper earthsitesCreditMapper;
+
+    @Autowired
+    private IConstructionCreditService smsServer;
+
+    @Autowired
+    SmsMapper smsMapper;
+    
     @Autowired
     RedisCache redis;
     /**
@@ -114,16 +123,21 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
         	i = 1;
         }else{
-        	Map param = new HashMap();
-        	param.put("objectId", earthsitesCredit.getObjectId());
-        	param.put("creditStatus", earthsitesCredit.getLostCredit());
-        	map.add(param);
-        	
-        	RemoteServerUtils.updateEarthSitesCreditAndStatus(map);
-        	
             i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
         }
+    	Map param = new HashMap();
+    	param.put("objectId", earthsitesCredit.getObjectId());
+    	param.put("creditStatus", earthsitesCredit.getLostCredit());
+    	map.add(param);
+    	
+    	RemoteServerUtils.updateEarthSitesCreditAndStatus(map);
+    	
+    	JSONArray array = redis.getCacheObject("earthSitesList");
+    	
+    	smsServer.sendCreditSMS(earthsitesCredit.getObjectId() , earthsitesCredit.getName(),earthsitesCredit.getReason(),
+    			earthsitesCredit.getLostCredit(),array,"credit",smsMapper,"principalPhoneNo",null);;
+    	
         return i;
     }
@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,56 +123,96 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 		}
-    	
+		List<String> ids = new ArrayList<>();
-        		List<String> ids = new ArrayList<>();
+		List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
+		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
+		List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
- 				List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
- 				List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
-				List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
-				
- 				for(String str:SecurityUtils.getLoginUser().getUser().getConList()){
- 					ids.add(str);
- 				}
- 				
- 				if(SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0){
-
- 					
- 					JSONArray jsonArray = redis.getCacheObject("constructionList");
- 					
- 					for(Object obj:jsonArray){
- 						JSONObject json = (JSONObject) obj;
- 						if(cArea.indexOf(json.getString("areaCode")) > -1){
- 							ids.add(json.getString("id"));
- 						}
- 					}
- 				}
-
- 				for(String str:eLish){
-					ids.add(str);
+
+
+		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
+		if (constructionList == null) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("size", 99999);
+			map.put("page", 1);
+			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			if (constructionList != null) {
+				redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
+			}
+		}
+
+		if (supervisionThreestep.getWorkAreaCodeName() != null) {
+			JSONArray tempList = new JSONArray();
+			for (Object obj : constructionList) {
+				JSONObject json = (JSONObject) obj;
+				if(!json.getString("workAreaCodeName").equals(supervisionThreestep.getWorkAreaCodeName())){
+					continue;
 				}
-				if(eArea.size() > 0){
-					
-					JSONArray jsonArray = redis.getCacheObject("earthSitesList");
-					
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(eArea.indexOf(json.getString("areaCode")) > -1){
-							ids.add(json.getString("id"));
-						}
-					}
+				tempList.add(json);
+				if(SecurityUtils.getLoginUser().getUser().getConList().indexOf(json.getString("id")) > -1){
+					ids.add(json.getString("id"));
 				}
-				
-				supervisionThreestep.setIds(ids);
-        	
-        	if(ids.size() == 0){
-        		return list;
-        	}
-        
+			}
+			constructionList = tempList;
+		}else{
+			ids.addAll(SecurityUtils.getLoginUser().getUser().getConList());
+		}
+			
+
+		
+		if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0) {
+
+			for (Object obj : constructionList) {
+				JSONObject json = (JSONObject) obj;
+				if (cArea.indexOf(json.getString("areaCode")) > -1) {
+
+					ids.add(json.getString("id"));
+				}
+			}
+		}
+
+		for (String str : eLish) {
+			ids.add(str);
+		}
+
+		if (eArea.size() > 0) {
+
+			JSONArray jsonArray = redis.getCacheObject("earthSitesList");
+
+			for (Object obj : jsonArray) {
+				JSONObject json = (JSONObject) obj;
+				if (eArea.indexOf(json.getString("areaCode")) > -1) {
+					ids.add(json.getString("id"));
+				}
+			}
+		}
+
+		supervisionThreestep.setIds(ids);
+
+		if (ids.size() == 0) {
+			return list;
+		}
+
 		list = supervisionThreestepMapper.selectSupervisionThreestepList(supervisionThreestep);
+		if (supervisionThreestep.getHis() != null && supervisionThreestep.getHis().equals("2")) {
+
+			for (SupervisionThreestep t : list) {
+				for (Object constObj : constructionList) {
+					JSONObject constJSON = (JSONObject) constObj;
+
+					if (t.getObjectId().equals(constJSON.getString("id"))) {
+						t.setWorkAreaCodeName(constJSON.getString("workAreaCodeName"));
+						break;
+					}
+				}
+			}
+		}
+
 		return list;
+
 	}
 	@Override
@@ -223,7 +264,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		return supervisionThreestepMapper.getNames(supervisionThreestep);
 	}
-
 	String[] outside = { "长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县" };
 	@SuppressWarnings("unchecked")
@@ -269,7 +309,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
 		JSONArray contracts = redisCache.getCacheObject("contractList");
-
 		if (contracts == null) {
 			Map param = new HashMap<>();
@@ -282,6 +321,17 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			redisCache.setCacheObject("contractList", contracts);
 		}
+		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
+		if (constructionList == null) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("size", 99999);
+			map.put("page", 1);
+			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			if (constructionList != null) {
+				redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
+			}
+		}
+
 		JSONArray areas = redisCache.getCacheObject("areas");
 		String place = null, eplace = null, name = null, ename = null;
@@ -409,6 +459,20 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 						map.put("createTime", yearFomat.format(s.getCreateTime()));
 						map.put("name", s.getName());
 						map.put("place", s.getPlace());
+
+						for (Object constObj : constructionList) {
+							JSONObject constJSON = (JSONObject) constObj;
+
+							if (!s.getObjectId().equals(constJSON.getString("id")))
+								continue;
+							else {
+								map.put("address", constJSON.getString("address"));
+								map.put("siteInvestmentTypeName", constJSON.getString("siteInvestmentTypeName"));
+								map.put("workAreaCodeName", constJSON.getString("workAreaCodeName"));
+								break;
+							}
+						}
+
 						map.put("status", "开工");
 						map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
 						map.put("objectId", s.getObjectId());
@@ -452,6 +516,18 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 							map.put("createTime", yearFomat.format(s.getCreateTime()));
 							map.put("name", s.getName());
 							map.put("place", s.getPlace());
+							for (Object constObj : constructionList) {
+								JSONObject constJSON = (JSONObject) constObj;
+
+								if (!s.getObjectId().equals(constJSON.getString("id")))
+									continue;
+								else {
+									map.put("address", constJSON.getString("address"));
+									map.put("siteInvestmentTypeName", constJSON.getString("siteInvestmentTypeName"));
+									map.put("workAreaCodeName", constJSON.getString("workAreaCodeName"));
+									break;
+								}
+							}
 							map.put("status", "开工");
 							map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
 							map.put("objectId", s.getObjectId());
@@ -488,12 +564,19 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			eplace = supervisionThreestep.getSubReason();
 		}
+		String workAreaCodeName = supervisionThreestep.getWorkAreaCodeName();
+
 		for (Map<String, String> map : list) {
 			if (place != null) {
 				if (!place.equals(map.get("place"))) {
 					continue;
 				}
 			}
+			if (workAreaCodeName != null) {
+				if (!workAreaCodeName.equals(map.get("workAreaCodeName"))) {
+					continue;
+				}
+			}
 			if (eplace != null) {
 				if (!eplace.equals(map.get("eplace"))) {
 					continue;
@@ -519,15 +602,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@Override
 	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) {
-		
 		Date date = new Date();
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		if(supervisionThreestep.getWorkStartTime() == null){
+		if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
-	
-	
+
 			if (new Date().getHours() < 8) {
 				end = yearFomat.format(date);
 				date.setDate(date.getDate() - 1);
@@ -537,10 +618,10 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				date.setDate(date.getDate() + 1);
 				end = yearFomat.format(date);
 			}
-	
+
 			end += " 4:00:00";
 			start += " 8:00:00";
-	
+
 			try {
 				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
 				supervisionThreestep.setWorkEndTime(dateTime.parse(end));
@@ -614,47 +695,47 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
 		List<SupervisionThreestep> data = new ArrayList<>();
-		
+
 		String companyName = SecurityUtils.getLoginUser().getUser().getCompanyName();
-		
-		
-		
+
 		List<SupervisionThreestep> threesteps = supervisionThreestepMapper.selectTodayDataList(supervisionThreestep);
-		
-		if(companyName != null){
-
-	         JSONArray array = redisCache.getCacheObject("constructionList");
-	         
-	         for(SupervisionThreestep three:threesteps){
-	        	 for(Object obj:array){
-	        		 JSONObject con = (JSONObject) obj;
-	        		 if(three.getObjectId().equals(con.getString("id"))){
-	        			 
-	        			 if(con.getString("transportCompany") != null && con.getString("transportCompany").equals(companyName)){
-	        				 
-	        				 data.add(three);
-	        				 
-	        				 continue;
-	        			 }
-	        			 
-	        			 JSONArray array2 = RemoteServerUtils.getUnitetransport(con.getString("id"));
-	        			 
-	        			 for(Object comObj:array2){
-	        				 JSONObject company = (JSONObject) comObj;
-	        				 
-	        				 if(company.getString("companyName") != null && company.getString("companyName").equals(companyName)){
-	        					 
-	        					 data.add(three);
-	        	        		 break;
-	        				 }
-	        			 }
-	        		 }
-	        	 }
-	         }
-	         return data;
+
+		if (companyName != null) {
+
+			JSONArray array = redisCache.getCacheObject("constructionList");
+
+			for (SupervisionThreestep three : threesteps) {
+				for (Object obj : array) {
+					JSONObject con = (JSONObject) obj;
+					if (three.getObjectId().equals(con.getString("id"))) {
+
+						if (con.getString("transportCompany") != null
+								&& con.getString("transportCompany").equals(companyName)) {
+
+							data.add(three);
+
+							continue;
+						}
+
+						JSONArray array2 = RemoteServerUtils.getUnitetransport(con.getString("id"));
+
+						for (Object comObj : array2) {
+							JSONObject company = (JSONObject) comObj;
+
+							if (company.getString("companyName") != null
+									&& company.getString("companyName").equals(companyName)) {
+
+								data.add(three);
+								break;
+							}
+						}
+					}
+				}
+			}
+			return data;
 		}
-		
-		return threesteps;		
+
+		return threesteps;
 	}
 	/**
@@ -710,49 +791,52 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			return -1;
 		}
-		
-		if(supervisionThreestep.getType() == 0){
-			
+
+		if (supervisionThreestep.getType() == 0) {
+
 			Object object = RemoteServerUtils.getConstructionLicenseById(supervisionThreestep.getObjectId());
-			
-			if(object != null){
-				JSONObject jsonObject  =(JSONObject) object;
-				
+
+			if (object != null) {
+				JSONObject jsonObject = (JSONObject) object;
+
 				long time = new Date().getTime();
-				
+
 				try {
-					if(dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
+					if (dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time
+							|| dateTime.parse(jsonObject.get("effectiveEnd").toString() + " 23:59:59")
+									.getTime() < time) {
 						return -3;
 					}
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
-			}else{
+			} else {
 				return -4;
 			}
-			
-		}else{
+
+		} else {
 			Object object = RemoteServerUtils.getEarthSitesInfo(supervisionThreestep.getObjectId());
-			
-			if(object != null){
-				JSONObject jsonObject  =(JSONObject)((JSONObject) object).getJSONObject("site");
-				
+
+			if (object != null) {
+				JSONObject jsonObject = (JSONObject) ((JSONObject) object).getJSONObject("site");
+
 				long time = new Date().getTime();
-				
+
 				try {
-					if(dateTime.parse(jsonObject.get("effectiveFrom").toString()+ " 00:00:00").getTime() > time || dateTime.parse(jsonObject.get("effectiveEnd").toString()+ " 23:59:59").getTime() < time){
+					if (dateTime.parse(jsonObject.get("effectiveFrom").toString() + " 00:00:00").getTime() > time
+							|| dateTime.parse(jsonObject.get("effectiveEnd").toString() + " 23:59:59")
+									.getTime() < time) {
 						return -3;
 					}
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
-				
-			}else{
+
+			} else {
 				return -4;
 			}
-			
+
 		}
-		
 		supervisionThreestep.setCreateTime(DateUtils.getNowDate());
 		supervisionThreestep.setSelfCheckTime(DateUtils.getNowDate());
@@ -904,12 +988,11 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		truckActivate.setStatus(0L);
 		truckActivate.setActivateStatus("0");
 		List<TruckActivate> taList = null;
-		try{
+		try {
 			taList = truckActivateMapper.selectTruckActivateList(truckActivate);
-		}catch(Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
 		for (TruckActivate ta : taList) {
 			unActiveTruck += ta.getObjectId() + ",";
 package com.trash.business.service.impl;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.ThreestepHistory;
@@ -15,6 +20,7 @@ import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.mapper.ThreestepHistoryMapper;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.IThreestepHistoryService;
+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;
@@ -31,10 +37,11 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
     @Autowired
     private ThreestepHistoryMapper threestepHistoryMapper;
-
     @Autowired
     private SupervisionThreestepMapper threestepMapper;
-    
+
+    @Autowired
+    RedisCache redisCache;
     /**
      * 查询开停工
      * 
@@ -55,8 +62,39 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
      */
     @Override
     public List<ThreestepHistory> selectThreestepHistoryList(ThreestepHistory threestepHistory)
-    {
-        return threestepHistoryMapper.selectThreestepHistoryList(threestepHistory);
+    {	
+    	
+    	
+    	List<ThreestepHistory> list = threestepHistoryMapper.selectThreestepHistoryList(threestepHistory);
+		
+		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
+		List<String> ids = redisCache.getCacheObject("constructionIds");
+		if (constructionList == null || ids == null) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("size", 99999);
+			map.put("page", 1);
+			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			if (constructionList != null) {
+				ids = new ArrayList();
+				
+				for(Object object : constructionList){
+					JSONObject jsonObject = (JSONObject) object;
+					ids.add(jsonObject.getString("id"));
+				}
+
+				redisCache.setCacheObject("constructionIds", ids, 60, TimeUnit.MINUTES);
+				redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
+			}
+		}
+
+		if(threestepHistory.getType() == 0){
+			for(ThreestepHistory th:list){
+				if(ids.indexOf(th.getObjectId()) > -1)
+					th.setWorkAreaCodeName(((JSONObject)constructionList.get(ids.indexOf(th.getObjectId()))).getString("workAreaCodeName"));
+			}
+		}
+    	
+        return list;
     }
     /**
@@ -20,6 +20,9 @@ import com.trash.business.service.ITruckCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
 /**
  * 车辆失信Service业务层处理
@@ -110,10 +113,11 @@ public class TruckCreditServiceImpl implements ITruckCreditService
      * 新增车辆失信
      *
      * @param truckCredit 车辆失信
+     * @param isCompany 
      * @return 结果
      */
     @Override
-    public int insertTruckCredit(TruckCredit truckCredit)
+    public int insertTruckCredit(TruckCredit truckCredit, int isCompany)
     {	
         int i; 
@@ -132,11 +136,60 @@ public class TruckCreditServiceImpl implements ITruckCreditService
             cc.setTime(new Date());
         	i = truckCreditMapper.insertTruckCredit(truckCredit);
         }
-
+        
+        if(isCompany == 0){
+        	
+        
+	        JSONArray array = redisCache.getCacheObject("companyList");
+			
+			String number = null;
+			for(Object obj:array){
+				JSONObject json = (JSONObject)obj;
+				if(truckCredit.getCompanyId().equals(json.getString("name"))){
+					number = json.getString("principalPhoneNo"); //企业安全负责人
+					break;
+				}
+			}
+			
+			List<Mobile> mobileList=new ArrayList<Mobile>();
+	
+			
+			//TODO...test
+			number = "19520553054"; //LPF!
+					
+	        
+			if(number != null){
+				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;
     }
+    
+    
     /**
      * 修改车辆失信
      *
@@ -145,7 +198,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
      */
     @Override
     @Transactional
-    public int updateTruckCredit(TruckCredit truckCredit)
+    public int updateTruckCredit(TruckCredit truckCredit,int i)
     {	
     	TruckCredit cc = null;
     	if(truckCredit.getObjectId() != null){
@@ -176,7 +229,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 			RemoteServerUtils.updateTruckList(listParam);
-            return insertTruckCredit(cc);
+            return insertTruckCredit(cc,i);
         } catch (Exception e) {
 package com.trash.caseOffline.controller;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.trash.caseOffline.domain.CaseOffline;
+import com.trash.caseOffline.service.ICaseOfflineService;
 import com.trash.common.annotation.Log;
 import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.domain.entity.SysDictData;
+import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.enums.BusinessType;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.trash.caseOffline.domain.CaseOffline;
-import com.trash.caseOffline.service.ICaseOfflineService;
-import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
-import com.trash.common.core.page.TableDataInfo;
-import com.trash.common.core.redis.RedisCache;
+import com.trash.common.utils.spring.SpringUtils;
+import com.trash.system.service.ISysDictTypeService;
 /**
  * 线下交办案卷Controller
@@ -54,11 +53,9 @@ public class CaseOfflineController extends BaseController
     {
         startPage();
-        	
-
         return getDataTable(caseOfflineService.selectCaseOfflineList(caseOffline));
     }
-
+    
     /**
      * 导出线下交办案卷列表
      */
@@ -67,9 +64,28 @@ public class CaseOfflineController extends BaseController
     public AjaxResult export(CaseOffline caseOffline)
     {
         List<CaseOffline> list = caseOfflineService.selectCaseOfflineList(caseOffline);
+        
+    	List<SysDictData> dicts = SpringUtils.getBean(ISysDictTypeService.class).selectDictDataByType("case_offline_type");
+    	
     	for(int i = 0;i<list.size();i++){
         	list.get(i).setId((long)i+1);
+        	for(SysDictData d:dicts){
+        		if(d.getDictValue().equals(list.get(i).getType())){
+        			list.get(i).setType(d.getDictLabel());
+        			break;
+        		}
+        	}
+        	if (list.get(i).advice4 != null) {
+        		list.get(i).status1 = "结案存档";
+    		}else if (list.get(i).advice1 == null) {
+    			list.get(i).status1 =  "未回复";
+    		}else if (list.get(i).advice4 == null && list.get(i).advice3 == null) {
+    			list.get(i).status1 =  "已回复";
+    		}else if (list.get(i).advice4 == null && list.get(i).advice3 != null) {
+    			list.get(i).status1 =  "审核中";
+    		}
+        	
         }
         JSONArray areas = RemoteServerUtils.getAreas();