m

youxiw2000
1 parent 93eb74ba
Showing 41 changed files with 1260 additions and 214 deletions
pom.xml
trash-activiti/src/main/java/com/trash/activiti/controller/HistoryFormDataCoroller.java
trash-activiti/src/main/java/com/trash/activiti/mapper/ActWorkflowFormDataMapper.java
trash-activiti/src/main/java/com/trash/activiti/service/IFormHistoryDataService.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActWorkflowFormDataMapper.xml
trash-admin/pom.xml
trash-admin/src/main/resources/application-dev.yml
trash-common/pom.xml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-framework/pom.xml
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/custom/BizException.java
trash-garbage/src/main/java/com/trash/garbage/global/Result.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/JwtUtils.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/activiti/historyFormdata.js
@@ -214,6 +214,11 @@
                 <artifactId>trash-unit</artifactId>
                 <version>${trash.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.trash</groupId>
+                <artifactId>trash-garbage</artifactId>
+                <version>${trash.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
@@ -3,9 +3,13 @@ package com.trash.activiti.controller;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.activiti.service.IFormHistoryDataService;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 @RestController
@@ -18,4 +22,12 @@ public class HistoryFormDataCoroller {
         return AjaxResult.success(formHistoryDataService.historyDataShow(instanceId));
     }
+    
+    @PostMapping(value = "historyFromData/historyFromDataByTime")
+    public AjaxResult historyFromDataByTime(@RequestBody Map<String,String> map) {
+    	
+        return AjaxResult.success(formHistoryDataService.historyFromDataByTime(map));
+
+    }
+    
 }
@@ -2,6 +2,7 @@ package com.trash.activiti.mapper;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import org.apache.ibatis.annotations.Param;
@@ -85,4 +86,5 @@ public interface ActWorkflowFormDataMapper
     int deleteActWorkflowFormDataByIds(Long[] ids);
 	List<ActWorkflowFormData> selectActWorkFlowFormDataListByUser(@Param("username") String username);
+	List<ActWorkflowFormData> selectNewActWorkflowFormDataByBusinessKey(Map<String,String> map);
 }
 package com.trash.activiti.service;
 import java.util.List;
+import java.util.Map;
 import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.HistoryDataDTO;
@@ -14,4 +15,6 @@ import com.trash.activiti.domain.dto.HistoryDataDTO;
 public interface IFormHistoryDataService {
 	List<ActWorkflowFormData> historyDataShow(String instanceId);
+
+	List<ActWorkflowFormData> historyFromDataByTime(Map<String,String> map);
 }
@@ -11,11 +11,14 @@ import org.springframework.stereotype.Service;
 import com.trash.activiti.domain.ActWorkflowFormData;
 import com.trash.activiti.domain.dto.HistoryDataDTO;
 import com.trash.activiti.domain.dto.HistoryFormDataDTO;
+import com.trash.activiti.mapper.ActWorkflowFormDataMapper;
 import com.trash.activiti.service.IActWorkflowFormDataService;
 import com.trash.activiti.service.IFormHistoryDataService;
