m

youxiw2000
1 parent 50dc34ad
Showing 24 changed files with 456 additions and 126 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/dist.zip
trash-ui/src/api/taskmethod.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/vio_casefile_info.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index4.vue → trash-ui/src/layout/index33.vue
trash-ui/src/main.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/h5/task/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
trash-workFlow/src/main/java/com/trash/business/mapper/TruckActivateMapper.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ReplyApprovalProcessServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/listener/casefileListener.java
@@ -875,6 +875,45 @@ public class RemoteServerUtils {
         return null;
 	}
+
+
+	public static boolean replyUpCase(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/handleResult").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 boolean insertUpCase(Map params) {
 		if(okHttpClient == null){
 			okHttpClient = new OkHttpClient.Builder()
@@ -18,7 +18,23 @@ public class OrderUpdateDto {
 	private String garReason;
-    /**
+    public Integer getGarCancelFlag() {
+		return garCancelFlag;
+	}
+
+	public void setGarCancelFlag(Integer garCancelFlag) {
+		this.garCancelFlag = garCancelFlag;
+	}
+
+	public String getGarReason() {
+		return garReason;
+	}
+
+	public void setGarReason(String garReason) {
+		this.garReason = garReason;
+	}
+
+	/**
      * 订单id
      */
     private String garOrderId;
@@ -106,6 +106,19 @@ public class DriverTask {
 					SpringUtils.getBean(ViolationCaseFileMapper.class).insertViolationCaseFile(caseFile);
+					
+					int i = 0;
+			        //根据发送对象判断流程
+			        if(caseFile.getSendObject().equals("区管理部门")){
+			        	
+			        	if(caseFile.getViolationGrade().equals("一般类")){
+			        		i = 1;
+			        	}else{
+			        		i = 2;
+			        	}
+			        }
+			        
+			        SpringUtils.getBean(IWorkflowService.class).createCaseFileByTask(caseFile,i);
 					ids.add(caseFile.getId());
@@ -474,6 +474,7 @@ export default {
         }
         if (this.definitionKey == "workflow_casefile") {
+          this.modalLoading = true;
           let postData = {};
           postData.tableName = this.businessKey;
@@ -498,6 +499,7 @@ export default {
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
               this.violationCaseFile = false;
+              this.modalLoading = false;
               this.getList();
             });
           });
@@ -23,6 +23,7 @@ export default {
   },
   data() {
     return {
+
       modalLoading:false,
       // 遮罩层
       loading: true,
@@ -124,7 +125,7 @@ export default {
       idInfo: null,
       openInfo: false,
       slide1: [],
-      videoSrc: []
+      videoSrc: [],
     };
   },
   watch: {
@@ -221,11 +222,11 @@ export default {
           this.$forceUpdate();
        });
     },
-    selectArea(item) {
+    // selectArea(item) {
-      this.form.owningRegion = item.name;
+    //   this.form.owningRegion = item.name;
-    },
+    // },
     /** 查询平台违规案卷列表 */
     getList() {
       this.loading = true;
-import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
+import {getViolationCaseFile,
+  updateViolationCaseFile} from "@/api/casefile/violationCaseFile";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
 import {historyFromData} from '@/api/activiti/historyFormdata'
@@ -34,6 +35,23 @@ export default {
     this.init();
   },
   methods: {
+    submit(){
+        let postData = {};
+
+        postData.tableName = "workflow_casefile:" + this.form.id;
+        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 => {
+            
+          })
+        });
+    },
     init() {
       let id = this.idInfo.split(":");
@@ -48,10 +66,10 @@ 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) {
+          if (item.name.indexOf(".jpg") > -1 || item.name.indexOf(".png") > -1 || item.name.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) {
+          if (item.name.indexOf(".mp4") > -1 || item.name.indexOf(".avi") > -1) {
             this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
           }
         })
 <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>
 <script>
 import RightPanel from '@/components/RightPanel'
-import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -52,56 +45,45 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
-
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
-.preview figure {
-  float: left;
-  width: 30%;
-  height: calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
 <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>
 <script>
 import RightPanel from '@/components/RightPanel'
+import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,45 +52,56 @@ export default {
 </script>
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height: calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
@@ -42,8 +42,8 @@ Vue.use(plugins)
 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
-Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
-// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
@@ -499,7 +499,10 @@
         <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
                    v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
         </el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+        <el-button type="primary"
+
+        v-loading.fullscreen.lock="modalLoading"
+        @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
       </div>
     </el-dialog>
@@ -685,6 +688,7 @@
     },
     data() {
       return {
+        modalLoading:false,
         id: '',
         definitionKey: '',
         businessKey: '',
@@ -22,7 +22,7 @@
           <el-option label="企业" value="2" />
         </el-select>
       </el-form-item>
-</el-row>
+    </el-row>
       <el-row>
       <el-form-item label="违规对象" prop="projectName">
         <el-input
@@ -95,7 +95,17 @@
       <el-table-column label="日期" align="center" prop="createTime">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template slot-scope="scope">
+
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['casefile:violationCaseFile:edit']"
+            v-if="!scope.row.status && scope.row.status!=0 && scope.row.needUpload == 1"
+          >综管数据补填</el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -151,8 +161,8 @@
         <el-row :gutter="2">
           <el-col :span="11">
             <el-form-item label="所属区域" prop="owningRegion">
-              <el-select v-model="form.place" placeholder="请输入所属区域" style="width: 100%;">
-                    <el-option  v-for="item in areas" :label="item.name" :value="item.code" @click.native="selectArea(item)"/>
+              <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;">
+                    <el-option  v-for="item in areas" :label="item.name" :value="item.name"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -506,7 +506,9 @@
     <div slot="footer" class="dialog-footer">
       <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
-      <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      <el-button type="primary"
+      v-loading.fullscreen.lock="modalLoading"
+      @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
     </div>
   </el-dialog>
@@ -695,7 +697,8 @@ export default {
     h5Page
   },
   data() {
-    return {
+    return {
+      modalLoading:false,
       id: '',
       definitionKey: '',
       businessKey: '',
@@ -63,7 +63,12 @@ public class TruckActivateController extends BaseController
      */
     @GetMapping("/list")
     public TableDataInfo list(TruckActivate truckActivate)
-    {
+    {	
+
+		List<String> tables = truckActivateMapper.getTables("truck_activate%");
+		
+		truckActivate.setMyTables(tables);
+    	
         startPage();
         return getDataTable(truckActivateService.selectTruckActivateList(truckActivate));
@@ -96,8 +96,19 @@ public class TruckActivate
     private String coord;
+    private List<String> myTables;
-    private Date createTime;
+   
+
+	public List<String> getMyTables() {
+		return myTables;
+	}
+
+	public void setMyTables(List<String> myTables) {
+		this.myTables = myTables;
+	}
+
+	private Date createTime;
     private List<String> ids;
@@ -69,6 +69,9 @@ public interface TruckActivateMapper
 	public TruckActivate selectTodayTruckByObjId(String objId);
+	public List<String> getTables(String name);
+	
+
 	public TruckActivate getConractByObjectId(TruckActivate turck);
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
@@ -90,36 +90,43 @@ public class ViolationCaseFile extends BaseEntity
     private List<String> names;
-    private short needUpload;
+    private String needUpload;
     public ViolationCaseFile() {
     }
     public ViolationCaseFile(JSONObject json) {
-    	this.id = json.getString("taskId");
+    	this.id = json.getString("taskId");  
     	this.number = json.getString("evtId");
-    	this.setCreateBy(json.getString("reporter"));
+    	this.setCreateBy("综管服推送"); //上报人
-    	Date d = new Date(json.getString("reportTime"));
+    	Date d = new Date(json.getString("reportTime")); //上报时间
 		this.createTime = d;
+		
+		this.violationObjectType = "0";
+		
+		this.violationType = "工地预警-未按时间作业";
+		this.violationGrade = "一般类";
+		this.sendObject = "区管理部门";
+	
-    	this.projectName = json.getString("caseClassName");
+    	this.projectName = json.getString("caseClassName"); //
-    	this.describe = json.getString("regCaseStandard");
+    	this.describe = "在"+json.getString("areaName")+"区域发现【"+json.getString("carNumber") +"】未按时间作业告警"; //json.getString("regCaseStandard");
-    	this.owningRegion = json.getString("areaName");
+    	this.owningRegion = "芙蓉区";
-    	this.needUpload = 1;
+    	this.needUpload = "1";
 	}
-	public short getNeedUpload() {
+	public String getNeedUpload() {
 		return needUpload;
 	}
-	public void setNeedUpload(short needUpload) {
+	public void setNeedUpload(String needUpload) {
 		this.needUpload = needUpload;
 	}
 package com.trash.casefile.service.impl;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.trash.casefile.mapper.ReplyApprovalProcessMapper;
+import com.trash.casefile.mapper.ViolationCaseFileMapper;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.casefile.domain.ReplyApprovalProcess;
+import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.service.IReplyApprovalProcessService;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.file.FileUploadUtils;
+import com.trash.office.domain.UploadFile;
 /**
  * 回复审批流程Service业务层处理
@@ -18,6 +34,9 @@ public class ReplyApprovalProcessServiceImpl implements IReplyApprovalProcessSer
 {
     @Autowired
     private ReplyApprovalProcessMapper replyApprovalProcessMapper;
+    
+    @Autowired
+    ViolationCaseFileMapper caseMapper;
     /**
      * 查询回复审批流程
@@ -52,6 +71,8 @@ public class ReplyApprovalProcessServiceImpl implements IReplyApprovalProcessSer
     @Override
     public int insertReplyApprovalProcess(ReplyApprovalProcess replyApprovalProcess)
     {
+
+    	
         return replyApprovalProcessMapper.insertReplyApprovalProcess(replyApprovalProcess);
     }
@@ -210,7 +210,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
             uploadFileMapper.insertUploadFile(uploadFile);
-           if(violationCaseFile.getNeedUpload() == 1){
+           if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
         	   Map map = new HashMap();
         	   if(file.getOriginalFilename().toUpperCase().endsWith("JPG")
@@ -224,7 +224,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
         	   }
         	   map.put("attchFileName", file.getOriginalFilename());
-        	   map.put("attchFilePath", "http://101.95.0.106:10001/workflow" + path);
+        	   map.put("attchFilePath", "http://172.26.157.12:10001/workflow" + path);
         	   upfiles.add(map);
@@ -233,7 +233,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
         }
-        if(violationCaseFile.getNeedUpload() == 1){
+        if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
         	Map params = new HashMap<>();
@@ -343,6 +343,28 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
             newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
             uploadFileMapper.insertUploadFile(newUploadFile);
         }
+        
+        int i = 0;
+        //根据发送对象判断流程
+        if(violationCaseFileVo.getViolationCaseFile().getSendObject().equals("区管理部门")){
+        	
+        	if(violationCaseFileVo.getViolationCaseFile().getViolationGrade().equals("一般类")){
+        		i = 1;
+        	}else{
+        		i = 2;
+        	}
+        }
+        if(violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入工地")||
+        		violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入处理场所")||
+        		violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆运输")){
+            i = 2;
+        }
+        
+
+        WorkflowService.createCaseFile(violationCaseFileVo.getViolationCaseFile(),i);
+        
+        violationCaseFileVo.getViolationCaseFile().setStatus(0);
+        
         return  violationCaseFileMapper.updateViolationCaseFile(violationCaseFileVo.getViolationCaseFile());
     }
 package com.trash.workflow.listener;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.activiti.service.IActTaskService;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.caseOffline.service.ICaseOfflineService;
+import com.trash.casefile.domain.ReplyApprovalProcess;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.mapper.ReplyApprovalProcessMapper;
+import com.trash.casefile.mapper.ViolationCaseFileMapper;
 import com.trash.casefile.service.IViolationCaseFileService;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.workflow.domain.Workflow;
 import com.trash.workflow.mapper.WorkflowMapper;
@@ -29,7 +42,58 @@ public class casefileListener implements ExecutionListener {
     	caseOffline.setStatus(Integer.parseInt(state.getValue(delegateExecution).toString()));
-        SpringUtils.getBean(IViolationCaseFileService.class).updateViolationCaseFile(caseOffline);
+        SpringUtils.getBean(ViolationCaseFileMapper.class).updateViolationCaseFile(caseOffline);
+        
+        ViolationCaseFile violationCaseFile = SpringUtils.getBean(ViolationCaseFileMapper.class).selectViolationCaseFileById(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+        
+
+        
+        
+       if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
+           List<Map<String, String>> upfiles = new ArrayList<Map<String, String>>();
+           
+           ReplyApprovalProcess replyApprovalProcess = new ReplyApprovalProcess();
+           replyApprovalProcess.setTableName(delegateExecution.getProcessInstanceBusinessKey());
+           
+           List<ReplyApprovalProcess> repList = SpringUtils.getBean(ReplyApprovalProcessMapper.class).selectReplyApprovalProcessList(replyApprovalProcess);
+           
+           replyApprovalProcess = repList.get(0);
+           
+    	   Map map = new HashMap();
+    	   
+    	   for(String file :replyApprovalProcess.getReplyImg().split(",")){
+    	   
+        	   if(file.toUpperCase().endsWith("JPG")
+        			   || file.toUpperCase().endsWith("PNG") 
+        			   || file.toUpperCase().endsWith("JPEG")){
+            	   map.put("attchType", 0);
+        	   }else if(file.toUpperCase().endsWith("MP3")){
+            	   map.put("attchType", 1);
+        	   }else if(file.toUpperCase().endsWith("MP4") || file.toUpperCase().endsWith("AVI")){
+            	   map.put("attchType", 2);
+        	   }
+        	   
+        	   map.put("attchFileName", file.split("/")[file.split("/").length-1]);
+        	   map.put("attchFilePath", "http://172.26.157.12:10001/workflow" + file);
+        	   
+        	  
+        	   upfiles.add(map);
+    	   }
+    	   
+
+    	Map params = new HashMap<>();
+
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    		
+    	
+    	params.put("evtId",violationCaseFile.getNumber());
+    	params.put("replyContent",replyApprovalProcess.getReply());
+    	params.put("handleTime",DateUtils.getTime());
+    	params.put("attchList",upfiles);
+    	boolean result = RemoteServerUtils.replyUpCase(params);
+    	
+    	System.out.print("反馈到上级平台: " + result);
+       }
         workflowUtils.sendDataToHisTory(delegateExecution, state);
@@ -88,10 +88,10 @@ public interface IWorkflowService
 	public void deleteWorkflowByName(String string);
-	
+	int createCaseFileByTask(ViolationCaseFile violationCaseFile,int index);
+
 	int createCaseOffline(CaseOffline caseOffline);
-	
 	int createCaseFile(ViolationCaseFile violationCaseFile,int index);
     int createCaseFile1(ViolationWarningInformation violationCaseFile, int index,int isAuto);
@@ -332,6 +332,82 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
+	
+	@Override
+	@Transactional
+	public int createCaseFileByTask(ViolationCaseFile caseFile, int index) { // 违规预警案卷
+
+			if(StringUtils.isEmpty(RemoteServerUtils.remote)) {
+				RemoteServerUtils.remote = trashConfig.getRemotePath();
+			}
+			loginService.loginByRemote(trashConfig.getToken());
+		
+
+		SysUser user = null;
+		
+		try {
+			user = SecurityUtils.getLoginUser().getUser();
+		} catch (Exception e) {
+//			e.printStackTrace();
+		}
+		
+		
+		
+		
+		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
+
+		securityContextImpl.setAuthentication(SecurityContextHolder.getContext().getAuthentication());
+		org.activiti.engine.runtime.ProcessInstance instance = null;
+		String title = "案卷号:" + caseFile.getNumber();
+		String flowType = "workflow_casefile";
+		
+		if(index > 0 && caseFile.getOwningRegion().contains("湘江新区")){
+			index += 3;
+		}
+		ActWorkflowFormData awf = null;
+		
+		try {
+			Map map = new HashedMap<>();
+
+			map.put("route", index);
+			instance = runtimeService.createProcessInstanceBuilder().businessKey(flowType + ":" + caseFile.getId())
+					.name(title).variable("route", index).processDefinitionKey(flowType).variables(map).start();
+
+			// runtimeService.startProcessInstanceById(instance.getProcessDefinitionId(),map);
+
+			if (index == 0) {
+				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
+
+				task.setAssignee(caseFile.getAbbreviation());
+
+				taskService.saveTask(task);
+			} else {
+				updateProcessKafka(instance, caseFile.getOwningRegion(), trashConfig.getToken());
+			}
+
+			Workflow workflow = new Workflow();
+			workflow.setId(flowType + ":" + caseFile.getId());
+			workflow.setTitle(title);
+			workflow.setReason("平台案卷");
+			workflow.setStartTime(sdf.format(caseFile.getCreateTime()));
+			workflow.setEndTime(sdf.format(caseFile.getCreateTime()));
+			workflow.setType("违规案卷处置流程");
+			workflow.setInstanceId(instance.getId());
+			workflow.setState("0");
+			workflow.setCreateTime(new Date());
+			
+
+			awf = insertAwf(user,workflow);
+
+			return workflowMapper.insertWorkflow(workflow);
+		} catch (Exception e) {
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
+			runtimeService.deleteProcessInstance(instance.getId(), "创建失败");
+			throw new RuntimeException(e);
+		}
+
+	}
 	@Override
 	@Transactional
@@ -37,10 +37,25 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
          from truck_activate
     </sql>
+    <select id="getTables" parameterType="String" resultType="String">
+    	select table_name from information_schema.TABLES where table_name like #{name}
+    </select>
+    
     <select id="selectTruckActivateList" parameterType="TruckActivate" resultMap="TruckActivateResult">
-        <include refid="selectTruckActivateVo"/>
-        <where>  
+        select a.* from
+			<if test="myTables != null"> 
+				<foreach item="table" collection="myTables" open="(" separator=" UNION ALL " close=") a">
+					select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count
+			        ,address,effective_from,effective_end,transport_start_time,transport_end_time,route_name,earth_name
+			         from ${table}
+				</foreach>
+			</if>
+			<if test="myTables == null"> 
+				truck_activate a
+			</if>
+        <where>
+
             <if test="company != null  and company != ''"> and company like concat('%', #{company},'%')</if>
             <if test="licensePlate != null  and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
             <if test="time != null "> and time = #{time}</if>
@@ -38,7 +38,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <where>  
             <if test="number != null  and number != ''"> and number = #{number}</if>
             <if test="violationObjectType != null  and violationObjectType != ''"> and violation_object_type = #{violationObjectType}</if>
-            <if test="owningRegion != null  and owningRegion != ''"> and owning_region = #{owningRegion}</if>
+            <if test="owningRegion != null  and owningRegion != ''"> and owning_region like concat('%', #{owningRegion}, '%')</if>
             <if test="violationType != null  and violationType != ''"> and violation_type = #{violationType}</if>
             <if test="violationGrade != null  and violationGrade != ''"> and violation_grade = #{violationGrade}</if>
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>