办文办事+修复bug

273548560@qq.com
1 parent 32edd863
Showing 16 changed files with 693 additions and 344 deletions
trash-ui/src/api/casefile/violationWarningInformation.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseFileInfo.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
trash-workFlow/src/main/java/com/trash/casefile/mapper/ViolationWarningInformationMapper.java
trash-workFlow/src/main/java/com/trash/casefile/service/IViolationWarningInformationService.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/listener/casefile1Listener.java
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
@@ -9,6 +9,15 @@ export function listViolationWarningInformation(query) {
   })
 }
+// 查询回复审批流程列表
+export function caseTable(query) {
+  return request({
+    url: '/casefile/violationWarningInformation/caseTable',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询违规预警信息详细
 export function getViolationWarningInformation(id) {
   return request({
@@ -51,3 +60,12 @@ export function exportViolationWarningInformation(query) {
     params: query
   })
 }
+
+// 修改平台违规案卷
+export function updateViolationCaseFileReader1(data) {
+  return request({
+    url: '/casefile/violationWarningInformation/updateViolationCaseFileReader',
+    method: 'put',
+    data: data
+  })
+}
@@ -269,6 +269,66 @@
         <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
       </div>
     </el-dialog>
+
+    <!--  平台违规信息  -->
+    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body :close-on-click-modal="false">
+      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
+      <el-form v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员' && violationCaseFile" :rules="rules" label-width="120px" >
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload
+          list-type="picture"
+          action=''
+          accept=".jpg, .png , .bmp"
+          :limit="1"
+          :auto-upload="false"
+          :file-list="form.replyImg"
+          :on-change="getFile"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleUploadRemove"
+        >
+          <el-button size="small" type="primary" @click="uploadimg" v-if="form.replyImg == null">选择图片上传</el-button>
+          <div slot="tip" class="el-upload__tip" v-if="form.replyImg== null">只能上传一张图片文件</div>
+        </el-upload>
+
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  违规预警信息  -->
+    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body :close-on-click-modal="false">
+      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
+      <el-form v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员' && violationCaseFile1" :rules="rules" label-width="120px" >
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload
+          list-type="picture"
+          action=''
+          accept=".jpg, .png , .bmp"
+          :limit="1"
+          :auto-upload="false"
+          :file-list="form.replyImg"
+          :on-change="getFile"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleUploadRemove"
+        >
+          <el-button size="small" type="primary" @click="uploadimg" v-if="form.replyImg == null">选择图片上传</el-button>
+          <div slot="tip" class="el-upload__tip" v-if="form.replyImg== null">只能上传一张图片文件</div>
+        </el-upload>
+
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
@@ -277,113 +337,115 @@
 </style>
 <script>
-  import {
-    listTask,
-    formDataShow,
-    formDataSave
-  } from "@/api/activiti/task";
-
-
-import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-
-import {  updateCaseOffline } from "@/api/caseOffline/caseOffline";
-
-import { updateViolationCaseFileReader } from "@/api/casefile/violationCaseFile";
-
-import { addReplyApprovalProcess } from "@/api/casefile/replyApprovalProcess";
-
-
-
-  import {
-    getArea,
-    getDict,
-  } from "@/api/dict";
-
-  import {
-    updateThreestep,
-    activeThreestep
-  } from "@/api/business/threestep";
-
-  import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
-  import threestepInfo from "@/views/business/threestep/threestepInfo";
-  import taskCard from "@/views/activiti/task/taskCard";
-  import {
-    getToken
-  } from "@/utils/auth";
-  import conferenceInfo from "@/views/office/conference/conferenceInfo";
-  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
-  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
-  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
-  import contractInfo from "@/views/activiti/task/contractInfo";
-  import logisticsInfo from "@/views/office/logistics/logisticsInfo";
-  import handleInfo from "@/views/office/handle/handleInfo";
-
-  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-  import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo"
-
-
-  export default {
-    name: "task",
-    components: {
-      taskCard,
-      leaveHistoryForm,
-      threestepInfo,
-      conferenceInfo,
-      leaveApplicationInfo,
-      logisticsInfo,
-      handleInfo,
-      leaveApplicationInfo,
-      constructsiteInfo,
-      earthsitesInfo,
-      contractInfo,
-      caseOfflineInfo,
-      violationCaseFileInfo
-    },
-    data() {
-      return {
-        id: '',
-        definitionKey: '',
-        businessKey: '',
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 请假表格数据
-        taskList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        open2: false,
-        picSample: false,
-        taskName: null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          role:null,
-          dept:null,
-        },
-        // 表单参数
-        form: {
-          formData: []
-        },
-        needShow: false,
-        // 表单校验
-        rules: {
-          subReason: [{
-            required: true,
-            message: '请填写补充说明',
-            trigger: 'change'
-          }, ],
+import {
+  listTask,
+  formDataShow,
+  formDataSave
+} from "@/api/activiti/task";
+
+
+import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
+
+import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
+
+import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
+import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
+
+import {
+  getArea,
+  getDict,
+  getUsers
+} from "@/api/dict";
+
+import {
+  updateThreestep,
+  activeThreestep
+} from "@/api/business/threestep";
+import {
+  getToken
+} from "@/utils/auth";
+import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+import {updateHandleAffairs} from "@/api/office/handle";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
+import threestepInfo from "@/views/business/threestep/threestepInfo";
+import taskCard from "@/views/activiti/task/taskCard";
+import conferenceInfo from "@/views/office/conference/conferenceInfo";
+import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
+import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+import contractInfo from "@/views/activiti/task/contractInfo";
+import logisticsInfo from "@/views/office/logistics/logisticsInfo";
+import handleInfo from "@/views/office/handle/handleInfo";
+import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+
+export default {
+  name: "task",
+  components: {
+    taskCard,
+    leaveHistoryForm,
+    threestepInfo,
+    conferenceInfo,
+    leaveApplicationInfo,
+    logisticsInfo,
+    handleInfo,
+    constructsiteInfo,
+    Treeselect,
+    earthsitesInfo,
+    contractInfo,
+    caseOfflineInfo,
+    violationCaseFileInfo,
+    violationWarningInformationInfo
+  },
+  data() {
+    return {
+      id: '',
+      definitionKey: '',
+      businessKey: '',
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 请假表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      open2: false,
+      picSample: false,
+      taskName: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        role: null,
+        dept: null,
+      },
+      // 表单参数
+      form: {
+        formData: []
+      },
+      needShow: false,
+      // 表单校验
+      rules: {
+        subReason: [{
+          required: true,
+          message: '请填写补充说明',
+          trigger: 'blur'
+        },],
+
       },
       picIndex: 0,
       fileList: [],
@@ -417,6 +479,7 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
       handleAffairsInfoOpen: false,
       caseOffline: false,
       violationCaseFile: false,
+      violationCaseFile1: false,
       controlId: null,
       users: [],
       options: [],
@@ -561,7 +624,8 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
               this.signData = res.data;
               this.construct = true;
             }
-          })
+          });
+          return;
         }
         if (this.definitionKey == "workflow_earthsites") {
           this.earthsites = true;
@@ -583,6 +647,20 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
           this.handleAffairsInfoOpen = true;
           return;
         }
+        if(this.definitionKey == "workflow_caseoffline"){
+          this.caseOffline = true;
+          return;
+        }
+
+        if(this.definitionKey == "workflow_casefile"){
+          this.violationCaseFile = true;
+          return;
+        }
+
+        if(this.definitionKey == "violation_warning"){
+          this.violationCaseFile1 = true;
+          return;
+        }
         this.open = true;
         this.title = "审批";
       });
@@ -673,11 +751,6 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
           });
         }
         return;
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.construct = false;
-          this.getList();
-        });
       }
       if (this.definitionKey == "workflow_conract") {
@@ -732,6 +805,38 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
         return;
       }