+import com.trash.common.utils.DateUtils;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 /**
@@ -29,7 +32,10 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
     @Autowired
     private IActWorkflowFormDataService actWorkflowFormDataService;
-
+    @Autowired
+    private ActWorkflowFormDataMapper formDataMapper;
+    
+    
     private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -127,6 +133,51 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
         return returnHistoryFromDataDTOS;
     }
+    
+    @Override
+    public List<ActWorkflowFormData> historyFromDataByTime(Map<String,String> map) {
+        List<ActWorkflowFormData> returnHistoryFromDataDTOS=new ArrayList<>();
+        List<ActWorkflowFormData> actWorkflowFormData=new ArrayList<>();
+        
+        String businessKey = map.get("businessKey");
+        
+        	
+
+        actWorkflowFormData = formDataMapper.selectNewActWorkflowFormDataByBusinessKey(map);
+        
+        
+		
+        
+        for(int i =0;i<actWorkflowFormData.size();i++){
+        	if(i == actWorkflowFormData.size()-1){
+        		returnHistoryFromDataDTOS.add(actWorkflowFormData.get(i));
+        		continue;
+        	}
+        	
+        	ActWorkflowFormData one = actWorkflowFormData.get(i);
+        	ActWorkflowFormData two = actWorkflowFormData.get(i+1);
+        	
+        	if(one.getCreateBy().equals(two.getCreateBy()) && one.getCreateTime().getTime() == two.getCreateTime().getTime()){
+        		
+        		String twoValue = two.getControlValue() == null ? "" : "," + two.getControlValue();
+        		
+        		one.setControlValue(one.getControlValue() + twoValue);
+        		
+        		returnHistoryFromDataDTOS.add(one);
+        		i+=1;
+        		continue;
+        	}
+
+    		returnHistoryFromDataDTOS.add(one);
+        }
+        
+        
+        
+        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((x,y) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
+        
+        return returnHistoryFromDataDTOS;
+    }
+    
 }
@@ -44,6 +44,16 @@
         order by create_time DESC
     </select>
+     <select id="selectNewActWorkflowFormDataByBusinessKey" parameterType="Map" resultMap="ActWorkflowFormDataResult">
+        select * from act_workflow_formdata where id in(
+			select max(id) from act_workflow_formdata where 
+			business_key = #{businessKey} 
+			and create_time BETWEEN  #{createTime}  and  #{updateTime} 
+			GROUP BY control_id)
+    </select>
+    
+    
+    
     <select id="selectActWorkFlowFormDataListByUser" parameterType="string" resultMap="ActWorkflowFormDataResult">
        select * from act_workflow_formdata where id in (
 			select max(id)from act_workflow_formdata
@@ -61,6 +71,7 @@
             <if test="controlValue != null">control_value,</if>
             <if test="taskNodeName != null">task_node_name,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="createName != null">create_name,</if>
             <if test="createTime != null">create_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -71,6 +82,7 @@
             <if test="controlValue != null">#{controlValue},</if>
             <if test="taskNodeName != null">#{taskNodeName},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="createName != null">create_name,</if>
             <if test="createTime != null">#{createTime},</if>
         </trim>
     </insert>
@@ -90,11 +90,10 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-unit</artifactId>
         </dependency>
-        <dependency>
+       <!--  <dependency>
             <groupId>com.trash</groupId>
             <artifactId>trash-garbage</artifactId>
-            <version>3.2.0</version>
-        </dependency>
+        </dependency> -->
     </dependencies>
     <build>
@@ -32,10 +32,10 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-#                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                #url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: guzijian
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -124,13 +124,12 @@
             <artifactId>esdk-obs-java</artifactId>
             <version>[3.20.6.1,)</version>
         </dependency>
-        <!-- mybatis-plus 增强CRUD -->
+		        <!-- mybatis-plus 增强CRUD -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.1</version>
         </dependency>
-
     </dependencies>
 </project>
 \ No newline at end of file
 package com.trash.common.utils;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +45,7 @@ public class RemoteServerUtils {
 	public static String TruckInfo = "/api/gpsservice/cs/basevehicle/";
 	public static String EarthSitesInfo = "/api/siteservice/cs/earthsites/";
-	public static String EarthSitesList = "//api/siteservice/cs/earthsites/ledger/list";
+	public static String EarthSitesList = "/api/siteservice/cs/earthsites/ledger/list";
 	public static String ConstructionInfo = "/api/siteservice/cs/constructionsites/";
@@ -756,7 +757,44 @@ public class RemoteServerUtils {
 		}
 	}
+
+	
+	static String upUrl = "https://cszgf.tyykj.com:37251/";
+	public static boolean updateUpCase(Map map){
+		if(okHttpClient == null){
+			okHttpClient = new OkHttpClient.Builder()
+	                .connectTimeout(20, TimeUnit.SECONDS)
+	                .writeTimeout(20, TimeUnit.SECONDS)
+	                .readTimeout(30, TimeUnit.SECONDS)
+	                .build();
+		}
+		
+		
+    	String param = JSON.toJSON(map).toString();
+    	
+    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
+
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/callback").addHeader("Authorization",getUpUser()).post(body).build();
+
+            okhttp3.Response response;
+            String result;
+			try {
+				response = okHttpClient.newCall(request).execute();
+
+	            result = response.body().string();
+	            JSONObject json = JSON.parseObject(result);
+	        	if(json.getBoolean("success")){
+	        		return json.getBoolean("success");
+	        	}
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+			return false;
+           
+	}
 	public static String getUpUser(){
 		if(okHttpClient == null){
@@ -776,7 +814,7 @@ public class RemoteServerUtils {
     	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-        Request request = new Request.Builder().url("https://cszgf.tyykj.com:37251/api/thirdApi/basic/token").post(body).build();
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/token").post(body).build();
         try {
@@ -799,6 +837,136 @@ public class RemoteServerUtils {
 		return null;
 	}
+	public static JSONArray getUpArea() {
+		if(okHttpClient == null){
+			okHttpClient = new OkHttpClient.Builder()
+	                .connectTimeout(20, TimeUnit.SECONDS)
+	                .writeTimeout(20, TimeUnit.SECONDS)
+	                .readTimeout(30, TimeUnit.SECONDS)
+	                .build();
+		}
+		
+		
+		Map map = new HashMap<>();
+		
+		
+    	String param = JSON.toJSON(map).toString();
+    	
+    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
+
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/areaList").addHeader("Authorization",getUpUser()).post(body).build();
+
+
+        try {
+            okhttp3.Response response = okHttpClient.newCall(request).execute();
+            String result = response.body().string();
+            
+            if(result != null){
+            	JSONObject json = JSON.parseObject(result);
+            	if( json.getBoolean("success")){
+            		return json.getJSONArray("data");
+            	}
+            }
+            
+        }catch (Exception e) {
+        	e.printStackTrace();
+        	
+		}
+        return null;
+	}
+	
+	public static boolean insertUpCase(Map params) {
+		if(okHttpClient == null){
+			okHttpClient = new OkHttpClient.Builder()
+	                .connectTimeout(20, TimeUnit.SECONDS)
+	                .writeTimeout(20, TimeUnit.SECONDS)
+	                .readTimeout(30, TimeUnit.SECONDS)
+	                .build();
+		}
+		
+		
+		Map map = new HashMap<>();
+		
+		
+    	String param = JSON.toJSON(params).toString();
+    	
+    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
+
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/push/acceptEvt").addHeader("Authorization",getUpUser()).post(body).build();
+
+
+        try {
+            okhttp3.Response response = okHttpClient.newCall(request).execute();
+            String result = response.body().string();
+            
+            if(result != null){
+            	JSONObject json = JSON.parseObject(result);
+            	return json.getBoolean("success");
+            }
+            
+        }catch (Exception e) {
+        	e.printStackTrace();
+        	
+		}
+        return false;
+	}
+	
+	
+
+
+	public static JSONObject getUpClass() {
+		if(okHttpClient == null){
+			okHttpClient = new OkHttpClient.Builder()
+	                .connectTimeout(20, TimeUnit.SECONDS)
+	                .writeTimeout(20, TimeUnit.SECONDS)
+	                .readTimeout(30, TimeUnit.SECONDS)
+	                .build();
+		}
+		
+		
+		Map map = new HashMap<>();
+
+    	map.put("industryType", "01");
+		
+    	String param = JSON.toJSON(map).toString();
+    	
+    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
+
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/classList").addHeader("Authorization",getUpUser()).post(body).build();
+
+
+        try {
+            okhttp3.Response response = okHttpClient.newCall(request).execute();
+            String result = response.body().string();
+            
+            if(result != null){
+            	JSONObject json = JSON.parseObject(result);
+            	if(json.getBoolean("success")){
+            		
+            		for(Object object : json.getJSONArray("data")){
+            			JSONObject jsonObj = (JSONObject) object;
+            			
+            			
+            			if(jsonObj.getString("name").equals("")){
+            				
+            			}
+            			
+            			
+            		}
+            		
+            		
+            	}
+            }else{
+            	return null;
+            }
+            
+        }catch (Exception e) {
+        	e.printStackTrace();
+        	return null;
+		}
+		return null;
+	}
+	
 	public static JSONArray getCaseList(){
 		if(okHttpClient == null){
 			okHttpClient = new OkHttpClient.Builder()
@@ -816,7 +984,7 @@ public class RemoteServerUtils {
     	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-        Request request = new Request.Builder().url("https://cszgf.tyykj.com:37251/api/thirdApi/query/dispatchEvtList").addHeader("Authorization",getUpUser()).post(body).build();
+        Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/dispatchEvtList").addHeader("Authorization",getUpUser()).post(body).build();
         try {
@@ -846,4 +1014,7 @@ public class RemoteServerUtils {
 	}
+
+
+
 }
@@ -34,8 +34,7 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mybatis.spring.boot/mybatis-spring-boot-starter -->
-        <dependency>
+       	<dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.3.1</version>
@@ -21,10 +21,6 @@
         </dependency>
         <dependency>
             <groupId>com.trash</groupId>
-            <artifactId>trash-activiti</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.trash</groupId>
             <artifactId>trash-framework</artifactId>
         </dependency>
         <dependency>
@@ -11,7 +11,33 @@ public class BizException extends RuntimeException{
     private String msg;
     private ResultCode code;
-    public BizException(ResultCode code, String msg){
+    
+    
+    public String getMsg() {
+		return msg;
+	}
+
+
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+
+
+	public ResultCode getCode() {
+		return code;
+	}
+
+
+
+	public void setCode(ResultCode code) {
+		this.code = code;
+	}
+
+
+
+	public BizException(ResultCode code, String msg){
         this.msg = msg;
         this.code = code;
     }
@@ -22,8 +22,58 @@ public class Result&lt;T extends Object&gt; {
     private T data ;
     private Result() {}
+    
+    
-    /** 成功静态方法 */
+    public Boolean getSuccess() {
+		return success;
+	}
+
+
+
+	public void setSuccess(Boolean success) {
+		this.success = success;
+	}
+
+
+
+	public Integer getCode() {
+		return code;
+	}
+
+
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+
+
+	public String getMsg() {
+		return msg;
+	}
+
+
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+
+
+	public T getData() {
+		return data;
+	}
+
+
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+
+
+	/** 成功静态方法 */
     public static Result OK() {
         Result r = new Result();
         r.setSuccess(true);
@@ -133,4 +133,82 @@ public class GarAddress implements Serializable {
         sb.append("]");
         return sb.toString();
     }
+
+	public String getGarAddressId() {
+		return garAddressId;
+	}
+
+	public void setGarAddressId(String garAddressId) {
+		this.garAddressId = garAddressId;
+	}
+
+	public String getGarUserId() {
+		return garUserId;
+	}
+
+	public void setGarUserId(String garUserId) {
+		this.garUserId = garUserId;
+	}
+
+	public String getGarUserAddress() {
+		return garUserAddress;
+	}
+
+	public void setGarUserAddress(String garUserAddress) {
+		this.garUserAddress = garUserAddress;
+	}
+
+	public Integer getGarUserDefault() {
+		return garUserDefault;
+	}
+
+	public void setGarUserDefault(Integer garUserDefault) {
+		this.garUserDefault = garUserDefault;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+	public String getGarUserContactName() {
+		return garUserContactName;
+	}
+
+	public void setGarUserContactName(String garUserContactName) {
+		this.garUserContactName = garUserContactName;
+	}
+
+	public String getGarUserContactTel() {
+		return garUserContactTel;
+	}
+
+	public void setGarUserContactTel(String garUserContactTel) {
+		this.garUserContactTel = garUserContactTel;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+    
+    
 }
@@ -130,4 +130,82 @@ public class GarUser implements Serializable {
         return sb.toString();
     }
+	public String getGarUserId() {
+		return garUserId;
+	}
+
+	public void setGarUserId(String garUserId) {
+		this.garUserId = garUserId;
+	}
+
+	public String getGarUserTel() {
+		return garUserTel;
+	}
+
+	public void setGarUserTel(String garUserTel) {
+		this.garUserTel = garUserTel;
+	}
+
+	public String getGarUserName() {
+		return garUserName;
+	}
+
+	public void setGarUserName(String garUserName) {
+		this.garUserName = garUserName;
+	}
+
+	public String getGarUserType() {
+		return garUserType;
+	}
+
+	public void setGarUserType(String garUserType) {
+		this.garUserType = garUserType;
+	}
+
+	public String getGarUserCarNum() {
+		return garUserCarNum;
+	}
+
+	public void setGarUserCarNum(String garUserCarNum) {
+		this.garUserCarNum = garUserCarNum;
+	}
+
+	public Integer getGarUserDelFlag() {
+		return garUserDelFlag;
+	}
+
+	public void setGarUserDelFlag(Integer garUserDelFlag) {
+		this.garUserDelFlag = garUserDelFlag;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+    
+    
+
 }
 \ No newline at end of file
@@ -231,6 +231,39 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         return new String(cipher.doFinal(encrypData), "UTF-8");
     }
+	public WxConfig getWxConfig() {
+		return wxConfig;
+	}
+
+	public void setWxConfig(WxConfig wxConfig) {
+		this.wxConfig = wxConfig;
+	}
+
+	public GarAddressService getGarAddressService() {
+		return garAddressService;
+	}
+
+	public void setGarAddressService(GarAddressService garAddressService) {
+		this.garAddressService = garAddressService;
+	}
+
+	public RedisCache getRedisCache() {
+		return redisCache;
+	}
+
+	public void setRedisCache(RedisCache redisCache) {
+		this.redisCache = redisCache;
+	}
+
+	public TokenService getTokenService() {
+		return tokenService;
+	}
+
+	public void setTokenService(TokenService tokenService) {
+		this.tokenService = tokenService;
+	}
+
+    
 }