+
+      if (this.definitionKey == "workflow_caseoffline") {
+        let id = this.businessKey.split(":")[1];
+        let query = {
+          id: id,
+        };
+        let adv = this.form.advice;
+        if (!adv) {
+          if (value == 0) {
+            adv = "审批通过";
+          } else {
+            adv = "审批驳回";
+          }
+        }
+        if (this.taskName == "渣土办科员") {
+          query.advice1 = adv;
+        } else if (this.taskName == "渣土办分管领导") {
+          query.advice2 = adv;
+        } else if (this.taskName == "治理部部长") {
+          query.advice3 = adv;
+        } else if (this.taskName == "治理部分管领导") {
+          query.advice4 = adv;
+        }
+        updateCaseOffline(query).then(res => {
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.caseOffline = false;
+            this.getList();
+          });
+        })
+        return;
+      }
       if (this.definitionKey == "workflow_casefile") {
         debugger;
@@ -747,33 +852,64 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
           })
           return;
         } else {
+          if (value == 0) {
+            let postData = {};
+
+            postData.tableName = this.businessKey;
+            postData.replyImg = this.form.replyImg;
+            postData.reply = this.form.reply;
+            addReplyApprovalProcess(postData).then(res => {
+              formDataSave(this.id, this.form.formData).then(response => {
+                this.msgSuccess("审批成功");
+                this.violationCaseFile = false;
+                this.getList();
+              });
+            });
-        }
-
-
-        if (value == 0) {
-          let postData = {};
-
-          postData.tableName = this.businessKey;
-          postData.replyImg = this.form.replyImg;
-          postData.reply = this.form.reply;
-          addReplyApprovalProcess(postData).then(res => {
+          } else {
             formDataSave(this.id, this.form.formData).then(response => {
               this.msgSuccess("审批成功");
               this.violationCaseFile = false;
               this.getList();
             });
-          });
-
-        } else {
-          formDataSave(this.id, this.form.formData).then(response => {
-            this.msgSuccess("审批成功");
-            this.violationCaseFile = false;
-            this.getList();
-          });
+          }
         }