@@ -46,7 +46,7 @@ public class JwtUtils {
                     .parseClaimsJws(token);
             claims = claimsJws.getBody();
         } catch (Exception e) {
-            log.info("token:{}，反解析报错：{}",token,e.getMessage());
+            
             return null;
         }
         return (String)claims.get("userId");
@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,8 @@ import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ISupervisionTrackService;
 import com.trash.business.service.ITruckActivateService;
 import com.trash.business.service.ITruckCreditService;
+import com.trash.caseOffline.domain.CaseOffline;
+import com.trash.caseOffline.mapper.CaseOfflineMapper;
 import com.trash.casefile.domain.KafkaCompensation;
 import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.kafka.Consumer;
@@ -46,7 +49,9 @@ import com.trash.common.utils.LogUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.spring.SpringUtils;
+import com.trash.office.domain.LogisticsManagement;
 import com.trash.office.domain.UploadFile;
+import com.trash.office.mapper.LogisticsManagementMapper;
 import com.trash.office.mapper.UploadFileMapper;
 import com.trash.workflow.service.IWorkflowService;
@@ -73,6 +78,10 @@ public class DriverTask {
 		JSONArray array = RemoteServerUtils.getCaseList();
+		Map map = new HashMap<>();
+		List<String> ids = new ArrayList<String>();
+		
+		
 		if(array != null && array.size() > 0){
 			for(Object object:array){
 				JSONObject json = (JSONObject) object;
@@ -97,12 +106,21 @@ public class DriverTask {
 					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);
+			
 		}
@@ -157,7 +175,105 @@ public class DriverTask {
 			paramsMap.put("type_" + i + "_season", arr[i * 3 + 1]);
 			paramsMap.put("type_" + i + "_pect", arr[i * 3 + 2]);
 		}
-
+		
+		try{
+
+			int type = 5;
+			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);
+			
+			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")  ? "物品申请" : "采购申请");
+				
+				insertData(l.getId() + "", title, type, "综合管理部", l.getDeptName());
+			}
+			
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		try{
+
+			int type = 6;
+			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){
+				insertData(l.getId() + "", "电子交办案卷:" + l.getSiteName(), type, "治理事务部", l.getLocationDec());
+			}
+			
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		try{
+
+			int type = 7;
+			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);
+			
+			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){
+				insertData(l.getId() + "", "违规案卷:" + l.getProjectName(), type, "科技信息部", l.getOwningRegion());
+			}
+			
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		
+		
 		JSONArray areas = redisCache.getCacheObject("areaList");
 		Gson g = new Gson();
@@ -261,12 +377,39 @@ 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);
+		
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try{
+			list = list.parallelStream().filter(p->{
+				if(p.getString("createAt") == null)
+					return false;
+				try {
+					return d.getTime() < simpleDateFormat.parse(p.getString("createAt")).getTime();
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return false;
+				}).collect(Collectors.toList());
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+			
 		Collections.shuffle(list);
 		double pect = Double.parseDouble(paramsMap.get("type_" + type + "_pect")) / 100;
@@ -6,3 +6,11 @@ export function historyFromData(instanceId) {
     method: 'get'
   })
 }
+
+export function historyFromDataByTime(data) {
+  return request({
+    url: '/historyFromData/historyFromDataByTime',
+    method: 'post',
+    data:data
+  })
+}
@@ -189,20 +189,6 @@ export default {
           return;
         }
-        if (this.definitionKey.indexOf("supervision") > -1) {
-          const params = {
-            id: row.businessKey.split(":")[1],
-          }
-          getSupervision(params).then(res => {
-            if (res.result == null) {
-              this.$message.error("获取纪检督察详情失败！请重试")
-              return;
-            }
-            this.supervisionData = res.result;
-            this.supervisionOpen = true;
-          })
-          return;
-        }
           if(this.definitionKey == "workflow_company"){
             this.company = true;
@@ -216,7 +202,35 @@ export default {
             this.driver = true;
             return;
           }
+          if (this.definitionKey.indexOf("supervision") > -1) {
+            getTrack(row.businessKey.split(":")[1]).then(res => {
+              this.businessKey  = res.data.objectId;
+
+              if(res.data.type == 0){
+                this.construct = true;
+              }else if(res.data.type == 1){
+                this.earthsites = true;
+              }else if(res.data.type == 2){
+                this.company = true;
+              }else if(res.data.type == 3){
+                this.contract = true;
+              }else if(res.data.type == 4){
+                this.vehicle = true;
+              }else if(type == 5){
+                this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
+                this.logisticsInfoOpen = true;
+              }else if(type == 6){
+                this.caseOffline = true;
+                return;
+              }else if(type == 7){
+                this.violationCaseFile = true;
+                this.videoSrc1 = [];
+                this.slides1 = [];
+              }
+            })
+            return;
+          }
       },
     },
   }
@@ -10,6 +10,7 @@ import {activeThreestep} from &quot;@/api/business/threestep&quot;;
 import {getToken} from "@/utils/auth";
 import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
 import {updateHandleAffairs} from "@/api/office/handle";