+      }
+      if (this.definitionKey == "violation_warning") {
+        if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
+          console.log(this.businessKey);
+          let objId = this.businessKey.split(":")[1];
+          updateViolationCaseFileReader1({id: objId}).then(res => {
+            formDataSave(this.id, this.form.formData).then(response => {
+              this.msgSuccess("审批成功");
+              this.violationCaseFile1 = false;
+              this.getList();
+            });
+          })
+          return;
+        } else {
+          if (value == 0) {
+            let postData = {};
+
+            postData.tableName = this.businessKey;
+            postData.replyImg = this.form.replyImg;
+            postData.reply = this.form.reply;
+            addReplyApprovalProcess(postData).then(res => {
+              formDataSave(this.id, this.form.formData).then(response => {
+                this.msgSuccess("审批成功");
+                this.violationCaseFile1 = false;
+                this.getList();
+              });
+            });
-
+          } else {
+            formDataSave(this.id, this.form.formData).then(response => {
+              this.msgSuccess("审批成功");
+              this.violationCaseFile1 = false;
+              this.getList();
+            });
+          }
+        }
       }
     },
     conferenceSubmitForm(value) {
@@ -31,7 +31,7 @@
           placeholder="请输入项目名称"
           clearable
           size="small"
-          
+
         />
       </el-form-item>
@@ -111,7 +111,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInfo(scope.row)"
-            v-hasPermi="['casefile:violationCaseFile:edit']"
+            v-hasPermi="['casefile:violationCaseFile:view']"
           >详情</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -111,7 +111,7 @@
             type="text"
             icon="el-icon-view"
             @click="openImage(scope.row.replyImg)"
-            v-hasPermi="['casefile:violationWarningInformation:edit']"
+            v-hasPermi="['casefile:violationWarningInformation:view']"
           >查看</el-button>
         </template>
       </el-table-column>
@@ -3,31 +3,34 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
       <el-form-item label="违规对象类型" prop="violationObjectType">
         <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
-          <el-option label="对象1" value="对象1" />
-          <el-option label="对象2" value="对象2" />
+          <el-option label="工地" value="0" />
+          <el-option label="消纳场" value="1" />
+          <el-option label="企业" value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="所属区域" prop="owningRegion">
         <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
-        <el-option label="区域1" value="区域1" />
-        <el-option label="区域2" value="区域2" />
-      </el-select>
+          <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
+        </el-select>
       </el-form-item>
       <el-form-item label="违规类型" prop="violationType">
         <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
-          <el-option label="违规1" value="违规1" />
-          <el-option label="违规2" value="违规2" />
+          <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
-        <el-select v-model="queryParams.projectName" :filterable="true" :remote-method="projectNameLoadOptions" :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;">
-          <el-option v-for="item in projectNameList" :key="item.name" :label="item.name" :value="item.name"></el-option>
-        </el-select>
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="企业名称" prop="companyName">
-        <el-select v-model="queryParams.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
-          <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
-        </el-select>
+      <el-form-item label="日期" prop="createTime">
+        <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.createTime" type="date"
+                        value-format="yyyy-MM-dd" placeholder="开始时间">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -80,7 +83,11 @@
     <el-table v-loading="loading" :data="violationWarningInformationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="所属区域" align="center" prop="owningRegion" />
-      <el-table-column label="违规对象类型" align="center" prop="violationObjectType" />
+      <el-table-column label="违规对象类型" align="center" prop="violationObjectType" >
+        <template slot-scope="scope">
+          <span>{{scope.row.violationObjectType == 0 ? "工地" :scope.row.violationObjectType == 1 ?"消纳场":"企业"}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="违规类型" align="center" prop="violationType" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
       <el-table-column label="企业名称" align="center" prop="companyName" />
@@ -96,7 +103,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInfo(scope.row)"
-            v-hasPermi="['casefile:violationWarningInformation:edit']"
+            v-hasPermi="['casefile:violationWarningInformation:view']"
           >详情</el-button>
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -136,8 +143,9 @@
           <el-col :span="11">
             <el-form-item label="违规对象类型" prop="violationObjectType">
               <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;">
-                <el-option label="对象1" value="对象1" />
-                <el-option label="对象2" value="对象2" />
+                <el-option label="工地" value="0" />
+                <el-option label="消纳场" value="1" />
+                <el-option label="企业" value="2" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -145,17 +153,15 @@
         <el-row :gutter="2">
           <el-col :span="11">
             <el-form-item label="所属区域" prop="owningRegion">
-              <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;">
-                <el-option label="区域1" value="区域1" />
-                <el-option label="区域2" value="区域2" />
+              <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>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规类型" prop="violationType">
               <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;">
-                <el-option label="违规1" value="违规1" />
-                <el-option label="违规2" value="违规2" />
+                <el-option  v-for="item in caseType" :label="item.name" :value="item.name" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -257,7 +263,14 @@
 <script>
 import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation";
 import violationWarningInformationInfo from "./violationWarningInformationInfo";
-
+import {
+  earthsitesList,
+  constructionsitesList,
+  getDict,
+  getArea,
+  companyList,
+  truckList,
+} from "@/api/dict";
 export default {
   name: "ViolationWarningInformation",
   components: { violationWarningInformationInfo },
@@ -319,6 +332,36 @@ export default {
           { required: true, message: "必填", trigger: "blur" }
         ],
       },
+      caseType:[{code:0,name:"进入非专用车辆"},
+        {code:1,name:"无许可手续（工）"},
+        {code:2,name:"无许可手续（消）"},
+        {code:3,name:"黄土覆盖情况"},
+        {code:4,name:"出入口路面污染"},
+        {code:5,name:"出入口道路硬化"},
+        {code:6,name:"车辆冲洗是否到位"},
+        {code:7,name:"雾炮机是否正常开启"},
+        {code:8,name:"使用费专用车运输"},
+        {code:9,name:"监控点位未对准"},
+        {code:10,name:"未报开工作业"},
+        {code:11,name:"视频设备离线超时报警"},
+        {code:12,name:"三无车辆进入工地"},
+        {code:13,name:"未按时间作业"},
+        {code:14,name:"未报开工作业"},
+        {code:15,name:"视频设备离线超时报警"},
+        {code:16,name:"三无车辆进入消纳场"},
+        {code:17,name:"未到指定的消纳场作业"},
+        {code:18,name:"离线运输报警（工）"},
+        {code:19,name:"离线运输报警（消）"},
+        {code:20,name:"未激活车辆作业"},
+        {code:21,name:"未核准作业车辆作业"},
+        {code:22,name:"未按线路行驶"},
+        {code:23,name:"闯禁行驶"},
+        {code:24,name:"失信车辆作业"},
+        {code:25,name:"其他1"},
+        {code:26,name:"其他2"},
+        {code:27,name:"其他3"},
+        {code:28,name:"其他4"},
+        {code:29,name:"其他5"}],
       projectNameList:[
         {name:"项目1"},
         {name:"项目2"},
@@ -331,15 +374,46 @@ export default {
         {name:"公司2"},
         {name:"公司3"},
       ],
+      remoteQueryData: {
+        "page": 1,
+        "size": 9999
+      },
       isLoadingCompany: false,
       idInfo:null,
       openInfo:false,
+      areas:[],
+      data:{},
     };
   },
   created() {
+    getArea().then(res=>{
+
+      this.areas = res.result;
+    });
+
+
+    constructionsitesList(this.remoteQueryData).then(res => {
+      this.data = res.result.list;
+      earthsitesList(this.remoteQueryData).then(res => {
+        for(var i in res.result.list){
+          this.data.push(res.result.list[i]);
+        }
+      });
+    });
+
+
+    companyList(this.remoteQueryData).then(res => {
+      this.companyList = res.result.list;
+    });
     this.getList();
   },
   methods: {
+    selectArea(item){
+
+      this.form.owningRegion = item.name;
+      this.form.projectName = null;
+
+    },
     /** 查询违规预警信息列表 */
     getList() {
       this.loading = true;
@@ -400,7 +474,7 @@ export default {
       this.multiple = !selection.length
     },
     handleInfo(row){
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.openInfo = true;
       this.title = "平台违规案卷详情";
     },
@@ -430,6 +504,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.sendObject == "运输企业" && this.form.companyName == null){
+
+            this.$message("请选择相关企业");
+
+            return;
+          }
           let formData = new FormData();
           let form = this.form;
           //去掉params属性
@@ -9,8 +9,9 @@
       <el-col :span="11">
         <el-form-item label="违规对象类型" prop="violationObjectType">
           <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
-            <el-option label="对象1" value="对象1"/>
-            <el-option label="对象2" value="对象2"/>
+            <el-option label="工地" value="0" />
+            <el-option label="消纳场" value="1" />
+            <el-option label="企业" value="2" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -19,16 +20,12 @@
       <el-col :span="11">
         <el-form-item label="所属区域" prop="owningRegion">
           <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
-            <el-option label="区域1" value="区域1"/>
-            <el-option label="区域2" value="区域2"/>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="11">
         <el-form-item label="违规类型" prop="violationType">
           <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-            <el-option label="违规1" value="违规1"/>
-            <el-option label="违规2" value="违规2"/>
           </el-select>
         </el-form-item>
       </el-col>
@@ -70,7 +67,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="11">
-        <el-form-item label="接收人及状态" prop="receive">
+        <el-form-item label="接收人" prop="receive">
           <el-input :value="form.receive!=null?form.receive:'' + form.receiveStatus!=null?form.receiveStatus:''"
                     :disabled="true"/>
         </el-form-item>
@@ -78,7 +75,12 @@
     </el-row>
     <el-row :gutter="2">
       <el-col :span="11">
-        <el-form-item label="发送人" prop="createBy">
+        <el-form-item label="阅读人" prop="createBy">
+          <el-input :value="form.readBy" :disabled="true"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11">
+        <el-form-item label="阅读时间" prop="createBy">
           <el-input :value="form.readTime" :disabled="true"/>
         </el-form-item>
       </el-col>
@@ -112,7 +114,7 @@
             size="mini"
             type="text"
             icon="el-icon-view"
-            @click="openImage(scope.row)"
+            @click="openImage(scope.row.replyImg)"
             v-hasPermi="['casefile:violationWarningInformation:edit']"
           >查看</el-button>
         </template>
@@ -167,9 +169,17 @@ export default {
       open:false,
       replyApprovalProcessList:[],
       openImg:false,
+      img:null,
     }
   },
   created() {
+    let id = this.idInfo.split(":");
+
+    if(id.length == 2){
+      this.idInfo = id[1];
+    }else{
+      this.idInfo = id;
+    }
     this.init();
   },
   methods: {
@@ -179,7 +189,7 @@ export default {
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
       });
-      listReplyApprovalProcess({tableName:"casefile_violation_warning_information",tableId:this.idInfo}).then(response => {
+      listReplyApprovalProcess({tableName:"workflow_casefile" + ":" +  this.idInfo}).then(response => {
         this.replyApprovalProcessList = response.rows;
       });
     },
@@ -193,9 +203,9 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
     },
-    openImage(row){
+    openImage(base64){
       this.openImg = true;
-      this.img = process.env.VUE_APP_BASE_API + row.replyImg;
+      this.img = base64;
     }
   }
 }