+import { listTrack, getTrack} from "@/api/business/track";
 export default {
     methods: {
@@ -275,17 +276,31 @@ export default {
             return;
           }
           if (this.definitionKey.indexOf("supervision") > -1) {
-            console.log(row)
-            const params = {
-              id: row.businessKey.split(":")[1],
-            }
-            getSupervision(params).then(res => {
-              if (res.result == null) {
-                this.$message.error("获取纪检督察详情失败！请重试")
+            getTrack(row.businessKey.split(":")[1]).then(res => {
+              this.businessKey  = res.data.objectId;
+
+              if(res.data.type == 0){
+                this.construct = true;
+              }else if(res.data.type == 1){
+                this.earthsites = true;
+              }else if(res.data.type == 2){
+                this.company = true;
+              }else if(res.data.type == 3){
+                this.contract = true;
+              }else if(res.data.type == 4){
+                this.vehicle = true;
+              }else if(type == 5){
+                this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
+                this.logisticsInfoOpen = true;
+              }else if(type == 6){
+                this.caseOffline = true;
                 return;
+              }else if(type == 7){
+                this.violationCaseFile = true;
+                this.videoSrc1 = [];
+                this.slides1 = [];
               }
-              this.supervisionData = res.result;
-              this.supervisionOpen = true;
+
             })
             return;
           }
@@ -524,7 +539,7 @@ export default {
           this.definitionKey == "workflow_vehicle" ||
           this.definitionKey == "workflow_earthsites" ||
           this.definitionKey == "workflow_conract" ||
-          this.definitionKey == "workflow_constructsite_edit" || 
+          this.definitionKey == "workflow_constructsite_edit" ||
           this.definitionKey == "workflow_earthsites_edit") {
           formDataSave(this.id, this.form.formData).then(response => {
             this.msgSuccess("审批成功");
-import { listTrack, getTrack, delTrack, addTrack, updateTrack, exportTrack,getSettings,saveSettings } from "@/api/business/track";
+import {
+  listTrack,
+  getTrack,
+  delTrack,
+  addTrack,
+  updateTrack,
+  exportTrack,
+  getSettings,
+  saveSettings
+} from "@/api/business/track";
+import companyInfo from "@/views/activiti/task/companyInfo";
-  import companyInfo from "@/views/activiti/task/companyInfo";
+import logisticsInfo from "@/views/office/logistics/logisticsInfo";
+
+import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+
+import {historyFromDataByTime} from '@/api/activiti/historyFormdata'
 export default {
   name: "Track",
-
   components: {
     companyInfo,
+    logisticsInfo,
+    violationCaseFileInfo,
+    caseOfflineInfo
   },
   data() {
     return {
@@ -29,7 +46,11 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      settings:null,
+      info0: false,
+      info1: false,
+      info2: false,
+      info3: false,
+      settings: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -39,67 +60,172 @@ export default {
         place: null,
         status: null,
         objectId: null,
-        type:0
+        type: 0
       },
       // 表单参数
       form: {},
-      activeIndex:"0",
+      activeIndex: "0",
       // 表单校验
       rules: {
-        type: [
-          { required: true, message: "类型不能为空", trigger: "change" }
-        ],
+        type: [{
+          required: true,
+          message: "类型不能为空",
+          trigger: "change"
+        }],
       },
-      settingsOpen:false,
-      infoDialog:false,
-      objectId:null,
-      objectType:null,
-      id:null,
+      settingsOpen: false,
+      infoDialog: false,
+      objectId: null,
+      objectType: null,
+      id: null,
+      object:null,
+      tableShow:false,
+      formData:null,
+      errorDialog:false,
+      errorTableShow:false,
+      workflowType: [
+        "supervision-gongdi",
+        "supervision_xnc",
+        "supervision_company",
+        "supervision_contract",
+        "supervision_company",
+        "supervision_contract",
+        "supervision_anjuan",
+        "supervision_casefile"
+      ],
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    getInfo(type,objectId,id){
+    printBody(tag){
+
+      let body = document.body;
+
+      document.body.innerHTML = document.getElementById(tag).innerHTML;
+
+      window.print();
+
+      window.location.reload();
+    },
+
+    showErrorTable(obj){
+      this.object = obj;
+
+
+      let data = {
+        createTime:obj.createTime,
+        updateTime:obj.updateTime,
+        businessKey:this.workflowType[obj.type] +":"+obj.id,
+      }
+
+      historyFromDataByTime(data).then(res=>{
+        this.formData = res.data;
+
+        this.errorTableShow = true;
+      });
+
+    },
+    showTable(obj){
+      this.object = obj;
+      let data = {
+        createTime:obj.createTime,
+        updateTime:obj.updateTime,
+        businessKey:"workflow_supervision:" + obj.id
+      }
+
+      historyFromDataByTime(data).then(res=>{
+        this.formData = res.data;
+        this.tableShow = true;
+      });
+    },
+    getInfo(type, objectId, id,obj) {
+      this.object = obj;
       this.objectId = objectId;
       this.id = id;
+      this.infoDialog = true;
-      if(type == 0){
+      if (type == 0) {
         this.objectType = 2;
-        this.infoDialog = true;
-      }else if(type == 1){
-          this.objectType = 3;
-          this.infoDialog = true;
-      }else if(type == 2){
-          this.objectType = 0;
-          this.infoDialog = true;
-      }else if(type == 3){
-          this.objectType = 4;
-          this.infoDialog = true;
-      }else if(type == 4){
-          this.objectType = 1;
-          this.infoDialog = true;
-      }else if(type == 5){
-      }else if(type == 6){
-      }else if(type == 7){
+        this.info0 = true;
+      } else if (type == 1) {
+        this.objectType = 3;
+        this.info0 = true;
+      } else if (type == 2) {
+        this.objectType = 0;
+        this.info0 = true;
+      } else if (type == 3) {
+        this.objectType = 4;
+        this.info0 = true;
+      } else if (type == 4) {
+        this.objectType = 1;
+        this.info0 = true;
+      } else if (type == 5) {
+        this.info1 = true;
+      } else if (type == 6) {
+
+        this.info2 = true;
+      } else if (type == 7) {
+        this.info3 = true;
+
+      }
+
+    },
+    getStatusName(value){
+      if(value == 0){
+        return "已提交";
+      }else if(value == 1){
+        return "通过";
+      }else if(value == 2){
+        return "审批驳回";
+      }else if(value == 3){
+        return "督办中";
+      }else if(value == 4){
+        return "已回复";
+      }else if(value == 5){
+        return "督办异常-驳回";
       }
+    },
+    dialogClose() {
+
+      this.infoDialog = false;
+      this.info0 = false;
+      this.info1 = false;
+      this.info2 = false;
+      this.info3 = false;
+      this.getList();
     },
-    update(state){
-      updateTrack({id:this.id,status:state}).then(res=>{
-        console.log(res);
+    update(state) {
+      let data = {
+        id: this.id,
+        status: state
+      };
+      if(state == 3){
+        data.title = this.form.title;
+        data.endTime = this.form.endTime;
+      }
+
+      updateTrack(data).then(res => {
+        if (res.code == 200) {
+          this.$message(res.message);
+          this.infoDialog = false;
+          this.errorDialog = false;
+
+          this.getList();
+        }
       });
     },
-    saveSettings(){
-      saveSettings(this.settings).then(res=>{
-          if(res.code==200){
+    saveSettings() {
+      saveSettings(this.settings).then(res => {
+        if (res.code == 200) {
-            this.$message("保存成功");
-          }
-          this.settingsOpen = false;
+          this.$message("保存成功");
+        }
+        this.settingsOpen = false;
       });
     },
     /** 查询跟踪监督列表 */
@@ -145,8 +271,8 @@ export default {
       this.handleQuery();
     },
-    handleSelect(value){
-      if(value == 99){
+    handleSelect(value) {
+      if (value == 99) {
         getSettings().then(response => {
           this.settings = response.data;
           this.settingsOpen = true;
@@ -163,7 +289,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -206,28 +332,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除跟踪监督编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delTrack(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delTrack(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有跟踪监督数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportTrack(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportTrack(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     }
   }
 };
@@ -48,7 +48,7 @@ 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.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
+          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1) {
             this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
           }
           if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
@@ -62,15 +62,7 @@ export default {
             historyFromData("workflow_casefile" + ":" + id).then(response => {
                 let newRep = [];
-                if(response.data.length - array.length == 2){
-                  let obj = response.data[response.data.length -1];
-                  let data  = {
-                    reply:obj.controlValue,
-                    replyPeople:obj.createBy,
-                    replyTime:obj.createTime
-                  };
-                    newRep.push(data);
-                }
+
                 let obj = response.data[0];
@@ -80,7 +72,7 @@ export default {
                    replyPeople:obj.createBy,
                    replyTime:obj.createTime
                  };
-                 
+
                  newRep.push(data);
                }
@@ -88,7 +80,15 @@ export default {
                     newRep.push(array[j]);
                 }
-
+                if(response.data.length - array.length == 2){
+                  let obj = response.data[response.data.length -1];
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                    newRep.push(data);
+                }
                 this.replyApprovalProcessList = newRep;
                 this.$forceUpdate();
@@ -105,7 +105,15 @@ export default {
       const a = document.createElement('a')
       a.setAttribute('download', name)
       a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+
+      if(url.startsWith("http")){
+
+        a.setAttribute('href', url);
+      }else{
+
+        a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      }
+
       a.click()
     },
     openImage(path) {
@@ -117,6 +125,11 @@ export default {
       }
     },
     downloadFile(path) {
+      debugger;
+      if(path.startsWith("http")){
+        window.location.href = path;
+        return;
+      }
       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
     },
     showFile(path) {
@@ -62,16 +62,7 @@ export default {
             historyFromData("violation_warning" + ":" + id).then(response => {
                 let newRep = [];
-                if(response.data.length - array.length == 2){
-                  let obj = response.data[response.data.length -1];
-                  let data  = {
-                    reply:obj.controlValue,
-                    replyPeople:obj.createBy,
-                    replyTime:obj.createTime
-                  };
-                    newRep.push(data);
-                }
-                
+
                 let obj = response.data[0];
                 if(obj){
                   let data  = {
@@ -87,7 +78,16 @@ export default {
                 for(let j in array){
                     newRep.push(array[j]);
                 }
-
+                if(response.data.length - array.length == 2){
+                  let obj = response.data[response.data.length -1];
+                  let data  = {
+                    reply:obj.controlValue,
+                    replyPeople:obj.createBy,
+                    replyTime:obj.createTime
+                  };
+                    newRep.push(data);
+                }
+                
                 this.replyApprovalProcessList = newRep;
                 this.$forceUpdate();
             });
@@ -89,7 +89,7 @@
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="督查事项" align="center" prop="title">
         <template slot-scope="scope">
-            <a @click="getInfo(scope.row.type,scope.row.objectId,scope.row.id);">{{ (scope.row.title)}}</a>
+            <a @click="getInfo(scope.row.type,scope.row.objectId,scope.row.id,scope.row);">{{ (scope.row.title)}}</a>
           </template>
         </el-table-column>
       <el-table-column label="所属区域" align="center" prop="place" />
@@ -105,7 +105,15 @@
       </el-table-column>
       <el-table-column label="督察结果" align="center" prop="status" >
         <template slot-scope="scope">
-            <span>{{ (scope.row.status == 1 ? "审批通过" : "")}}</span>
+            <span>
+              {{ getStatusName(scope.row.status)}}
+            </span>
+
+            <el-button v-if="scope.row.status == 1" @click="showTable(scope.row)">督查情况表</el-button>
+
+            <el-button v-if="scope.row.status == 4" @click="showErrorTable(scope.row)">整改交办单</el-button>
+
+
           </template>
         </el-table-column>
     </el-table>
@@ -117,13 +125,112 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <el-dialog title="" :visible.sync="tableShow" width="800px" append-to-body v-if="formData && tableShow" >
+      <el-button @click="printBody('table');" :style="{'display':hide}">打印</el-button>
+
+      <div id="table">
+        <el-row class="bd_bottom bd_top" >
+          <el-col :span="24" class="bd_left bd_right bd_padding" style="text-align: center;font-weight: bold;">督查情况表</el-col>
+        </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">督查情况</el-col>
+            <el-col :span="18" class="bd_right bd_padding">{{formData[0].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">督查人员</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[0].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding ">督查时间</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{object.createTime}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">领导意见</el-col>
+            <el-col :span="18" class="bd_right bd_padding bd_right ">{{formData[1].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">领导签名</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[1].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding">时间</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{object.updateTime}}</el-col>
+          </el-row>
+        </div>
+    </el-dialog>
+
+    <el-dialog title="详情" :visible.sync="infoDialog" width="1500px" append-to-body  :before-close="dialogClose">
+      <companyInfo :businessKey="objectId" :businessType="objectType" v-if="info0"/>
+        <logisticsInfo :idInfo="objectId" v-if="info1"/>
+        <caseOfflineInfo :businessKey="objectId" v-if="info2"/>
+        <violationCaseFileInfo :idInfo="objectId" v-if="info3" />
+
+
+      <div slot="footer" class="dialog-footer" v-if="object">
+        <el-button type="success" @click="update(0)" :disabled="object.status != -1 && object.status != 2 && object.status != 5">督察通过</el-button>
+        <el-button type="danger" @click="errorDialog = true;" :disabled="object.status != -1 && object.status != 2 && object.status != 5">督察异常</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="" :visible.sync="errorTableShow" width="800px" append-to-body v-if="formData && errorTableShow" >
+      <el-button @click="printBody('table1');" :style="{'display':hide}">打印</el-button>
-    <el-dialog title="详情" :visible.sync="infoDialog" width="1500px" append-to-body>
-      <companyInfo :businessKey="objectId" :businessType="objectType" v-if="infoDialog"/>
+      <div id="table1">
+          <el-row class="bd_bottom bd_top" >
+            <el-col :span="24" class="bd_left bd_right bd_padding" style="text-align: center;font-weight: bold;">整改交办单</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">督查情况</el-col>
+            <el-col :span="18" class="bd_right bd_padding">{{formData[0].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">责任部门</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[0].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding ">回复期限</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[0].controlValue.split("回复期限：")[1]}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">部门处理回复</el-col>
+            <el-col :span="18" class="bd_right bd_padding bd_right ">{{formData[1].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">部门负责人</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[1].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding">回复时间</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[1].createTime}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">纪检意见</el-col>
+            <el-col :span="18" class="bd_right bd_padding bd_right ">{{formData[2].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">纪检人员</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[2].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding">时间</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[2].createTime}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">领导意见</el-col>
+            <el-col :span="18" class="bd_right bd_padding bd_right ">{{formData[3].controlValue}}</el-col>
+          </el-row>
+          <el-row class="bd_bottom" >
+            <el-col :span="6" class="bd_left bd_right bd_padding">领导签名</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[3].createBy}}</el-col>
+            <el-col :span="6" class="bd_right bd_padding">时间</el-col>
+            <el-col :span="6" class="bd_right bd_padding">{{formData[3].createTime}}</el-col>
+          </el-row>
+        </div>
+    </el-dialog>
+
+
+    <el-dialog title="纪检异常交办" :visible.sync="errorDialog"  width="500px" append-to-body v-loading="loading">
+
+          <el-input type="textarea" rows="4" v-model="form.title" placeholder="交办缘由" />
+
+          <el-input v-model="form.endTime" placeholder="天" type="number"
+              oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=1){value=1} if(value>365){value=365}"/>
+
+      </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" @click="update(0)">督察通过</el-button>
-        <el-button type="danger" @click="update(3)">督察异常</el-button>
+        <el-button type="primary" @click="update(3)">保存</el-button>
+        <el-button @click="errorDialog = false;">退出</el-button>
       </div>
     </el-dialog>
@@ -329,3 +436,26 @@
 <script src="../../../api/track.js" />
+
+<style>
+  .bd_padding{
+    font-size: 14px;
+    padding:10px;
+  }
+
+  .bd_right {
+    border-right: 1px solid black;
+  }
+
+  .bd_left {
+    border-left: 1px solid black;
+  }
+
+  .bd_top {
+    border-top: 1px solid black;
+  }
+
+  .bd_bottom {
+    border-bottom: 1px solid black;
+  }
+</style>
@@ -8,7 +8,7 @@ function resolve(dir) {
 const name = defaultSettings.title || 'WorkFlowSystem' // 标题
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 8081 // 端口
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -43,7 +43,21 @@ public class SupervisionTrack extends BaseEntity
     /** 基础数据ID */
     @Excel(name = "基础数据ID")
     private String objectId;
+    
+    String endTime;
+    @Override
+    public String getEndTime() {
+    	// TODO Auto-generated method stub
+    	return super.getEndTime();
+    }
+    
+    @Override
+    public void setEndTime(String endTime) {
+    	// TODO Auto-generated method stub
+    	super.setEndTime(endTime);
+    }
+    
     public void setId(Long id) 
     {
         this.id = id;
@@ -144,33 +144,35 @@ public class SupervisionTrackServiceImpl implements ISupervisionTrackService
     	int i = supervisionTrackMapper.updateSupervisionTrack(supervisionTrack);
     	if(i == 1){
-    		supervisionTrack = supervisionTrackMapper.selectSupervisionTrackById(supervisionTrack.getId());
+    		SupervisionTrack st = supervisionTrackMapper.selectSupervisionTrackById(supervisionTrack.getId());
 			Map data = new HashMap<>();
-			data.put("id", supervisionTrack.getId() + "");
+			data.put("id", st.getId() + "");
     		if(supervisionTrack.getStatus() == 0){
         		map.put("type", workflow_supervision);
         		data.put("startTime", sdf.format(new Date()));
         		data.put("endTime", data.get("startTime"));
         		data.put("type", "督查通过");
-        		data.put("title", "督查通过:" + supervisionTrack.getTitle());
-        		data.put("reason", "督查通过:" + supervisionTrack.getTitle());
+        		
+        		
+        		data.put("title", st.getTitle() + ",督查通过");
+        		data.put("reason", st.getTitle()+ ",督查通过");
     		}else{
-    			map.put("type", workflow[supervisionTrack.getType()]);
+    			map.put("type", workflow[st.getType()]);
         		Date date = new Date();
         		data.put("startTime", sdf.format(date));
-        		date.setDate(date.getDate() + Integer.parseInt(getTimeOutParams()[supervisionTrack.getType()*3]));
+        		date.setDate(date.getDate() + Integer.parseInt(supervisionTrack.getEndTime()));
         		data.put("type", "督查异常");
         		data.put("endTime", sdf.format(date));
-        		data.put("title", "督查异常:" + supervisionTrack.getTitle());
-        		data.put("reason", "督查异常:" + supervisionTrack.getTitle());
+        		data.put("title", st.getTitle() + ",督查异常" );
+        		data.put("reason", "交办缘由："+supervisionTrack.getTitle()+" 回复期限："+supervisionTrack.getEndTime()+"天");
     		}
@@ -52,8 +52,8 @@ public class ViolationCaseFileController extends BaseController {
 	@GetMapping("/list")
 	public TableDataInfo list(ViolationCaseFile violationCaseFile) {
 		startPage();
-
-		return getDataTable(violationCaseFileService.selectViolationCaseFileList(violationCaseFile));
+		List<ViolationCaseFile> list =  violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
+		return getDataTable(list);
 	}
 	/**
@@ -65,7 +65,7 @@ public class ViolationCaseFileController extends BaseController {
 		List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
 		for (int i = 0; i < list.size(); i++) {
-			list.get(i).setId((long) i + 1);
+			list.get(i).setId((i + 1)+"");
 		}
 		ExcelUtil<ViolationCaseFile> util = new ExcelUtil<ViolationCaseFile>(ViolationCaseFile.class);
 		return util.exportExcel(list, "平台违规案卷数据");
@@ -75,7 +75,7 @@ public class ViolationCaseFileController extends BaseController {
 	 * 获取平台违规案卷详细信息
 	 */
 	@GetMapping(value = "/{id}")
-	public AjaxResult getInfo(@PathVariable("id") Long id) {
+	public AjaxResult getInfo(@PathVariable("id") String id) {
 		return AjaxResult.success(violationCaseFileService.selectViolationCaseFileById(id));
 	}
@@ -87,7 +87,13 @@ public class ViolationCaseFileController extends BaseController {
 	@RepeatSubmit
 	public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationCaseFile violationCaseFile)
 			throws IOException {
-		return toAjax(violationCaseFileService.insertViolationCaseFile(files, violationCaseFile));
+		
+		
+		int i = violationCaseFileService.insertViolationCaseFile(files, violationCaseFile);
+		if(i==2){
+			return AjaxResult.error("上报综管失败");
+		}
+		return toAjax(i);
 	}
 	/**
@@ -191,7 +197,7 @@ public class ViolationCaseFileController extends BaseController {
 	 */
 	@Log(title = "平台违规案卷", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-	public AjaxResult remove(@PathVariable Long[] ids) throws IOException {
+	public AjaxResult remove(@PathVariable String[] ids) throws IOException {
 		return toAjax(violationCaseFileService.deleteViolationCaseFileByIds(ids));
 	}
 }
@@ -24,7 +24,7 @@ public class ViolationCaseFile extends BaseEntity
     /** $column.columnComment */
     @Excel(name = "序号")
-    private Long id;
+    private String id;
     /** 案卷编号 */
     private String number;
@@ -96,18 +96,14 @@ public class ViolationCaseFile extends BaseEntity
     }
     public ViolationCaseFile(JSONObject json) {
-    	this.id = json.getLong("taskId");
+    	this.id = json.getString("taskId");
     	this.number = json.getString("evtId");
     	this.setCreateBy(json.getString("reporter"));
-    	SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
-
-    	try {
-			this.createTime = sdf.parse(json.getString("reportTime"));
-		} catch (ParseException e) {
-			this.createTime = new Date();
-			e.printStackTrace();
-		}
+    	Date d = new Date(json.getString("reportTime"));
+    	
+		this.createTime = d;
+
     	this.projectName = json.getString("caseClassName");
@@ -117,7 +113,6 @@ public class ViolationCaseFile extends BaseEntity
     	this.needUpload = 1;
-    	
 	}
 	public short getNeedUpload() {
@@ -172,12 +167,12 @@ public class ViolationCaseFile extends BaseEntity
         this.abbreviation = abbreviation;
     }
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }
-    public Long getId() 
+    public String getId() 
     {
         return id;
     }
@@ -18,7 +18,7 @@ public interface ViolationCaseFileMapper
      * @param id 平台违规案卷ID
      * @return 平台违规案卷
      */
-        ViolationCaseFile selectViolationCaseFileById(Long id);
+        ViolationCaseFile selectViolationCaseFileById(String id);
     /**
      * 查询平台违规案卷列表
@@ -52,7 +52,7 @@ public interface ViolationCaseFileMapper
      * @param id 平台违规案卷ID
      * @return 结果
      */
-    int deleteViolationCaseFileById(Long id);
+    int deleteViolationCaseFileById(String id);
     /**
      * 批量删除平台违规案卷
@@ -60,6 +60,6 @@ public interface ViolationCaseFileMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    int deleteViolationCaseFileByIds(Long[] ids);
+    int deleteViolationCaseFileByIds(String[] ids);
 }
@@ -20,7 +20,7 @@ public interface IViolationCaseFileService
      * @param id 平台违规案卷ID
      * @return 平台违规案卷
      */
-    ViolationCaseFileVo selectViolationCaseFileById(Long id);
+    ViolationCaseFileVo selectViolationCaseFileById(String id);
     /**
      * 查询平台违规案卷列表
@@ -54,7 +54,7 @@ public interface IViolationCaseFileService
      * @param ids 需要删除的平台违规案卷ID
      * @return 结果
      */
-    int deleteViolationCaseFileByIds(Long[] ids) throws IOException;
+    int deleteViolationCaseFileByIds(String[] ids) throws IOException;
     /**
      * 删除平台违规案卷信息
@@ -62,7 +62,7 @@ public interface IViolationCaseFileService
      * @param id 平台违规案卷ID
      * @return 结果
      */
-    int deleteViolationCaseFileById(Long id);
+    int deleteViolationCaseFileById(String id);
 	void updateViolationCaseFile(ViolationCaseFile caseOffline);
 }
@@ -2,27 +2,29 @@ package com.trash.casefile.service.impl;
 import java.io.IOException;
 import java.sql.Date;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.trash.common.core.redis.RedisCache;
-import com.trash.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.casefile.domain.ViolationCaseFile;
-import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.casefile.domain.vo.ViolationCaseFileVo;
 import com.trash.casefile.mapper.ViolationCaseFileMapper;
 import com.trash.casefile.service.IViolationCaseFileService;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.UploadFileMapper;
@@ -54,7 +56,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
      * @return 平台违规案卷
      */
     @Override
-    public ViolationCaseFileVo selectViolationCaseFileById(Long id)
+    public ViolationCaseFileVo selectViolationCaseFileById(String id)
     {
         ViolationCaseFileVo violationCaseFileVo = new ViolationCaseFileVo();
         violationCaseFileVo.setViolationCaseFile(violationCaseFileMapper.selectViolationCaseFileById(id));
@@ -190,22 +192,91 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
             }
         }
-        System.out.print(violationCaseFile.getViolationObjectType().equals("2"));
         if(violationCaseFile.getViolationObjectType().equals("2")) {
         	violationCaseFile.setProjectName(violationCaseFile.getCompanyName());
         }
         Integer result = violationCaseFileMapper.insertViolationCaseFile(violationCaseFile);
+        
+        List<Map<String,String>> upfiles = new ArrayList();
         //文件上传
         for (MultipartFile file : files) {
             UploadFile uploadFile = new UploadFile();
             uploadFile.setTableName("violation_case_file");
             uploadFile.setTableNumber(violationCaseFile.getId().toString());
             uploadFile.setFileName(file.getOriginalFilename());
-            uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
+            String path = FileUploadUtils.uploadFile(file);
+            uploadFile.setFilePath(path);
             uploadFileMapper.insertUploadFile(uploadFile);
+            
+            
+           if(violationCaseFile.getNeedUpload() == 1){
+        	   Map map = new HashMap();
+        	   
+        	   if(file.getOriginalFilename().toUpperCase().endsWith("JPG")
+        			   || file.getOriginalFilename().toUpperCase().endsWith("PNG") 
+        			   || file.getOriginalFilename().toUpperCase().endsWith("JPEG")){
+            	   map.put("attchType", 0);
+        	   }else if(file.getOriginalFilename().toUpperCase().endsWith("MP3")){
+            	   map.put("attchType", 1);
+        	   }else if(file.getOriginalFilename().toUpperCase().endsWith("MP4") || file.getOriginalFilename().toUpperCase().endsWith("AVI")){
+            	   map.put("attchType", 2);
+        	   }
+        	   
+        	   map.put("attchFileName", file.getOriginalFilename());
+        	   map.put("attchFilePath", "http://101.95.0.106:10001/workflow" + path);
+        	   
+        	  
+        	   upfiles.add(map);
+        	   
+           }
+            
         }
+        if(violationCaseFile.getNeedUpload() == 1){
+
+        	Map params = new HashMap<>();
+
+        	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        		
+        	
+        	JSONArray array = RemoteServerUtils.getUpArea();
+        	
+        	for(Object object:array){
+        		JSONObject json = (JSONObject) object;
+        		
+        		if(json.getString("areaName").equals(violationCaseFile.getOwningRegion())){
+
+                	params.put("areaCode",json.getString("areaCode"));
+                	break;
+        		}
+        		
+        	}
+        	
+
+        	JSONObject classObj = RemoteServerUtils.getUpClass();
+        	
+        	
+        	params.put("areaName",violationCaseFile.getOwningRegion());
+        	params.put("caseSource","01");
+        	params.put("caseClassId","1712034951982526466");
+        	params.put("position","未填写");
+        	params.put("questionDesc",violationCaseFile.getDescribe());
+        	params.put("reportTime",sdf.format(new java.util.Date()));
+        	params.put("reporter",SecurityUtils.getUsername());
+        	params.put("thirdCaseId",violationCaseFile.getId());
+        	params.put("geoX",0);
+        	params.put("geoY",0);
+        	params.put("attchList",upfiles);
+        	if(!RemoteServerUtils.insertUpCase(params)){
+            		violationCaseFileMapper.deleteViolationCaseFileById(violationCaseFile.getId());
+            		return 2;
+        	}
+        	
+            return result;
+        }
+        
+        
         int i = 0;
         //根据发送对象判断流程
         if(violationCaseFile.getSendObject().equals("区管理部门")){
@@ -220,6 +291,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
             i = 2;
         }
+
         WorkflowService.createCaseFile(violationCaseFile,i);
         return result;
@@ -286,7 +358,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
      * @return 结果
      */
     @Override
-    public int deleteViolationCaseFileByIds(Long[] ids) throws IOException
+    public int deleteViolationCaseFileByIds(String[] ids) throws IOException
     {
         return violationCaseFileMapper.deleteViolationCaseFileByIds(ids);
     }
@@ -298,7 +370,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
      * @return 结果
      */
     @Override
-    public int deleteViolationCaseFileById(Long id)
+    public int deleteViolationCaseFileById(String id)
     {
         return violationCaseFileMapper.deleteViolationCaseFileById(id);
     }
 package com.trash.workflow.listener;
+import com.trash.business.domain.SupervisionTrack;
+import com.trash.business.mapper.SupervisionTrackMapper;
+import com.trash.casefile.service.IViolationCaseFileService;
 import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.workflow.service.IWorkflowService;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
@@ -8,6 +12,7 @@ import org.activiti.engine.delegate.Expression;
 import org.springframework.beans.factory.annotation.Autowired;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,25 +31,17 @@ public class SupervisionListener implements ExecutionListener {
     	List<Map> maps = new ArrayList<Map>();
-    	Map<String,Object> map = new HashMap<>();
+
+    	SupervisionTrack supervisionTrack = new SupervisionTrack();
-    	map.put("id", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
-    	map.put("supervisionResult", 2);
-		if(delegateExecution.getProcessDefinitionId().contains("gongdi")){
-			map.put("type",0);
-		}else if(delegateExecution.getProcessInstanceBusinessKey().contains("xnc")){
-			map.put("type",1);
-		}else if (delegateExecution.getProcessInstanceBusinessKey().contains("anjuan")){//案卷暂时不用
-			map.put("type",3);
-		}else{
-			map.put("type",2);
-		}
-
-    	maps.add(map);
+    	supervisionTrack.setId(Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]));
+    	supervisionTrack.setStatus(Integer.parseInt(state.getValue(delegateExecution).toString()));
+    	supervisionTrack.setUpdateTime(new Date());
-    	Object obj = RemoteServerUtils.UpdateSupervisionStatus(maps);
+        SpringUtils.getBean(SupervisionTrackMapper.class).updateSupervisionTrack(supervisionTrack);
+
-        workflowUtils.sendDataToHisTory(delegateExecution, state,String.valueOf(obj));
+        workflowUtils.sendDataToHisTory(delegateExecution, state,null);
     	System.out.println("纪检督察流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey()  + "状态:" + state.getValue(delegateExecution).toString());
@@ -25,7 +25,7 @@ public class casefileListener implements ExecutionListener {
     	ViolationCaseFile caseOffline = new ViolationCaseFile();
-    	caseOffline.setId(Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]));
+    	caseOffline.setId(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
     	caseOffline.setStatus(Integer.parseInt(state.getValue(delegateExecution).toString()));
@@ -178,6 +178,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setState("0");
 			workflow.setCreateTime(new Date());
 			workflow.setCreateBy(user.getUserName());
+			workflow.setCreateName(user.getUserName());
 			awf = insertAwf(user,workflow);
@@ -200,7 +201,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		if(user == null){
 			user = new SysUser();
-			user.setUserName("定时器");
+			user.setUserName("长沙市建筑垃圾智慧监管平台");
 		}
 		ActWorkflowFormData awf;
@@ -72,17 +72,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <update id="updateSupervisionTrack" parameterType="SupervisionTrack">
         update supervision_track
         <trim prefix="SET" suffixOverrides=",">
-            <if test="type != null">type = #{type},</if>
-            <if test="title != null">title = #{title},</if>
-            <if test="dept != null">dept = #{dept},</if>
-            <if test="place != null">place = #{place},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="attach != null">attach = #{attach},</if>
             <if test="status != null">status = #{status},</if>
-            <if test="objectId != null">object_id = #{objectId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -43,6 +43,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			            #{name}
 			        </foreach>
 			</if>
+			
+            <if test="createTime != null "> and create_time > #{createTime}</if>
         </where>
     </select>
@@ -50,7 +50,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="receiveStatus != null "> and receive_status = #{receiveStatus}</if>
             <if test="readBy != null  and readBy != ''"> and read_by = #{readBy}</if>
             <if test="readTime != null "> and read_time = #{readTime}</if>
-            <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
+            <if test="createTime != null "> and create_time > #{createTime}</if>
             <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
             <if test="names != null "> 
             	and project_name in 
@@ -59,6 +59,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			        </foreach>
 			</if>
         </where>
+        or need_upload = 1
         order by create_time desc
     </select>
@@ -70,7 +71,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </where>
     </select>
-    <select id="selectViolationCaseFileById" parameterType="Long" resultMap="violationCaseFileResult">
+    <select id="selectViolationCaseFileById" parameterType="String" resultMap="violationCaseFileResult">
         <include refid="selectViolationCaseFileVo"/>
         where id = #{id}
     </select>
@@ -78,7 +79,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <insert id="insertViolationCaseFile" parameterType="ViolationCaseFile" useGeneratedKeys="true" keyProperty="id">
         insert into casefile_violation
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">`id`,</if>
+            <if test="id != null and id != ''">`id`,</if>
             create_time,
             <if test="number != null">`number`,</if>
             <if test="violationObjectType != null">violation_object_type,</if>
@@ -100,7 +101,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
+            <if test="id != null and id != ''">#{id},</if>
             now(),
             <if test="number != null">#{number},</if>
             <if test="violationObjectType != null">#{violationObjectType},</if>
@@ -118,7 +119,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readBy != null">#{readBy},</if>
             <if test="readTime != null">#{readTime},</if>
             <if test="abbreviation != null">#{abbreviation},</if>
-            <if test="needUpload != null">need_upload = #{needUpload},</if>
+            <if test="needUpload != null">#{needUpload},</if>
          </trim>
     </insert>
@@ -147,7 +148,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         where id = #{id}
     </update>
-    <delete id="deleteViolationCaseFileById" parameterType="Long">
+    <delete id="deleteViolationCaseFileById" parameterType="String">
         delete from casefile_violation where id = #{id}
     </delete>
@@ -45,6 +45,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="createTime != null "> and create_time > #{createTime}</if>
         </where>
     </select>