+<template>
+    <el-table :data="tableData"  :span-method="spanMethod" show-summary="true"  :summary-method="getSummaries">
+      <el-table-column label="行政范围" header-align="center" align="center"  >
+        <template slot-scope="scope">
+          长沙市
+        </template>
+      </el-table-column>
+      <el-table-column property="type" label="案卷类型" header-align="center" align="center"></el-table-column>
+      <el-table-column property="count" label="违规案卷数" header-align="center" align="center"></el-table-column>
+      <el-table-column property="repCount" label="违规案卷回复数" header-align="center" align="center"></el-table-column>
+      <el-table-column property="repPct" label="违规案卷回复率" header-align="center" align="center"></el-table-column>
+    </el-table>
+</template>
+
+<script>
+
+import {caseTable} from "@/api/casefile/violationWarningInformation";
+export default {
+  name: "caseTable",
+  props: {
+  },
+  data() {
+    return {
+      tableData:[],
+    }
+  },
+  created() {
+   caseTable().then(res=>{
+
+     this.tableData = res.data;
+
+   });
+  },
+  methods:{
+    spanMethod({ row, column, rowIndex, columnIndex }) {
+      if(columnIndex == 0) {
+        if(rowIndex == 0){
+          return {rowspan:300 , colspan:1}
+        }else{
+          return {rowspan:0 , colspan:0}
+        }
+      }
+    },
+    getSummaries(param){
+        const { columns, data } = param;
+        const sums = [];
+
+        let allCount = 0;
+        let allRepCount = 0;
+        for(let i in data){
+
+          allCount += Number(data[i].count );
+          allRepCount += Number(data[i].repCount );
+
+        }
+
+        columns.forEach((column, index) => {
+          if (index == 0 || index == 1) {
+            return;
+          }
+
+          if(index == 2){
+            sums[2] = allCount;
+          }
+
+          if(index == 3){
+            sums[3] = allRepCount;
+          }
+
+          if(index == 4){
+            sums[4] = ((allRepCount/allCount)*100 ).toFixed(2)+ "%";
+          }
+        })
+
+        return sums;
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
@@ -28,7 +28,6 @@ import com.trash.common.enums.BusinessType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.dayWork;
 import com.trash.business.service.ISupervisionThreestepService;
@@ -2,10 +2,14 @@ package com.trash.casefile.controller;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import com.alibaba.fastjson.JSON;
+import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.office.domain.LeaveApplication;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.domain.vo.LeaveApplicationVo;
@@ -102,6 +106,79 @@ public class ViolationWarningInformationController extends BaseController
         return toAjax(violationWarningInformationService.updateViolationWarningInformation(files,violationWarningInformationVo));
     }
+
+    @PutMapping(value="updateViolationCaseFileReader")
+    public int updateViolationCaseFileReader(@RequestBody ViolationWarningInformation violationWarningInformation) throws IOException
+    {
+        try {
+
+            violationWarningInformation.setReadBy(SecurityUtils.getUsername());
+            violationWarningInformation.setReadTime(DateUtils.getNowDate());
+            violationWarningInformationService.updateViolationCaseFile(violationWarningInformation);
+            return 1;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+    String[] caseType = {"进入非专用车辆","无许可手续（工）","无许可手续（消）","黄土覆盖情况","出入口路面污染","出入口道路硬化","车辆冲洗是否到位",
+            "雾炮机是否正常开启","使用费专用车运输","监控点位未对准","未报开工作业","视频设备离线超时报警","三无车辆进入工地","未按时间作业",
+            "未报开工作业","视频设备离线超时报警","三无车辆进入消纳场","未到指定的消纳场作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
+            "未核准作业车辆作业","未按线路行驶","闯禁行驶","失信车辆作业","其他1","其他2","其他3","其他4","其他5"};
+
+    @GetMapping(value = "/caseTable")
+    public AjaxResult getTable(){
+        List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
+
+
+
+        List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(new ViolationWarningInformation());
+
+        for(String type:caseType){
+
+            HashMap<String, String> map = new HashMap<>();
+
+            map.put("type", type);
+
+            int count = 0;
+            int repCount = 0;
+
+            for(ViolationWarningInformation file:list){
+                if(type.equals(file.getViolationType())){
+                    count +=1;
+                    if(file.getReadBy() != null && !file.getReadBy().isEmpty()){
+                        repCount += 1;
+                    }
+
+                }
+
+
+            }
+
+            map.put("count", count + "");
+            map.put("repCount", repCount + "");
+
+            if(count == 0){
+                double pct = ((double)repCount)/((double)count);
+                map.put("repPct","0%");
+                maps.add(map);
+            }else{
+                double pct = ((double)repCount)/((double)count);
+                map.put("repPct",(pct*100) + "%");
+                maps.add(map);
+            }
+
+
+
+        }
+
+
+
+        return AjaxResult.success(maps);
+    }
+
     /**
      * 删除违规预警信息
      */
@@ -106,69 +106,6 @@ public class ViolationWarningInformation extends BaseEntity {
     @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date readTime;
-    /**
-     * 回复1
-     */
-    private String replyOne;
-
-    /**
-     * 回复2
-     */
-    private String replyTwo;
-
-    /**
-     * 回复3
-     */
-    private String replyThree;
-
-    /**
-     * 回复4
-     */
-    private String replyFour;
-
-    /**
-     * 回复时间1
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date replyTimeOne;
-
-    /**
-     * 回复时间2
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date replyTimeTwo;
-
-    /**
-     * 回复时间3
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date replyTimeThree;
-
-    /**
-     * 回复时间4
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date replyTimeFour;
-
-    /**
-     * 回复图片1
-     */
-    private String replyImgOne;
-
-    /**
-     * 回复图片1
-     */
-    private String replyImgTwo;
-
-    /**
-     * 回复图片1
-     */
-    private String replyImgThree;
-
-    /**
-     * 回复图片1
-     */
-    private String replyImgFour;
     public void setId(Long id) {
         this.id = id;
@@ -290,102 +227,6 @@ public class ViolationWarningInformation extends BaseEntity {
         return readTime;
     }
-    public void setReplyOne(String replyOne) {
-        this.replyOne = replyOne;
-    }
-
-    public String getReplyOne() {
-        return replyOne;
-    }
-
-    public void setReplyTwo(String replyTwo) {
-        this.replyTwo = replyTwo;
-    }
-
-    public String getReplyTwo() {
-        return replyTwo;
-    }
-
-    public void setReplyThree(String replyThree) {
-        this.replyThree = replyThree;
-    }
-
-    public String getReplyThree() {
-        return replyThree;
-    }
-
-    public String getReplyFour() {
-        return replyFour;
-    }
-
-    public void setReplyFour(String replyFour) {
-        this.replyFour = replyFour;
-    }
-
-    public Date getReplyTimeOne() {
-        return replyTimeOne;
-    }
-
-    public void setReplyTimeOne(Date replyTimeOne) {
-        this.replyTimeOne = replyTimeOne;
-    }
-
-    public Date getReplyTimeTwo() {
-        return replyTimeTwo;
-    }
-
-    public void setReplyTimeTwo(Date replyTimeTwo) {
-        this.replyTimeTwo = replyTimeTwo;
-    }
-
-    public Date getReplyTimeThree() {
-        return replyTimeThree;
-    }
-
-    public void setReplyTimeThree(Date replyTimeThree) {
-        this.replyTimeThree = replyTimeThree;
-    }
-
-    public Date getReplyTimeFour() {
-        return replyTimeFour;
-    }
-
-    public void setReplyTimeFour(Date replyTimeFour) {
-        this.replyTimeFour = replyTimeFour;
-    }
-
-    public String getReplyImgOne() {
-        return replyImgOne;
-    }
-
-    public void setReplyImgOne(String replyImgOne) {
-        this.replyImgOne = replyImgOne;
-    }
-
-    public String getReplyImgTwo() {
-        return replyImgTwo;
-    }
-
-    public void setReplyImgTwo(String replyImgTwo) {
-        this.replyImgTwo = replyImgTwo;
-    }
-
-    public String getReplyImgThree() {
-        return replyImgThree;
-    }
-
-    public void setReplyImgThree(String replyImgThree) {
-        this.replyImgThree = replyImgThree;
-    }
-
-    public String getReplyImgFour() {
-        return replyImgFour;
-    }
-
-    public void setReplyImgFour(String replyImgFour) {
-        this.replyImgFour = replyImgFour;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -408,18 +249,6 @@ public class ViolationWarningInformation extends BaseEntity {
                 .append("receiveStatus", getReceiveStatus())
                 .append("readBy", getReadBy())
                 .append("readTime", getReadTime())
-                .append("replyOne", getReplyOne())
-                .append("replyTwo", getReplyTwo())
-                .append("replyThree", getReplyThree())
-                .append("replyFour", getReplyFour())
-                .append("replyTimeOne", getReplyTimeOne())
-                .append("replyTimeTwo", getReplyTimeTwo())
-                .append("replyTimeThree", getReplyTimeThree())
-                .append("replyTimeFour", getReplyTimeFour())
-                .append("replyImgOne", getReplyImgOne())
-                .append("replyImgTwo", getReplyImgTwo())
-                .append("replyImgThree", getReplyImgThree())
-                .append("replyImgFour", getReplyImgFour())
                 .toString();
     }
 }
@@ -58,4 +58,5 @@ public interface ViolationWarningInformationMapper
      * @return 结果
      */
     int deleteViolationWarningInformationByIds(Long[] ids);
+
 }
@@ -3,6 +3,7 @@ package com.trash.casefile.service;
 import java.io.IOException;
 import java.util.List;
+import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
 import org.springframework.web.multipart.MultipartFile;
@@ -61,4 +62,6 @@ public interface IViolationWarningInformationService {
      * @return 结果
      */
     int deleteViolationWarningInformationById(Long id);
+
+    void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation);
 }
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
+import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -13,6 +14,7 @@ import com.trash.office.domain.UploadFile;
 import com.trash.office.domain.vo.LeaveApplicationVo;
 import com.trash.office.mapper.UploadFileMapper;
 import com.trash.workflow.domain.Workflow;
+import com.trash.workflow.service.IWorkflowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.casefile.mapper.ViolationWarningInformationMapper;
@@ -34,6 +36,8 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
     private ViolationWarningInformationMapper violationWarningInformationMapper;
     @Autowired
     private UploadFileMapper uploadFileMapper;
+    @Autowired
+    IWorkflowService WorkflowService;
     /**
      * 查询违规预警信息
@@ -75,6 +79,7 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
     @Transactional
     public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
         violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
+        violationWarningInformation.setCreateTime(DateUtils.getNowDate());
         violationWarningInformation.setStatus(0);
         Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
         //文件上传
@@ -86,6 +91,21 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
             uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
             uploadFileMapper.insertUploadFile(uploadFile);
         }
+        int i = 0;
+
+        if(violationWarningInformation.getSendObject().equals("区管理部门(消)")){
+            i = 3;
+        }else if(violationWarningInformation.getSendObject().equals("区管理部门(治)")){
+
+            if(violationWarningInformation.getViolationGrade().equals("一般类")){
+                i = 1;
+            }else{
+                i = 2;
+            }
+        }
+
+
+        WorkflowService.createCaseFile1(violationWarningInformation,i);
         return result;
     }
@@ -173,4 +193,8 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
     {
         return violationWarningInformationMapper.deleteViolationWarningInformationById(id);
     }
+
+    public void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation){
+        violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformation);
+    }
 }
+package com.trash.workflow.listener;
+
+import com.trash.activiti.service.IActTaskService;
+import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
+import com.trash.casefile.service.IViolationCaseFileService;
+import com.trash.casefile.service.IViolationWarningInformationService;
+import com.trash.common.utils.spring.SpringUtils;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.delegate.Expression;
+
+
+public class casefile1Listener implements ExecutionListener {
+
+	private Expression state;
+
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+
+		ViolationWarningInformation caseOffline = new ViolationWarningInformation();
+    	
+    	caseOffline.setId(Long.parseLong(delegateExecution.getProcessInstanceBusinessKey().split(":")[1]));
+
+    	caseOffline.setStatus(Integer.parseInt(state.getValue(delegateExecution).toString()));
+
+        SpringUtils.getBean(IViolationWarningInformationService.class).updateViolationCaseFile(caseOffline);
+    	
+        workflowUtils.sendDataToHisTory(delegateExecution, state);
+    	
+    	if("2".equals(state.getValue(delegateExecution))){
+        	SpringUtils.getBean(IActTaskService.class).deleteProcessById(delegateExecution.getProcessInstanceId());
+    	}
+    	
+    }
+}
@@ -3,6 +3,7 @@ package com.trash.workflow.service;
 import java.util.List;
 import java.util.Map;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import org.activiti.api.process.model.ProcessInstance;
 import com.trash.activiti.domain.dto.HistoryDataDTO;
@@ -92,4 +93,6 @@ public interface IWorkflowService
 	int createCaseFile(ViolationCaseFile violationCaseFile,int index);
+
+    int createCaseFile1(ViolationWarningInformation violationCaseFile, int index);
 }
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
 import org.activiti.api.process.runtime.ProcessRuntime;
@@ -249,6 +250,53 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
     }
+
+	@Override
+	@Transactional
+	public int createCaseFile1(ViolationWarningInformation caseFile, int index){ //违规预警案卷
+		ProcessInstance processInstance = null;
+		String title = "案卷号:" + caseFile.getNumber();
+		String flowType = "violation_warning";
+		try {
+
+			processInstance = processRuntime.start(ProcessPayloadBuilder
+					.start()
+					.withProcessDefinitionKey(flowType)
+					.withName(title)
+					.withBusinessKey(flowType + ":" + caseFile.getId())
+					.withVariable("route", index)
+					.build());
+
+
+			if(index == 0){
+				Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+
+				task.setAssignee(caseFile.getCompanyName());
+
+				taskService.saveTask(task);
+			}else{
+				updateProcess(processInstance,caseFile.getOwningRegion());
+			}
+
+
+
+			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(processInstance.getId());
+			workflow.setState("0");
+
+			return workflowMapper.insertWorkflow(workflow);
+		} catch (Exception e) {
+			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+			throw new RuntimeException(e);
+		}
+
+	}
     @Override