m

youxiw2000
1 parent 6d2ba61c
Showing 29 changed files with 2987 additions and 372 deletions
trash-framework/src/main/java/com/trash/framework/security/filter/JwtAuthenticationTokenFilter.java
trash-quartz/pom.xml
trash-ui/src/api/dict.js
trash-ui/src/router/index.js
trash-ui/src/utils/requestRemote.js
trash-ui/src/views/activiti/task/contractInfo.vue
trash-ui/src/views/activiti/task/earthsitesInfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/activiti/taskhistory/end.vue
trash-ui/src/views/activiti/taskhistory/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/business/truckActivate/index.vue
trash-ui/src/views/h5/task/constructsiteInfo.vue
trash-ui/src/views/h5/task/contractInfo.vue
trash-ui/src/views/h5/task/earthsitesInfo.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/task/taskCard.vue
trash-ui/src/views/h5/taskhistory/end.vue
trash-ui/src/views/h5/taskhistory/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
@@ -46,6 +46,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
             throws ServletException, IOException
     {
  
+    	
     	if(RemoteServerUtils.remote == null){
     		RemoteServerUtils.remote = trashConfig.getRemotePath();
     	}
@@ -44,6 +44,11 @@
             <artifactId>trash-workflow</artifactId>
         </dependency>
  
+        <dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka-clients</artifactId>
+			<version>2.4.1</version>
+		</dependency>
     </dependencies>
  
 </project>
 \ No newline at end of file
@@ -7,6 +7,19 @@ export function constructionById(id) {
   });
 }
  
+export function earthsitesById(id) {
+  return requestRemote({
+    url: '/api/siteservice/cs/earthsites/'+id,
+    method: 'get',
+  });
+}
+export function contractById(id) {
+  return requestRemote({
+    url: '/api/siteservice/cs/sitecontract/'+id,
+    method: 'get',
+  });
+}
+
 export function constructionsitesList(data) {
   return requestRemote({
     url: '/api/siteservice/cs/constructionsites/search',
@@ -202,24 +202,40 @@ export const constantRoutes = [
              name: '资源化利用情况',
              meta: { title: '资源化利用情况' }
            },
+      ],
+      }, {
+        path: '/h5',
+        component: Layout,
+        hidden: false,
+        children: [
+          {
+                 path: 'task',
+                 component: (resolve) => require(['@/views/h5/task/index'], resolve),
+                 name: '待办',
+                 meta: { title: '待办' }
+              } ,
+               {
+                 path: 'taskhistory',
+                 component: (resolve) => require(['@/views/h5/taskhistory/index'], resolve),
+                 name: '经办',
+                 meta: { title: '经办' }
+               },
+               {
+                 path: 'taskend',
+                 component: (resolve) => require(['@/views/h5/taskhistory/end'], resolve),
+                 name: '已办',
+                 meta: { title: '已办' }
+               },
  
+          ],
  
-      ],
       },
-
   {
     path: '/daily',
     component: Layout,
     hidden: false,
     children: [
       {
-        path: 'other/otherData',
-        component: (resolve) => require(['@/views/otherData/otherData'], resolve),
-        name: '日开工报表',
-        meta: { title: '日开工报表' }
-      },
-
-      {
         path: 'report/index',
         component: (resolve) => require(['@/views/daily/report/index'], resolve),
         name: '工作报表',
 import axios from 'axios'
 import { Notification, MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import { getToken,removeToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
+import { loginByToken } from '@/api/login'
  
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
  
@@ -33,16 +34,8 @@ service.interceptors.response.use(res =&gt; {
     // 获取错误信息
     const msg = errorCode[code] || res.data.msg || errorCode['default']
     if (code === 401) {
-      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
-      })
+
+
     } else if (code === 500) {
       Message({
         message: msg,
@@ -70,6 +63,16 @@ service.interceptors.response.use(res =&gt; {
     else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
+
+    if(message.indexOf("401") > -1){
+        removeToken();
+
+        location.reload();
+
+        return;
+    }
+
+
     Message({
       message: message,
       type: 'error',
+<template>
+  <div v-loading="loading" style="border: 1px solid black;">
+        <el-row  >
+          <el-col :span="6" class="bd">消纳场名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
+          <el-col :span="6" class="bd bd_left">工程名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
+        </el-row>
+        <el-row  >
+          <el-col :span="6" class="bd">消纳容量</el-col>
+          <el-col :span="6" class="bd">{{infoData.absorbCapacity}}</el-col>
+          <el-col :span="6" class="bd bd_left">垃圾类型</el-col>
+          <el-col :span="6" class="bd">{{infoData.typeName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">有效期开始时间</el-col>
+          <el-col :span="6" class="bd">{{infoData.startTime}}</el-col>
+          <el-col :span="6" class="bd bd_left">有效期结束时间</el-col>
+          <el-col :span="6" class="bd">{{infoData.endTime}}</el-col>
+        </el-row>
+        <el-row  >
+          <el-col :span="6" class="bd">消纳场名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
+          <el-col :span="6" class="bd bd_left">工程名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
+        </el-row>
+
+
+        <el-row  >
+          <el-col :span="6" class="bd">消纳合同编号</el-col>
+          <el-col :span="6" class="bd">{{infoData.contractNo}}</el-col>
+          <el-col :span="6" class="bd bd_left">合同状态</el-col>
+          <el-col :span="6" class="bd">{{infoData.contractStatusName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">线路名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.routeName}}</el-col>
+          <el-col :span="6" class="bd bd_left">线路宽度</el-col>
+          <el-col :span="6" class="bd">{{infoData.routeWidth}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">线路信息</el-col>
+          <el-col :span="6" class="bd">{{infoData.routePoints}}</el-col>
+          <el-col :span="6" class="bd bd_left">审核状态</el-col>
+          <el-col :span="6" class="bd">{{infoData.auditStatusName}}</el-col>
+        </el-row>
+
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    contractById,
+    getArea
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+        objectDict: {
+            constructionSiteID:"工地ID",
+            constructionSiteName:"工地名称",
+            earthSiteID:"消纳场ID",
+            earthSiteName:"消纳场名称",
+            absorbCapacity:"消纳容量",
+            startTime:"有效期开始时间 yyyy-mM-dd",
+            endTime:"有效期结束时间 yyyy-mM-dd",
+            type:"建筑垃圾类型ID",
+            typeName:"垃圾类型名称",
+            contractNo:"消纳合同编号",
+            routeName:"线路名称",
+            routeWidth:"线路宽度",
+            auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
+            auditStatusName:"审核状态名称",
+            contractStatus:"合同状态",
+            contractStatusName:"合同状态名称",
+            routePoints:"线路信息"},
+
+        infoData: {},
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        contractById(id).then(response => {
+
+           this.infoData = response.result;
+          // getArea().then(res => {
+          //   this.areas = res.result;
+          //   this.loading = false;
+          //   for (let i = 0; i < this.areas.length; i++) {
+          //     if (Number(this.infoData.place) == this.areas[i].code) {
+          //       this.infoData.place = this.areas[i].name;
+          //     }
+          //   }
+          // });
+
+          // for(let i in obj){
+          //   if(this.objectDict[i]){
+          //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+          //   }
+          // }
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
+<style>
+  .bd{
+    padding:5px;
+  }
+
+
+
+</style>
+<template>
+  <div v-loading="loading" style="border:1px solid black;">
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
+        </el-row>
+
+
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildCompany}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">建设单位地址</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildCompanyAddress}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.safetyAlertName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">洗车水枪数</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.washingGunNum}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
+        </el-row>
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    earthsitesById,
+    getArea,
+    getDict
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+
+        infoData: {},
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        earthsitesById(id).then(response => {
+
+           this.infoData = response.result;
+
+           let type = {"type":"CSDisSiteType"};
+           getDict(type).then(res=>{
+              debugger;
+                for(var i in res.result){
+
+               if(this.infoData.disposalType == res.result[i].code){
+                            this.infoData.disposalType = res.result[i].name;
+               }
+             }
+           });
+
+           type = {"type":"CSDisSiteProjectType"};
+           getDict(type).then(res=>{
+             for(var i in res.result){
+               if(this.infoData.projectType == res.result[i].code){
+                this.infoData.projectType = res.result[i].name;
+               }
+
+             }
+           });
+
+          // type = {"type":"CSDisSiteType"};
+          //  getDict(type).then(res=>{
+          //    for(var i in res.result){
+
+          //      // for(let j in this.infoData.buildWasteType.split(,)){
+
+
+
+          //      // }
+
+          //      // if(this.infoData.buildWasteType == res.result[i].code){
+
+          //      //   this.infoDate.buildWasteType = res.result[i].name;
+          //      // }
+
+          //    }
+
+          //  });
+
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
@@ -200,6 +200,23 @@
         </div>
     </el-dialog>
  
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
   </div>
 </template>
  
@@ -216,7 +233,6 @@
  
  
 import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  
   import {
     getArea,
@@ -236,6 +252,9 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
   } 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";
  
   export default {
     name: "task",
@@ -246,6 +265,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
       conferenceInfo,
       leaveApplicationInfo,
       constructsiteInfo,
+      earthsitesInfo,
+      contractInfo,
     },
     data() {
       return {
@@ -320,6 +341,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
         roles:[],
         depts:[],
         signDataInfo:null,
+        earthsites:false,
+        contract:false,
       };
     },
     created() {
@@ -457,6 +480,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
             });
             return;
           }
+          if(this.definitionKey == "workflow_earthsites"){
+            this.earthsites = true;
+            return;
+          }
+          if(this.definitionKey == "workflow_conract"){
+            this.contract = true;
+            return;
+          }
+
  
           this.open = true;
           this.title = "审批";
@@ -548,11 +580,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
               });
             }
             return;
-
         }
-
-
-
+      if(this.definitionKey == "workflow_conract"){
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.contract = false;
+            this.getList();
+          });
+        }
+      if(this.definitionKey == "workflow_earthsites"){
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.earthsites = false;
+            this.getList();
+          });
+        }
       },
       conferenceSubmitForm(value){
         return;
@@ -37,6 +37,23 @@
         </div>
       </div>
     </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
   </div>
 </template>
  
@@ -60,6 +77,8 @@ import {  getSignByObjId, addSign, updateSign } from &quot;@/api/sign/sign&quot;;
 import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
   import conferenceInfo from "@/views/office/conference/conferenceInfo";
   import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+  import contractInfo from "@/views/activiti/task/contractInfo";
  
  
   export default {
@@ -109,13 +128,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
         needShow:false,
         // 表单校验
         rules: {},
-        
+
         uploadImageDialog: false,
         conferenceOpen: false,
         construct:false,
         idInfo:null,
         leaveApplicationOpen:false,
         signData:null,
+        earthsites:false,
+        contract:false,
       };
     },
     created() {
@@ -147,6 +168,15 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
         this.resetForm("form");
       },
       showTask(row) {
+
+        this.needShow = false;
+        this.reset();
+        this.definitionKey = row.definitionKey;
+        this.businessKey = row.businessKey;
+        this.id = row.id;
+
+        this.title = "详情";
+
         if(this.definitionKey == "conference"){
           this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
           this.conferenceOpen = true;
@@ -165,22 +195,21 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
           });
           return;
         }
+          if(this.definitionKey == "workflow_earthsites"){
+            this.earthsites = true;
+            return;
+          }
+          if(this.definitionKey == "workflow_conract"){
+            this.contract = true;
+            return;
+          }
  
  
-        this.needShow = false;
-        this.reset();
-        this.definitionKey = row.definitionKey;
-        this.businessKey = row.businessKey;
-        this.id = row.id;
-
-        this.title = "详情";
-
         if(this.definitionKey == "workflow_threestep"){
           this.open2 = true;
           return;
         }
  
-        this.open = true;
       },
     }
   };
@@ -8,7 +8,7 @@
     <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
       <threestepInfo :businessKey="businessKey"  v-if="open2"/>
       </el-dialog>
-      
+
     <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
       <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
     </el-dialog>
@@ -21,6 +21,23 @@
     <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
       <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
     </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
   </div>
 </template>
  
@@ -47,6 +64,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
  
   import conferenceInfo from "@/views/office/conference/conferenceInfo";
   import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+  import contractInfo from "@/views/activiti/task/contractInfo";
  
  
  
@@ -103,6 +122,8 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
         idInfo:null,
         leaveApplicationOpen:false,
         signData:null,
+        earthsites:false,
+        contract:false,
       };
     },
     created() {
@@ -134,6 +155,14 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
         this.resetForm("form");
       },
       showTask(row,idx) {
+
+        this.needShow = false;
+        this.reset();
+        this.definitionKey = row.definitionKey;
+        this.businessKey = row.businessKey;
+        this.id = row.id;
+
+
         if(this.definitionKey == "conference"){
           this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
           this.conferenceOpen = true;
@@ -153,15 +182,29 @@ import constructsiteInfo from &quot;@/views/activiti/task/constructsiteInfo&quot;;
           return;
         }
  
+       if(this.definitionKey == "workflow_constructsite"){
+         getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
+             this.signData = res;
+             this.construct = true;
+         });
+         return;
+       }
+         if(this.definitionKey == "workflow_earthsites"){
+           this.earthsites = true;
+           return;
+         }
+         if(this.definitionKey == "workflow_conract"){
+           this.contract = true;
+           return;
+         }
+
+
+       if(this.definitionKey == "workflow_threestep"){
+         this.open2 = true;
+         return;
+       }
  
  
-        this.needShow = false;
-        this.reset();
-        this.definitionKey = row.definitionKey;
-        this.businessKey = row.businessKey;
-        this.id = row.id;
-        this.open2 = true;
-
  
  
  
@@ -541,7 +541,7 @@
           }
  
         }
-
+        this.form.contractId = item.id;
         this.bindname = this.form.earthsitesName;
       },
       checkCompany(item){
@@ -114,7 +114,7 @@
         </el-form-item>
         <el-form-item label="车牌号" prop="licensePlate">
             <el-select v-model="form.licensePlate" placeholder="请选择车辆">
-              <el-option  v-if="construction.companyTrucks.indexOf(item.id) == -1"
+              <el-option  v-if="!construction.companyTrucks || construction.companyTrucks.indexOf(item.id) == -1"
                         v-for="item in companyTruckList"
                         :label="item.licenseplateNo"
                         :value="item.licenseplateNo"
@@ -189,14 +189,14 @@ export default {
           message: '请填写完整',
           trigger: 'blur'
         }, ],
-        
+
         company: [{
           required: true,
           message: '请填写完整',
           trigger: 'blur'
         }, ],
-        
-        
+
+
         licensePlate: [{
           required: true,
           message: '请填写完整',
@@ -331,7 +331,6 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.form.id = row.id;
-      this.form.activateTime = new Date();
       updateTruckActivate(this.form).then(response => {
         this.msgSuccess("修改成功");
         this.open = false;
+<template>
+  <div v-loading="loading">
+
+    <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
+      <el-col :span="1" class="bd_padding">
+        勘察人员填写
+        </el-col>
+      <el-col :span="23" class="bd_left">
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">工程名称</el-col>
+          <el-col :span="6" class="bd_right bd_padding">{{infoData.name}}</el-col>
+          <el-col :span="6" class="bd_right bd_padding">施工地点</el-col>
+          <el-col :span="6">{{infoData.address}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">所在区域</el-col>
+          <el-col :span="6" class="bd_right bd_padding">{{infoData.areaCodeName}}</el-col>
+          <el-col :span="6" class="bd_right bd_padding">作业区域</el-col>
+          <el-col :span="6">{{infoData.workAreaCodeName}}</el-col>
+        </el-row>
+
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">建设单位</el-col>
+          <el-col :span="6" class="bd_right bd_padding">{{infoData.constructionCompany}}</el-col>
+          <el-col :span="6" class="bd_right bd_padding">负责人</el-col>
+          <el-col :span="6">{{infoData.constructionCompanyPerson}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">施工单位</el-col>
+          <el-col :span="6" class="bd_right bd_padding">{{infoData.projectCompany}}</el-col>
+          <el-col :span="6" class="bd_right bd_padding">现场责任人</el-col>
+          <el-col :span="6">{{infoData.projectCompanyPerson}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">运输单位</el-col>
+          <el-col :span="6" class="bd_right bd_padding">{{infoData.transportCompany}}</el-col>
+          <el-col :span="6" class="bd_right bd_padding">负责人</el-col>
+          <el-col :span="6">{{infoData.transportCompanyPerson}}</el-col>
+        </el-row>
+
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">申报处置量</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.reportingCapacity}}</el-col>
+        </el-row>
+
+
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">施工期限</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
+        </el-row>
+
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">视频监控设施设备</el-col>
+          <el-col :span="18" class="bd_padding">球机({{infoData.monitorBall}})台 枪机({{infoData.monitorGun}})台</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" >洗车作业平台及配套设施设备情况</el-col>
+          <el-col :span="18" class="bd_left">
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">过水槽</el-col>
+              <el-col :span="18" class="bd_padding">
+                长度({{infoData.waterTroughLength}}米)
+                宽度({{infoData.waterTroughWidth}}米)
+              </el-col>
+            </el-row>
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">自动洗车机</el-col>
+              <el-col :span="18" class="bd_padding">
+                长度({{infoData.carWasherLength}}米)
+                宽度({{infoData.carWasherWidth}}米)
+                挡板高度({{infoData.carWasherHeight}}米)
+                自动感应装置({{infoData.carWasherResponseName}})
+              </el-col>
+            </el-row>
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">人工冲洗</el-col>
+              <el-col :span="18" class="bd_padding">
+                长度({{infoData.ManualFlushingLength}}米)
+                水枪({{infoData.waterGun}}把)
+              </el-col>
+            </el-row>
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">缓冲区</el-col>
+              <el-col :span="18" class="bd_padding">
+                缓冲区({{infoData.buffer}}米)
+              </el-col>
+            </el-row>
+            <el-row >
+              <el-col :span="6" class="bd_right bd_padding">照明设施</el-col>
+              <el-col :span="18" class="bd_padding">
+                照明设施({{infoData.lightingFacilities}}盏)
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" >申报资料</el-col>
+          <el-col :span="18" class="bd_left">
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">《长沙市城市营理和综合执法局政务服务事项办理申清表》</el-col>
+              <el-col :span="6" class="bd_padding">√
+              </el-col>
+              <el-col :span="6" class="bd_left bd_right" style="height: 80px;">用地证明材料</el-col>
+              <el-col :span="6" class="bd_padding">√
+              </el-col>
+            </el-row>
+            <el-row class="bd_bottom">
+              <el-col :span="6" class="bd_right bd_padding">建筑垃圾处置方案</el-col>
+              <el-col :span="6" class="bd_right bd_padding">√
+              </el-col>
+              <el-col :span="6" class="bd_right bd_padding">建设工程施工合同</el-col>
+              <el-col :span="6" class="bd_padding">√
+              </el-col>
+            </el-row>
+            <el-row >
+             <el-col :span="6" class="bd_right bd_padding">消纳处置合同</el-col>
+             <el-col :span="6" class="bd_right bd_padding">√
+             </el-col>
+             <el-col :span="6" class="bd_right bd_padding">建设垃圾运输合同</el-col>
+             <el-col :span="6" class="bd_padding">√
+             </el-col>
+            </el-row>
+
+          </el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.earthName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
+          <el-col :span="18" class="bd_padding"></el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+
+
+    <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign1">
+      <el-col :span="1" class="bd_padding bd_right"  >部门意见</el-col>
+        <el-col :span="23" >
+          <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
+          <el-row >
+            <label style="float: right;">勘察人:<img :src="signData.sign1" /></label>
+          </el-row>
+      </el-col>
+    </el-row>
+
+    <el-row class="bd_left bd_right bd_bottom"  v-if="signData.sign2">
+      <el-col :span="1" class="bd_padding bd_right">主管领导意见</el-col>
+        <el-col :span="23" >
+          <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
+          <el-row >
+            <label style="float: right;">签字:<img :src="signData.sign2" />{{signData.sign2Time}}</label>
+          </el-row>
+      </el-col>
+    </el-row>
+
+    <el-row class="bd_left bd_right"  v-if="signData.sign3">
+      <el-col :span="1" class="bd_padding bd_right">分管领导意见</el-col>
+        <el-col :span="23" >
+          <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
+          <el-row >
+            <label style="float: right;">签字:<img :src="signData.sign3" />{{signData.sign3Time}}</label>
+          </el-row>
+      </el-col>
+    </el-row>
+
+    <el-row class="bd_left bd_right" style="border: 1px solid black;"  v-if="signData.sign4">
+      <el-col :span="1" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
+        <el-col :span="23" >
+          <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
+          <el-row >
+            <label style="float: right;">签字:<img :src="signData.sign4" />{{signData.sign4Time}}</label>
+          </el-row>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    constructionById,
+    getArea
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+      signData:{},
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+        objectDict: {
+          id: "工地id",
+          name: "工地名称",
+          certificateNo: "证书编号",
+          address: "施工地址",
+          monitorModel: "监控模式",
+          workAreaCode: "作业区域",
+          areaCode: "管辖区",
+          projectType: "工程类型",
+          cargoId: "建筑垃圾类型",
+          constructionCompany: "建设单位",
+          constructionCompanyAddress: "建设单位地址",
+          constructionCompanyPerson: "建设单位责任人",
+          constructionCompanyPhone: "建设单位联系电话",
+          transportCompanyId: "运输企业单位",
+          transportCompany: "运输企业单位",
+          transportCompanyAddress: "运输单位地址",
+          transportCompanyPerson: "运输单位负责人",
+          transportCompanyPhone: "运输单位联系电话",
+          projectCompany: "施工单位",
+          projectCompanyAddress: "施工单位地址",
+          projectCompanyPerson: "施工单位责任人",
+          projectnCompanyPhone: "施工单位联系电话",
+          principal: "现场负责人",
+          reportingCapacity: "申报容量(m³)",
+          effectiveFrom: "有效期开始时间",
+          effectiveEnd: "有效期结束时间",
+          transportStartTime: "运输开始时间",
+          transportEndTime: "运输结束时间",
+          monitorBall: "视频监控设施设备 球机(台)",
+          monitorGun: "视频监控设施设备 枪机(台)",
+          waterTroughLength: "过水槽 长度(米)",
+          waterTroughWidth: "过水槽 宽度(米)",
+          carWasherLength: "自动洗车机 长度(米)",
+          carWasherWidth: "自动洗车机 宽度(米)",
+          carWasherHeight: "自动洗车机 挡板高度(米)",
+          carWasherResponse: "自动洗车机 感应装置",
+          ManualFlushingLength: "人工冲洗 长度(米)",
+          waterGun: "水枪(把)",
+          buffer: "缓冲区(米)",
+          lightingFacilities: "照明设施(盏)",
+          washingPlatform: "洗车平台",
+          washingGunNum: "洗车水枪数",
+          electricRailings: "电动栏杆",
+          hydroelectricity: "水电情况",
+          exitRoadConditions: "出口道路状况",
+          projectProgress: "工程进度情况",
+          constructionEnclosure: "施工围挡",
+          siteInvestmentType: "工地投资类型",
+          deductionPercentage: "减免百分比",
+          deductionBasis: "减免依据",
+          circuitId: "线路图",
+          polygonId: "电子围栏ID",
+          earthId: "消纳场地ID",
+          earthName: "消纳场地",
+          applyOpinion: "申请意见",
+          surveyor: "勘察人员",
+          candidates: "待选人员"
+        },
+        infoData: [],
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        constructionById(id).then(response => {
+
+          this.infoData = response.result;
+          getArea().then(res => {
+            this.areas = res.result;
+            this.loading = false;
+            for (let i = 0; i < this.areas.length; i++) {
+              if (Number(this.infoData.place) == this.areas[i].code) {
+                this.infoData.place = this.areas[i].name;
+              }
+            }
+          });
+
+          // for(let i in obj){
+          //   if(this.objectDict[i]){
+          //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+          //   }
+          // }
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
+<style>
+  .bd_padding{
+
+    padding:5px;
+  }
+
+  .bd_right {
+    border-right: 1px solid black;
+    height: 100%;
+  }
+
+  .bd_left {
+    border-left: 1px solid black;
+  }
+
+  .bd_top {
+    border-top: 1px solid black;
+  }
+
+  .bd_bottom {
+    border-bottom: 1px solid black;
+  }
+</style>
+<template>
+  <div v-loading="loading" style="border: 1px solid black;">
+        <el-row  >
+          <el-col :span="6" class="bd">消纳场名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
+          <el-col :span="6" class="bd bd_left">工程名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
+        </el-row>
+        <el-row  >
+          <el-col :span="6" class="bd">消纳容量</el-col>
+          <el-col :span="6" class="bd">{{infoData.absorbCapacity}}</el-col>
+          <el-col :span="6" class="bd bd_left">垃圾类型</el-col>
+          <el-col :span="6" class="bd">{{infoData.typeName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">有效期开始时间</el-col>
+          <el-col :span="6" class="bd">{{infoData.startTime}}</el-col>
+          <el-col :span="6" class="bd bd_left">有效期结束时间</el-col>
+          <el-col :span="6" class="bd">{{infoData.endTime}}</el-col>
+        </el-row>
+        <el-row  >
+          <el-col :span="6" class="bd">消纳场名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.earthSiteName}}</el-col>
+          <el-col :span="6" class="bd bd_left">工程名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.constructionSiteName}}</el-col>
+        </el-row>
+
+
+        <el-row  >
+          <el-col :span="6" class="bd">消纳合同编号</el-col>
+          <el-col :span="6" class="bd">{{infoData.contractNo}}</el-col>
+          <el-col :span="6" class="bd bd_left">合同状态</el-col>
+          <el-col :span="6" class="bd">{{infoData.contractStatusName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">线路名称</el-col>
+          <el-col :span="6" class="bd">{{infoData.routeName}}</el-col>
+          <el-col :span="6" class="bd bd_left">线路宽度</el-col>
+          <el-col :span="6" class="bd">{{infoData.routeWidth}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd">线路信息</el-col>
+          <el-col :span="6" class="bd">{{infoData.routePoints}}</el-col>
+          <el-col :span="6" class="bd bd_left">审核状态</el-col>
+          <el-col :span="6" class="bd">{{infoData.auditStatusName}}</el-col>
+        </el-row>
+
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    contractById,
+    getArea
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+        objectDict: {
+            constructionSiteID:"工地ID",
+            constructionSiteName:"工地名称",
+            earthSiteID:"消纳场ID",
+            earthSiteName:"消纳场名称",
+            absorbCapacity:"消纳容量",
+            startTime:"有效期开始时间 yyyy-mM-dd",
+            endTime:"有效期结束时间 yyyy-mM-dd",
+            type:"建筑垃圾类型ID",
+            typeName:"垃圾类型名称",
+            contractNo:"消纳合同编号",
+            routeName:"线路名称",
+            routeWidth:"线路宽度",
+            auditStatus:"审核状态 0-审核中 1-审核通过 2-审核驳回",
+            auditStatusName:"审核状态名称",
+            contractStatus:"合同状态",
+            contractStatusName:"合同状态名称",
+            routePoints:"线路信息"},
+
+        infoData: {},
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        contractById(id).then(response => {
+
+           this.infoData = response.result;
+          // getArea().then(res => {
+          //   this.areas = res.result;
+          //   this.loading = false;
+          //   for (let i = 0; i < this.areas.length; i++) {
+          //     if (Number(this.infoData.place) == this.areas[i].code) {
+          //       this.infoData.place = this.areas[i].name;
+          //     }
+          //   }
+          // });
+
+          // for(let i in obj){
+          //   if(this.objectDict[i]){
+          //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+          //   }
+          // }
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
+<style>
+  .bd{
+    padding:5px;
+  }
+
+
+
+</style>
+<template>
+  <div v-loading="loading" style="border:1px solid black;">
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场编号</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.number}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">设计消纳场容量(m³)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.capacity}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.typeName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">区属</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.areaName}}</el-col>
+        </el-row>
+
+
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">消纳场面积(㎡)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.area}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">日处理能力(m³)</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.dayAbility}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">处置类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.disposalType}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">建筑垃圾类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildWasteTypeName}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">卸土费金额</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.unloadingPrice}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">证书编号</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.certificateNo}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom" >
+          <el-col :span="6" class="bd_right bd_padding">工程类型</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.projectType}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">作业区域</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.workAreaName}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">线路名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.routeName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">线路宽度</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.routeWidth}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">建设单位名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildCompany}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">建设单位地址</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.buildCompanyAddress}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">洗车平台</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.washingPlatform}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">出口道路状况</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.exitRoadConditions}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">安全警示</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.safetyAlertName}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">洗车水枪数</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.washingGunNum}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">排水沟</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.drainageDitch}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">沉淀池</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.sedimentationTank}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">电动栏杆</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.electricRailings}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">水电</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.hydroelectricity}}</el-col>
+        </el-row>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">其他情形</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.otherSituations}}</el-col>
+          <el-col :span="6" class="bd_left bd_right bd_padding">填表人名称</el-col>
+          <el-col :span="6" class="bd_padding">{{infoData.filledByName}}</el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="6" class="bd_right bd_padding">申请意见</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.applyOpinion}}</el-col>
+        </el-row>
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+  import {
+    getToken
+  } from "@/utils/auth";
+
+
+  import {
+    earthsitesById,
+    getArea,
+    getDict
+  } from "@/api/dict";
+
+
+  export default {
+    name: "ThreestepInfo",
+    props: {
+      businessKey: {
+        type: String
+      },
+    },
+    data() {
+      return {
+        sign: store.getters.avatar, //裁剪图片的地址
+        areas: [],
+        loading: null,
+
+        infoData: {},
+      }
+    },
+    created() {
+      this.loading = true;
+      this.getInfo();
+
+    },
+    methods: {
+      getInfo() {
+        let id;
+        if (this.businessKey.split(":").length == 2) {
+          id = this.businessKey.split(":")[1];
+        } else {
+          id = this.businessKey;
+        }
+
+        earthsitesById(id).then(response => {
+
+           this.infoData = response.result;
+
+           let type = {"type":"CSDisSiteType"};
+           getDict(type).then(res=>{
+              debugger;
+                for(var i in res.result){
+
+               if(this.infoData.disposalType == res.result[i].code){
+                            this.infoData.disposalType = res.result[i].name;
+               }
+             }
+           });
+
+           type = {"type":"CSDisSiteProjectType"};
+           getDict(type).then(res=>{
+             for(var i in res.result){
+               if(this.infoData.projectType == res.result[i].code){
+                this.infoData.projectType = res.result[i].name;
+               }
+
+             }
+           });
+
+          // type = {"type":"CSDisSiteType"};
+          //  getDict(type).then(res=>{
+          //    for(var i in res.result){
+
+          //      // for(let j in this.infoData.buildWasteType.split(,)){
+
+
+
+          //      // }
+
+          //      // if(this.infoData.buildWasteType == res.result[i].code){
+
+          //      //   this.infoDate.buildWasteType = res.result[i].name;
+          //      // }
+
+          //    }
+
+          //  });
+
+          this.loading = false;
+        });
+      },
+    }
+
+  }
+</script>
+<template>
+  <div class="app-container">
+    <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
+      <el-option v-for="item in depts" :label="item.name"
+                  :value="item.code" :key="item.code" >
+      </el-option>
+    </el-select>
+    <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
+      <el-option v-for="item in roles" :label="item.name"
+                  :value="item.code" :key="item.code" >
+      </el-option>
+    </el-select>
+
+
+    <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
+
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
+      <threestepInfo :businessKey="businessKey" v-if="open2" />
+      <el-form v-if="taskName == '巡查'" :rules="rules" label-width="120px">
+        <el-row type="flex" justify="center">
+          <el-col>
+            <el-form-item label="补充说明">
+              <el-input type="textarea" v-model="form.subReason" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col :span="12">
+            <el-form-item label="渣管负责人">
+              <el-input v-model="form.earthPipPerson" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执法负责人">
+              <el-input v-model="form.enforcePerson" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col>
+            上传补充材料:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center" style="margin-top: 20px;">
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
+            <el-input v-model="form.sub_img0" type="hidden"></el-input>
+            <p v-for="img in form.sub_img0">{{img.split(":")[0]}}<a @click="removeImage(0,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
+            <el-input v-model="form.sub_img1" type="hidden"></el-input>
+            <p v-for="img in form.sub_img1">{{img.split(":")[0]}}<a @click="removeImage(1,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
+            <el-input v-model="form.sub_img2" type="hidden"></el-input>
+            <p v-for="img in form.sub_img2">{{img.split(":")[0]}}<a @click="removeImage(2,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
+            <el-input v-model="form.sub_img3" type="hidden"></el-input>
+            <p v-for="img in form.sub_img3">{{img.split(":")[0]}}<a @click="removeImage(3,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
+            <el-input v-model="form.sub_img4" type="hidden"></el-input>
+            <p v-for="img in form.sub_img4">{{img.split(":")[0]}}<a @click="removeImage(4,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
+            <el-input v-model="form.sub_img5" type="hidden"></el-input>
+            <p v-for="img in form.sub_img5">{{img.split(":")[0]}}<a @click="removeImage(5,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
+            <el-input v-model="form.sub_img6" type="hidden"></el-input>
+            <p v-for="img in form.sub_img6">{{img.split(":")[0]}}<a @click="removeImage(6,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
+            <el-input v-model="form.sub_img7" type="hidden"></el-input>
+            <p v-for="img in form.sub_img7">{{img.split(":")[0]}}<a @click="removeImage(7,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
+            <el-input v-model="form.sub_img8" type="hidden"></el-input>
+            <p v-for="img in form.sub_img8">{{img.split(":")[0]}}<a @click="removeImage(8,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
+            <el-input v-model="form.sub_img9" type="hidden"></el-input>
+            <p v-for="img in form.sub_img9">{{img.split(":")[0]}}<a @click="removeImage(9,img)" style="color:red"> x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
+            <el-input v-model="form.sub_img10" type="hidden"></el-input>
+            <p v-for="img in form.sub_img10">{{img.split(":")[0]}}<a @click="removeImage(10,img)" style="color:red">
+                x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
+            <el-input v-model="form.sub_img11" type="hidden"></el-input>
+            <p v-for="img in form.sub_img11">{{img.split(":")[0]}}<a @click="removeImage(11,img)" style="color:red">
+                x</a>
+            </p>
+          </el-col>
+          <el-col :span="4">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
+            <el-input v-model="form.sub_img12" type="hidden"></el-input>
+            <p v-for="img in form.sub_img12">{{img.split(":")[0]}}<a @click="removeImage(12,img)" style="color:red">
+                x</a>
+            </p>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+
+
+    <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
+      <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
+        :on-success="uploadSuccess" :before-upload="beforeUpload">
+        <el-button size="small" type="primary">选择附件</el-button>
+        <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word文件</div>
+      </el-upload>
+      <div style="height: 40px;width:100%;">
+        <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
+      <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" />
+    </el-dialog>
+    <!--  会议管理  -->
+    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
+      <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+      <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
+          <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!--  请假申请  -->
+    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
+      <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
+      <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
+          <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
+      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
+      <el-row>
+
+      <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
+      </el-row>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<style>
+  @import '../../../assets/css/task.css'
+</style>
+
+<script>
+  import {
+    listTask,
+    formDataShow,
+    formDataSave
+  } from "@/api/activiti/task";
+
+
+import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
+
+  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/h5/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";
+
+  export default {
+    name: "task",
+    components: {
+      taskCard,
+      leaveHistoryForm,
+      threestepInfo,
+      conferenceInfo,
+      leaveApplicationInfo,
+      constructsiteInfo,
+      earthsitesInfo,
+      contractInfo,
+    },
+    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: [],
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
+        },
+        uploadImageDialog: false,
+        conferenceOpen: false,
+        construct:false,
+        idInfo:null,
+        leaveApplicationOpen:false,
+        signData:null,
+        areas:[],
+        roles:[],
+        depts:[],
+        signDataInfo:null,
+        earthsites:false,
+        contract:false,
+      };
+    },
+    created() {
+      let dep =  {type:"CSUserDepartmentType"};
+
+      getDict(dep).then(res=>{
+          this.depts = res.result;
+      });
+
+      let role =  {type:"CSUserPostType"};
+
+      getDict(role).then(res=>{
+          this.roles = res.result;
+      });
+
+      this.getList();
+    },
+    methods: {
+      handleClose() {
+        this.uploadImageDialog = false;
+        this.fileList = [];
+      },
+      removeImage(index, img) {
+        let target = "sub_img" + this.picIndex;
+        this.form[target].splice(this.form[target].indexOf(img), 1);
+      },
+      uploadSuccess(res, file, fileList) {
+        let target = "sub_img" + this.picIndex;
+        if (!this.form[target]) {
+          this.form[target] = [];
+        }
+        this.form[target].push(file.name + ':' + res);
+
+      },
+      showFileUpload(i) {
+        this.uploadImageDialog = true;
+        this.picIndex = i;
+      },
+      beforeUpload(file) {
+        let isRightSize = file.size / 1024 / 1024 < 20
+        if (!isRightSize) {
+          this.$message.error('文件大小超过 20MB')
+          return isRightSize;
+        }
+        let isAccept = false;
+        if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
+          .name.indexOf('.pdf') > -1) {
+          isAccept = true;
+        }
+        if (!isAccept) {
+          this.$message.error('应该选择PDF、JPG、WORD类型的文件')
+          return isAccept;
+        }
+      },
+      getList() {
+        this.loading = true;
+        listTask(this.queryParams).then(response => {
+          this.taskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.open2 = false;
+        this.leaveApplicationOpen= false;
+        this.conferenceOpen = false;
+        this.construct = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.definitionKey = '',
+          this.businessKey = '',
+          this.form = {
+            formData: [],
+          };
+        this.resetForm("form");
+      },
+      showTask(row, idx) {
+        this.reset();
+        this.definitionKey = row.definitionKey;
+        this.businessKey = row.businessKey;
+        this.id = row.id;
+        this.taskName = row.name;
+        formDataShow(row.id).then(response => {
+          let datas = response.data;
+          let formData = []
+          for (let i = 0; i < datas.length; i++) {
+            let strings = datas[i].split('--__!!')
+            let controlValue = null
+            let controlDefault = null
+            switch (strings[1]) {
+              case 'radio':
+                controlValue = idx;
+                controlDefault = strings[4]
+                break;
+                // default:
+            }
+            formData.push({
+              controlId: strings[0],
+              controlType: strings[1],
+              controlLable: strings[2],
+              controlIsParam: strings[3],
+              controlValue: controlValue,
+              controlDefault: controlDefault
+            })
+          }
+          this.form.formData = formData;
+
+          if (this.definitionKey == "workflow_threestep") {
+            this.open2 = true;
+            return;
+          }
+          if(this.definitionKey == "conference"){
+            this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
+            this.conferenceOpen = true;
+            return;
+          }
+          if(this.definitionKey == "workflow_leave"){
+            this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
+            this.leaveApplicationOpen = true;
+            return;
+          }
+
+          if(this.definitionKey == "workflow_constructsite"){
+            getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
+
+                this.signDataInfo = "经现场查勘及核对资料，现场设施基本达到净车出场标准，建议按程序办理相关手续，妥否，请批示。";
+
+                this.signData = res.data;
+                this.construct = true;
+            });
+            return;
+          }
+          if(this.definitionKey == "workflow_earthsites"){
+            this.earthsites = true;
+            return;
+          }
+          if(this.definitionKey == "workflow_conract"){
+            this.contract = true;
+            return;
+          }
+
+
+          this.open = true;
+          this.title = "审批";
+        });
+      },
+      /** 提交按钮 */
+      submitForm(formid, value) {
+
+        this.form.formData[0].controlValue = value;
+        this.form.formData[0].controlId = formid;
+        this.form.id = this.businessKey.split(":")[1];
+        if (this.form.formData[0].controlValue == 0) {
+          this.form.status = 1;
+        } else {
+          this.form.status = 2;
+        }
+
+        if (this.definitionKey == "workflow_threestep") {
+
+
+          for (let i = 0; i < 13; i++) {
+            if (this.form["sub_img" + i]) {
+              let paths = "";
+              for (var j = 0; j < this.form["sub_img" + i].length; j++) {
+                paths += this.form["sub_img" + i][j].split(":")[1] + ",";
+              }
+              this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
+            }
+          }
+
+          this.form.checkTime = new Date();
+          if (this.form.status == 1) {
+            activeThreestep(this.form).then(res => {
+              formDataSave(this.id, this.form.formData).then(response => {
+                this.msgSuccess("审批成功");
+                this.open2 = false;
+                this.taskList = [];
+                this.getList();
+              });
+            });
+          } else {
+            updateThreestep(this.form).then(res => {
+              formDataSave(this.id, this.form.formData).then(response => {
+                this.msgSuccess("审批成功");
+                this.open2 = false;
+                this.taskList = [];
+                this.getList();
+              });
+            });
+          }
+          return;
+        }
+
+        if(this.definitionKey == "workflow_constructsite"){
+            if(this.form.status == 1){
+                let objId = this.businessKey.split(":")[1];
+                let query = {
+                  objectId : objId,
+                };
+                if(this.taskName == "勘察科员"){
+                  query.idx = 0;
+                  query.sign1Text = this.signDataInfo;
+                }else if(this.taskName == "堪察部长"){
+                  query.idx = 1;
+                  query.sign2Text = this.signDataInfo;
+                }else if(this.taskName == "堪察分管领导"){
+                  query.idx = 2;
+                  query.sign3Text = this.signDataInfo;
+                }else if(this.taskName == "中心负责人"){
+                  query.idx = 3;
+                  query.sign4Text = this.signDataInfo;
+                }
+
+                addSign(query).then(res=>{
+                  formDataSave(this.id, this.form.formData).then(response => {
+                    this.msgSuccess("审批成功");
+                    this.open = false;
+                    this.construct = false;
+                    this.getList();
+                  });
+                })
+
+            }else{
+
+              formDataSave(this.id, this.form.formData).then(response => {
+                this.msgSuccess("审批成功");
+                this.construct = false;
+                this.getList();
+              });
+            }
+            return;
+        }
+      if(this.definitionKey == "workflow_conract"){
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.contract = false;
+            this.getList();
+          });
+        }
+      if(this.definitionKey == "workflow_earthsites"){
+          formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.earthsites = false;
+            this.getList();
+          });
+        }
+      },
+      conferenceSubmitForm(value){
+        return;
+        this.form.formData[0].controlValue = value;
+        if(value==0){
+          this.form.status = 1;
+        }else{
+          this.form.status = 2;
+        }
+        //审批or驳回
+        formDataSave(this.id, this.form.formData).then(response => {
+            this.msgSuccess("审批成功");
+            this.conferenceOpen = false;
+            this.taskList = [];
+            this.getList();
+        });
+      },
+      leaveApplicationSubmitForm(value){
+        if(value==0){
+          this.form.status = 1;
+        }else{
+          this.form.status = 2;
+        }
+        this.form.formData[0].controlValue = value;
+        //审批or驳回
+        formDataSave(this.id, this.form.formData).then(response => {
+          this.msgSuccess("审批成功");
+          this.leaveApplicationOpen = false;
+          this.taskList = [];
+          this.getList();
+        });
+      }
+    }
+  };
+</script>
+
+
+<style scoped>
+  div{
+    font-size:12px;
+  }
+
+</style>
+<template>
+   <a @click="sendToParent(task)"><el-card class="box-card">
+    <div :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='1',agree:task.checkStatus=='0'}">
+      {{task.checkStatus? task.checkStatus=="0"?"已同意":"已拒绝" : "待审批"}}</div>
+
+    <el-row class="card_row">
+      <div class="card_title">{{task.instanceName}}</div>
+    </el-row>
+
+    <el-row class="card_row">
+      <el-col :span="24" class="card_grid">
+        <div>时间: {{task.startTime}} - {{task.endTime}}</div>
+      </el-col>
+
+      </el-row>
+      <el-row class="card_row">
+      <el-col :span="24" class="card_grid">
+        <div>申请类型: {{task.type}}</div>
+      </el-col>
+    </el-row>
+    <el-row class="card_row">
+      <el-col :span="24">
+        <div>申请理由: {{task.reason}}</div>
+      </el-col>
+    </el-row>
+  </el-card></a>
+</template>
+
+<script>
+  export default {
+    name: "taskCard",
+    props: {
+      task: {
+        type: Object
+      },
+    },
+
+    data() {
+      return {
+
+        threestep_type:{
+          "0":"工地",
+          "1":"消纳场",
+        },
+      }
+    },
+    created() {
+
+      if (this.task.definitionKey == "workflow_threestep") {
+          this.task.type = this.threestep_type[this.task.type];
+      }
+    },
+    methods: {
+      sendToParent(task) {
+        this.$emit("sendToParent", task);
+      },
+
+    }
+  }
+</script>
+
+<style scoped>
+
+.card_row{
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+</style>
+<template>
+  <div class="app-container">
+
+    <taskCard :task="task"  v-for="task in taskList" @sendToParent="showTask"/>
+
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
+      <threestepInfo :businessKey="businessKey"  v-if="open2"/>
+
+      </el-dialog>
+    <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
+      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+    <!--  会议管理  -->
+    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
+      <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+      <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
+          <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!--  请假申请  -->
+    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
+      <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
+      <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
+          <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+
+<style>
+  @import '../../../assets/css/task.css'
+</style>
+
+<script>
+  import {
+    listEndTask,
+    formDataShow
+  } from "@/api/activiti/taskhistory";
+
+  import taskCard from "@/views/activiti/task/taskCard";
+  import earthSitesForm from "@/views/workflow/earthSitesForm";
+  import threestepInfo from "@/views/business/threestep/threestepInfo";
+
+
+import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
+import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
+  import conferenceInfo from "@/views/office/conference/conferenceInfo";
+  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+  import contractInfo from "@/views/activiti/task/contractInfo";
+
+
+  export default {
+    name: "taskHistory",
+    components: {
+      taskCard,
+      threestepInfo,
+      earthSitesForm,
+      leaveApplicationInfo,
+      conferenceInfo,
+      constructsiteInfo
+    },
+    data() {
+      return {
+        id: '',
+        definitionKey: '',
+        businessKey: '',
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 请假表格数据
+        taskList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+
+        open2:false,
+        // 表单参数
+        form: {
+          formData: []
+        },
+        needShow:false,
+        // 表单校验
+        rules: {},
+
+        uploadImageDialog: false,
+        conferenceOpen: false,
+        construct:false,
+        idInfo:null,
+        leaveApplicationOpen:false,
+        signData:null,
+        earthsites:false,
+        contract:false,
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询请假列表 */
+      getList() {
+        this.loading = true;
+        listEndTask(this.queryParams).then(response => {
+          this.taskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.definitionKey = '',
+          this.businessKey = '',
+          this.form = {
+            formData: [],
+          };
+        this.resetForm("form");
+      },
+      showTask(row) {
+
+        this.needShow = false;
+        this.reset();
+        this.definitionKey = row.definitionKey;
+        this.businessKey = row.businessKey;
+        this.id = row.id;
+
+        this.title = "详情";
+
+        if(this.definitionKey == "conference"){
+          this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
+          this.conferenceOpen = true;
+          return;
+        }
+        if(this.definitionKey == "workflow_leave"){
+          this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
+          this.leaveApplicationOpen = true;
+          return;
+        }
+
+        if(this.definitionKey == "workflow_constructsite"){
+          getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
+              this.signData = res;
+              this.construct = true;
+          });
+          return;
+        }
+          if(this.definitionKey == "workflow_earthsites"){
+            this.earthsites = true;
+            return;
+          }
+          if(this.definitionKey == "workflow_conract"){
+            this.contract = true;
+            return;
+          }
+
+
+        if(this.definitionKey == "workflow_threestep"){
+          this.open2 = true;
+          return;
+        }
+
+      },
+    }
+  };
+</script>
+<template>
+  <div class="app-container">
+
+    <taskCard :task="task"  v-for="task in taskList" @sendToParent="showTask"/>
+
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
+      <threestepInfo :businessKey="businessKey"  v-if="open2"/>
+      </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
+      <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
+    </el-dialog>
+    <!--  会议管理  -->
+    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
+      <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
+    </el-dialog>
+
+    <!--  请假申请  -->
+    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
+      <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+      <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+      <contractInfo :businessKey="businessKey"  v-if="contract" />
+      <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+          <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<style>
+  @import '../../../assets/css/task.css'
+</style>
+
+<script>
+  import {
+    listTask,
+    formDataShow
+  } from "@/api/activiti/taskhistory";
+
+
+
+
+  import taskCard from "@/views/activiti/task/taskCard";
+  import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
+  import threestepInfo from "@/views/business/threestep/threestepInfo";
+
+
+import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
+import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
+
+  import conferenceInfo from "@/views/office/conference/conferenceInfo";
+  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+  import contractInfo from "@/views/activiti/task/contractInfo";
+
+
+
+  export default {
+    name: "taskHistory",
+    components: {
+      taskCard,
+      leaveHistoryForm,
+      threestepInfo,
+      leaveApplicationInfo,
+      conferenceInfo,
+      constructsiteInfo,
+    },
+    data() {
+      return {
+        id: '',
+        definitionKey: '',
+        businessKey: '',
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 请假表格数据
+        taskList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        open2:false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 表单参数
+        form: {
+          formData: []
+        },
+        needShow:false,
+        // 表单校验
+        rules: {},
+
+        uploadImageDialog: false,
+        conferenceOpen: false,
+        construct:false,
+        idInfo:null,
+        leaveApplicationOpen:false,
+        signData:null,
+        earthsites:false,
+        contract:false,
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询请假列表 */
+      getList() {
+        this.loading = true;
+        listTask(this.queryParams).then(response => {
+          this.taskList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.definitionKey = '',
+          this.businessKey = '',
+          this.form = {
+            formData: [],
+          };
+        this.resetForm("form");
+      },
+      showTask(row,idx) {
+
+        this.needShow = false;
+        this.reset();
+        this.definitionKey = row.definitionKey;
+        this.businessKey = row.businessKey;
+        this.id = row.id;
+
+
+        if(this.definitionKey == "conference"){
+          this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
+          this.conferenceOpen = true;
+          return;
+        }
+        if(this.definitionKey == "workflow_leave"){
+          this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
+          this.leaveApplicationOpen = true;
+          return;
+        }
+
+        if(this.definitionKey == "workflow_constructsite"){
+          getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
+              this.signData = res;
+              this.construct = true;
+          });
+          return;
+        }
+
+       if(this.definitionKey == "workflow_constructsite"){
+         getSignByObjId(this.businessKey.split(":")[1]).then(res=>{
+             this.signData = res;
+             this.construct = true;
+         });
+         return;
+       }
+         if(this.definitionKey == "workflow_earthsites"){
+           this.earthsites = true;
+           return;
+         }
+         if(this.definitionKey == "workflow_conract"){
+           this.contract = true;
+           return;
+         }
+
+
+       if(this.definitionKey == "workflow_threestep"){
+         this.open2 = true;
+         return;
+       }
+
+
+
+
+
+
+      },
+      /** 提交按钮 */
+      submitForm() {
+        formDataSave(this.id, this.form.formData).then(response => {
+          this.msgSuccess("审批成功");
+          this.open = false;
+          this.getList();
+        });
+      },
+    }
+  };
+</script>
 package com.trash.business.controller;
  
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.tomcat.jni.Mmap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -88,6 +92,24 @@ public class TruckActivateController extends BaseController
         return toAjax(truckActivateService.insertTruckActivate(truckActivate));
     }
  
+    @PostMapping(value="/getActivedTruckList")
+    public AjaxResult getActivedTruckList(@RequestBody TruckActivate truckActivate)
+    {
+    	List<TruckActivate> list = truckActivateService.getActivedTruckList(truckActivate);
+        
+        for(TruckActivate t:list){
+        	t.setParams(null);
+        	if(t.getActivateTime() == null){
+        		t.setIsAct("0");
+        	}else{
+        		t.setIsAct("1");
+        	}
+        }
+        
+        return AjaxResult.success(list);
+    }
+
+    
     /**
      * 修改车辆激活
      */
@@ -95,9 +117,23 @@ public class TruckActivateController extends BaseController
     @Log(title = "车辆激活", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TruckActivate truckActivate)
-    {
+    {    	
         return toAjax(truckActivateService.updateTruckActivate(truckActivate));
     }
+    
+    
+    @GetMapping(value = "getConractByObjectId/{id}")
+    public AjaxResult getConractByObjectId(@PathVariable("id") String id)
+    {
+    	
+    	AjaxResult ajaxResult = AjaxResult.success();
+    	
+    	ajaxResult.put("result", truckActivateService.getConractByObjectId(id));
+    	
+    	
+        return ajaxResult;
+    }
+    
  
     /**
      * 删除车辆激活
@@ -64,6 +64,8 @@ public class SupervisionThreestep extends BaseEntity
     /** 消纳合同编号 */
     @Excel(name = "消纳合同编号")
     private String contract;
+    
+    private String  contractId;
  
     /** 运输企业 */
     @Excel(name = "运输企业")
@@ -140,7 +142,15 @@ public class SupervisionThreestep extends BaseEntity
  
  
  
-    public Date getWorkStartTime() {
+    public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	public Date getWorkStartTime() {
 		return workStartTime;
 	}
  
@@ -81,7 +81,7 @@ public class TruckActivate extends BaseEntity
 	}
  
 	public String getIsAct() {
-		return activateTime==null?"未激活":"激活";
+		return isAct;
 	}
  
 	public void setIsAct(String isAct) {
@@ -70,4 +70,6 @@ public interface SupervisionThreestepMapper
 	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
  
 	List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep param);
+
+	public SupervisionThreestep selectThreestepByTruckDate(SupervisionThreestep threestep);
 }
@@ -62,4 +62,10 @@ public interface TruckActivateMapper
 	public void endAllTurckUnActive();
  
 	public TruckActivate selectTodayTruckActivateByObjId(String objId);
+	
+	public TruckActivate selectTodayTruckByObjId(String objId);
+
+	public String getConractByObjectId(TruckActivate turck);
+
+	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
 }
@@ -60,4 +60,8 @@ public interface ITruckActivateService
     public int deleteTruckActivateById(Long id);
  
 	public void endAllTruckUnActive();
+
+	public String getConractByObjectId(String id);
+
+	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
 }
@@ -457,9 +457,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 						}
  
 						if(taList.size() > 0){
-							truckActivateService.updateTruckActivate(truckActivate);
+							truckActivateMapper.updateTruckActivate(truckActivate);
 						}else{
-							truckActivateService.insertTruckActivate(truckActivate);
+							truckActivateMapper.insertTruckActivate(truckActivate);
 						}
  
 						break;
 package com.trash.business.service.impl;
  
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import com.trash.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.mapper.TruckActivateMapper;
+import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.TruckActivate;
+import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
  
 /**
@@ -20,6 +26,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService
     @Autowired
     private TruckActivateMapper truckActivateMapper;
  
+    @Autowired
+    SupervisionThreestepMapper threestepMapper;
     /**
      * 查询车辆激活
      * 
@@ -38,6 +46,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
      * @param truckActivate 车辆激活
      * @return 车辆激活
      */
+    
+    SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+    
     @Override
     public List<TruckActivate> selectTruckActivateList(TruckActivate truckActivate)
     {
@@ -53,8 +64,132 @@ public class TruckActivateServiceImpl implements ITruckActivateService
     @Override
     public int insertTruckActivate(TruckActivate truckActivate)
     {
+    	String start, end;
+
+		Date date = new Date();
+
+		if (new Date().getHours() < 8) {
+			end =  yearFomat.format(date);
+			date.setDate(date.getDate() - 1);
+			start = yearFomat.format(date);
+		} else {
+			start = yearFomat.format(date);
+			date.setDate(date.getDate() + 1);
+			end = yearFomat.format(date);
+		}
+
+		end += " 4:00:00";
+		start += " 8:00:00";
+    	
+    	
         truckActivate.setCreateTime(DateUtils.getNowDate());
-        return truckActivateMapper.insertTruckActivate(truckActivate);
+    	truckActivate.setActivateTime(DateUtils.getNowDate());
+    	
+    	
+    	TruckActivate oldDate = truckActivateMapper.selectTodayTruckByObjId(truckActivate.getObjectId());
+    	
+    	if(oldDate != null){
+    		
+    		SupervisionThreestep threestep = new SupervisionThreestep();
+        	
+        	threestep.setName(oldDate.getConstruction());
+        	threestep.setEarthsitesName(oldDate.getEarthsite());
+        	threestep.setCompanyTrucks(oldDate.getObjectId());
+        	
+    		try {
+    			threestep.setWorkStartTime(DateUtils.parseDate(start));
+    			threestep.setWorkEndTime(DateUtils.parseDate(end));
+    		} catch (Exception e) {
+    			// TODO Auto-generated catch block
+    			e.printStackTrace();
+    		}
+    		
+    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+    		
+			if(threestep.getName().equals(truckActivate.getConstruction()) && threestep.getEarthsitesName().equals(truckActivate.getEarthsite())){
+				truckActivate.setId(oldDate.getId());
+				truckActivateMapper.updateTruckActivate(truckActivate);
+			}else{
+				Long threeId = threestep.getId();
+				String trucks = threestep.getCompanyTrucks();
+				
+				threestep = new SupervisionThreestep();
+				
+				threestep.setId(threeId);
+				
+				trucks = trucks.replace(oldDate.getObjectId(), "").replace(",,", ",");
+				
+				threestep.setCompanyTrucks(trucks);
+				
+				//去除已有三查数据的车辆绑定
+				threestepMapper.updateSupervisionThreestep(threestep);
+				
+				//更新绑定的三查数据
+				threestep = new SupervisionThreestep();
+		        	
+		        threestep.setName(truckActivate.getConstruction());
+		        threestep.setEarthsitesName(truckActivate.getEarthsite());
+				try {
+					threestep.setWorkStartTime(DateUtils.parseDate(start));
+					threestep.setWorkEndTime(DateUtils.parseDate(end));
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+
+				threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+				
+				trucks = threestep.getCompanyTrucks();
+				
+				if(trucks == null || trucks.isEmpty()){
+					trucks = truckActivate.getObjectId();
+				}else{
+					trucks += "," + truckActivate.getObjectId();
+				}
+				
+				threestep.setCompanyTrucks(trucks);
+				
+				threestepMapper.updateSupervisionThreestep(threestep);
+				
+				truckActivate.setId(oldDate.getId());//更新已有车辆激活数据
+				
+				return truckActivateMapper.updateTruckActivate(truckActivate);
+			}
+    	}else{
+
+    		SupervisionThreestep threestep = new SupervisionThreestep();
+        	
+        	threestep.setName(truckActivate.getConstruction());
+        	threestep.setEarthsitesName(truckActivate.getEarthsite());
+        	
+    		try {
+    			threestep.setWorkStartTime(DateUtils.parseDate(start));
+    			threestep.setWorkEndTime(DateUtils.parseDate(end));
+    		} catch (Exception e) {
+    			// TODO Auto-generated catch block
+    			e.printStackTrace();
+    		}
+    		
+    		threestep = threestepMapper.selectThreestepByTruckDate(threestep);
+    		
+    		String trucks = threestep.getCompanyTrucks();
+			
+			if(trucks == null || trucks.isEmpty()){
+				trucks = truckActivate.getObjectId();
+			}else{
+				trucks += "," + truckActivate.getObjectId();
+			}
+			
+			threestep.setCompanyTrucks(trucks);
+			
+			threestepMapper.updateSupervisionThreestep(threestep);
+    		
+    		return truckActivateMapper.insertTruckActivate(truckActivate);
+    	}
+    	
+    	
+    	return 0;
+    	
     }
  
     /**
@@ -66,6 +201,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService
     @Override
     public int updateTruckActivate(TruckActivate truckActivate)
     {
+
+    	truckActivate.setActivateTime(DateUtils.getNowDate());
+    	
         return truckActivateMapper.updateTruckActivate(truckActivate);
     }
  
@@ -92,6 +230,45 @@ public class TruckActivateServiceImpl implements ITruckActivateService
     {
         return truckActivateMapper.deleteTruckActivateById(id);
     }
+    
+
+    @Override
+	public String getConractByObjectId(String id){
+    	
+    	TruckActivate turck = new TruckActivate();
+    	
+    	turck.setObjectId(id);
+    	
+		if(turck.getStartTime() == null){
+			String start, end;
+
+			Date date = new Date();
+
+			if (new Date().getHours() < 8) {
+				end =  yearFomat.format(date);
+				date.setDate(date.getDate() - 1);
+				start = yearFomat.format(date);
+			} else {
+				start = yearFomat.format(date);
+				date.setDate(date.getDate() + 1);
+				end = yearFomat.format(date);
+			}
+
+			end += " 4:00:00";
+			start += " 8:00:00";
+
+			try {
+				turck.setStartTime(start);
+				turck.setEndTime(end);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		
+    	return truckActivateMapper.getConractByObjectId(turck);
+    }
  
 	@Override
 	public void endAllTruckUnActive() {
@@ -99,4 +276,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 		truckActivateMapper.endAllTurckUnActive();
  
 	}
+
+	@Override
+	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate) {
+		
+		return truckActivateMapper.getActivedTruckList(truckActivate);
+		
+	}
 }
@@ -3,323 +3,366 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.trash.business.mapper.SupervisionThreestepMapper">
-    
-    <resultMap type="SupervisionThreestep" id="SupervisionThreestepResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="place"    column="place"    />
-        <result property="selfCheckTime"    column="self_check_time"    />
-        <result property="objectId"    column="object_id"    />
-        <result property="earthsitesId"    column="earthsites_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="checkTime"    column="check_time"    />
-        <result property="checkEndTime"    column="check_end_time"    />
-        <result property="earthsitesName"    column="earthsites_name"    />
-        <result property="contract"    column="contract"    />
-        <result property="companys"    column="companys"    />
-        <result property="companyTrucks"    column="company_trucks"    />
-        <result property="img0"    column="img0"    />
-        <result property="img1"    column="img1"    />
-        <result property="img2"    column="img2"    />
-        <result property="img3"    column="img3"    />
-        <result property="img4"    column="img4"    />
-        <result property="img5"    column="img5"    />
-        <result property="img6"    column="img6"    />
-        <result property="img7"    column="img7"    />
-        <result property="img8"    column="img8"    />
-        <result property="img9"    column="img9"    />
-        <result property="img10"    column="img10"    />
-        <result property="img11"    column="img11"    />
-        <result property="img12"    column="img12"    />
-        <result property="sub_img0"    column="sub_img0"    />
-        <result property="sub_img1"    column="sub_img1"    />
-        <result property="sub_img2"    column="sub_img2"    />
-        <result property="sub_img3"    column="sub_img3"    />
-        <result property="sub_img4"    column="sub_img4"    />
-        <result property="sub_img5"    column="sub_img5"    />
-        <result property="sub_img6"    column="sub_img6"    />
-        <result property="sub_img7"    column="sub_img7"    />
-        <result property="sub_img8"    column="sub_img8"    />
-        <result property="sub_img9"    column="sub_img9"    />
-        <result property="sub_img10"    column="sub_img10"    />
-        <result property="sub_img11"    column="sub_img11"    />
-        <result property="sub_img12"    column="sub_img12"    />
-       
-        <result property="subReason"    column="sub_reason"    /> 
-        <result property="earthPipPerson"    column="earth_pip_person"    />
-        <result property="enforcePerson"    column="enforce_person"    />
-        <result property="subSubReason"    column="sub_sub_reason"    />
-        <result property="attchItem1"    column="attch_item1"    />
-        <result property="attchItem2"    column="attch_item2"    />
-        <result property="attchItem3"    column="attch_item3"    />
-        
-        <result property="person"    column="person"    />
-        <result property="phone"    column="phone"    />
-        <result property="status"    column="status"    />
-        <result property="createBy"    column="create_by"    />
-        
-        
-    </resultMap>
  
-    <sql id="selectSupervisionThreestepVo">
-        select id, name, type, place, self_check_time, object_id, earthsites_id, create_time, check_time, earthsites_name,check_end_time, contract, 
-        companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8, img9, img10, img11, img12, sub_img0, sub_img1, 
-        sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9, sub_img10, sub_img11, sub_img12, 
-        person, phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3 from supervision_threestep
-    </sql>
+	<resultMap type="SupervisionThreestep" id="SupervisionThreestepResult">
+		<result property="id" column="id" />
+		<result property="name" column="name" />
+		<result property="type" column="type" />
+		<result property="place" column="place" />
+		<result property="selfCheckTime" column="self_check_time" />
+		<result property="objectId" column="object_id" />
+		<result property="earthsitesId" column="earthsites_id" />
+		<result property="createTime" column="create_time" />
+		<result property="checkTime" column="check_time" />
+		<result property="checkEndTime" column="check_end_time" />
+		<result property="earthsitesName" column="earthsites_name" />
+		<result property="contract" column="contract" />
+		<result property="contractId" column="contract_id" />
+		<result property="companys" column="companys" />
+		<result property="companyTrucks" column="company_trucks" />
+		<result property="img0" column="img0" />
+		<result property="img1" column="img1" />
+		<result property="img2" column="img2" />
+		<result property="img3" column="img3" />
+		<result property="img4" column="img4" />
+		<result property="img5" column="img5" />
+		<result property="img6" column="img6" />
+		<result property="img7" column="img7" />
+		<result property="img8" column="img8" />
+		<result property="img9" column="img9" />
+		<result property="img10" column="img10" />
+		<result property="img11" column="img11" />
+		<result property="img12" column="img12" />
+		<result property="sub_img0" column="sub_img0" />
+		<result property="sub_img1" column="sub_img1" />
+		<result property="sub_img2" column="sub_img2" />
+		<result property="sub_img3" column="sub_img3" />
+		<result property="sub_img4" column="sub_img4" />
+		<result property="sub_img5" column="sub_img5" />
+		<result property="sub_img6" column="sub_img6" />
+		<result property="sub_img7" column="sub_img7" />
+		<result property="sub_img8" column="sub_img8" />
+		<result property="sub_img9" column="sub_img9" />
+		<result property="sub_img10" column="sub_img10" />
+		<result property="sub_img11" column="sub_img11" />
+		<result property="sub_img12" column="sub_img12" />
  
-    <select id="selectSupervisionThreestepList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
-        <include refid="selectSupervisionThreestepVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
-            <if test="earthsitesId != null  and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
-            <if test="checkTime != null "> and check_time = #{checkTime}</if>
-            <if test="earthsitesName != null  and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName}, '%')</if>
-            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
-            <if test="companys != null  and companys != ''"> and companys = #{companys}</if>
-            <if test="companyTrucks != null  and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
-            <if test="img0 != null  and img0 != ''"> and img0 = #{img0}</if>
-            <if test="img1 != null  and img1 != ''"> and img1 = #{img1}</if>
-            <if test="img2 != null  and img2 != ''"> and img2 = #{img2}</if>
-            <if test="img3 != null  and img3 != ''"> and img3 = #{img3}</if>
-            <if test="img4 != null  and img4 != ''"> and img4 = #{img4}</if>
-            <if test="img5 != null  and img5 != ''"> and img5 = #{img5}</if>
-            <if test="img6 != null  and img6 != ''"> and img6 = #{img6}</if>
-            <if test="img7 != null  and img7 != ''"> and img7 = #{img7}</if>
-            <if test="img8 != null  and img8 != ''"> and img8 = #{img8}</if>
-            <if test="img9 != null  and img9 != ''"> and img9 = #{img9}</if>
-            <if test="img10 != null  and img10 != ''"> and img10 = #{img10}</if>
-            <if test="img11 != null  and img11 != ''"> and img11 = #{img11}</if>
-            <if test="img12 != null  and img12 != ''"> and img12 = #{img12}</if>
-            <if test="person != null  and person != ''"> and person = #{person}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and #{workEndTime}</if>
-        </where>
-        ORDER BY create_time desc
-    </select>
-    
-    <select id="getNames" parameterType="TruckCredit" resultType="String">
-        select DISTINCT name from supervision_threestep
-         <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
-            <if test="earthsitesId != null  and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
-            <if test="checkTime != null "> and check_time = #{checkTime}</if>
-            <if test="earthsitesName != null  and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName}, '%')</if>
-            <if test="contract != null  and contract != ''"> and contract = #{contract}</if>
-            <if test="companys != null  and companys != ''"> and companys = #{companys}</if>
-            <if test="companyTrucks != null  and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
-            <if test="img0 != null  and img0 != ''"> and img0 = #{img0}</if>
-            <if test="img1 != null  and img1 != ''"> and img1 = #{img1}</if>
-            <if test="img2 != null  and img2 != ''"> and img2 = #{img2}</if>
-            <if test="img3 != null  and img3 != ''"> and img3 = #{img3}</if>
-            <if test="img4 != null  and img4 != ''"> and img4 = #{img4}</if>
-            <if test="img5 != null  and img5 != ''"> and img5 = #{img5}</if>
-            <if test="img6 != null  and img6 != ''"> and img6 = #{img6}</if>
-            <if test="img7 != null  and img7 != ''"> and img7 = #{img7}</if>
-            <if test="img8 != null  and img8 != ''"> and img8 = #{img8}</if>
-            <if test="img9 != null  and img9 != ''"> and img9 = #{img9}</if>
-            <if test="img10 != null  and img10 != ''"> and img10 = #{img10}</if>
-            <if test="img11 != null  and img11 != ''"> and img11 = #{img11}</if>
-            <if test="img12 != null  and img12 != ''"> and img12 = #{img12}</if>
-            <if test="person != null  and person != ''"> and person = #{person}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and #{workEndTime}</if>
-        </where>
-        ORDER BY create_time desc
-    </select>
-    
-    
-     <select id="selectDayWorkList" parameterType="SupervisionThreestep" resultType="java.util.HashMap">
-        select a.*,b.* from( select x.* from (select * from supervision_threestep a where type = 0 
-        	and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
-        	ORDER BY self_check_time DESC) x GROUP BY object_id) a
-			LEFT JOIN 
-			(select name ename,object_id eobject_id,sub_reason esub_reason,place eplace,status estatus,self_check_time eself_check_time from supervision_threestep where type = 1) b
-			on a.earthsites_id = b.eobject_id
-			and DATE_FORMAT(a.self_check_time,("%y%m%d")) = DATE_FORMAT(b.eself_check_time,("%y%m%d"))
-			ORDER BY a.create_time DESC
-    </select>
-    
-    
-    <select id="selectDayWorkListByType" parameterType="SupervisionThreestep" resultType="java.util.HashMap">
-        select object_id id,name,earthsites_id relationSiteId,company_trucks from supervision_threestep 
-        <where>
-            <if test="type != null"> and type = #{type} </if>
-            <if test="objectId != null  and objectId != ''"> and object_id = #{objectId} </if>
-             and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
-	         and status = 1 
-        </where>
-	     ORDER BY self_check_time DESC
-    </select>
-    
-    
-    
-    <select id="selectSupervisionThreestepById" parameterType="Long" resultMap="SupervisionThreestepResult">
-        <include refid="selectSupervisionThreestepVo"/>
-        where id = #{id}
-    </select>
-    
-    
-    <select id="selectTodayData" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
-        <include refid="selectSupervisionThreestepVo"/>
-        <where>
-        	and object_id = #{objectId}
-        	and type = ${type}
-            and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
-        </where>
-    </select>
-    
-    <select id="selectTodayDataList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
-        <include refid="selectSupervisionThreestepVo"/>
-        <where>
-        	<if test="status != null"> status = #{status}</if>
-        	and type = ${type}
-            and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
-        </where>
-    </select>
-        
-    <insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep" useGeneratedKeys="true" keyProperty="id">
-        insert into supervision_threestep
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="name != null">name,</if>
-            <if test="type != null">type,</if>
-            <if test="place != null">place,</if>
-            <if test="selfCheckTime != null">self_check_time,</if>
-            <if test="objectId != null">object_id,</if>
-            <if test="earthsitesId != null">earthsites_id,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="earthsitesName != null">earthsites_name,</if>
-            <if test="contract != null">contract,</if>
-            <if test="companys != null">companys,</if>
-            <if test="companyTrucks != null">company_trucks,</if>
-            <if test="img0 != null">img0,</if>
-            <if test="img1 != null">img1,</if>
-            <if test="img2 != null">img2,</if>
-            <if test="img3 != null">img3,</if>
-            <if test="img4 != null">img4,</if>
-            <if test="img5 != null">img5,</if>
-            <if test="img6 != null">img6,</if>
-            <if test="img7 != null">img7,</if>
-            <if test="img8 != null">img8,</if>
-            <if test="img9 != null">img9,</if>
-            <if test="img10 != null">img10,</if>
-            <if test="img11 != null">img11,</if>
-            <if test="img12 != null">img12,</if>
-            <if test="person != null">person,</if>
-            <if test="phone != null">phone,</if>
-            <if test="status != null">status,</if>
-            <if test="createBy != null">create_by,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="name != null">#{name},</if>
-            <if test="type != null">#{type},</if>
-            <if test="place != null">#{place},</if>
-            <if test="selfCheckTime != null">#{selfCheckTime},</if>
-            <if test="objectId != null">#{objectId},</if>
-            <if test="earthsitesId != null">#{earthsitesId},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="earthsitesName != null">#{earthsitesName},</if>
-            <if test="contract != null">#{contract},</if>
-            <if test="companys != null">#{companys},</if>
-            <if test="companyTrucks != null">#{companyTrucks},</if>
-            <if test="img0 != null">#{img0},</if>
-            <if test="img1 != null">#{img1},</if>
-            <if test="img2 != null">#{img2},</if>
-            <if test="img3 != null">#{img3},</if>
-            <if test="img4 != null">#{img4},</if>
-            <if test="img5 != null">#{img5},</if>
-            <if test="img6 != null">#{img6},</if>
-            <if test="img7 != null">#{img7},</if>
-            <if test="img8 != null">#{img8},</if>
-            <if test="img9 != null">#{img9},</if>
-            <if test="img10 != null">#{img10},</if>
-            <if test="img11 != null">#{img11},</if>
-            <if test="img12 != null">#{img12},</if>
-            <if test="person != null">#{person},</if>
-            <if test="phone != null">#{phone},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createBy != null"> #{createBy},</if>
-         </trim>
-    </insert>
+		<result property="subReason" column="sub_reason" />
+		<result property="earthPipPerson" column="earth_pip_person" />
+		<result property="enforcePerson" column="enforce_person" />
+		<result property="subSubReason" column="sub_sub_reason" />
+		<result property="attchItem1" column="attch_item1" />
+		<result property="attchItem2" column="attch_item2" />
+		<result property="attchItem3" column="attch_item3" />
+
+		<result property="person" column="person" />
+		<result property="phone" column="phone" />
+		<result property="status" column="status" />
+		<result property="createBy" column="create_by" />
+
+
+	</resultMap>
+
+	<sql id="selectSupervisionThreestepVo">
+		select id, name, type, place, self_check_time, object_id, earthsites_id,
+		create_time, check_time, earthsites_name,check_end_time,
+		contract,contract_id,
+		companys, company_trucks, img0, img1, img2, img3, img4, img5, img6, img7, img8,
+		img9, img10, img11, img12, sub_img0, sub_img1,
+		sub_img2, sub_img3, sub_img4, sub_img5, sub_img6, sub_img7, sub_img8, sub_img9,
+		sub_img10, sub_img11, sub_img12,
+		person,
+		phone,status,create_by,sub_reason,earth_pip_person,enforce_person,sub_sub_reason,attch_item1,attch_item2,attch_item3
+		from supervision_threestep
+	</sql>
+
+	<select id="selectSupervisionThreestepList" parameterType="SupervisionThreestep"
+		resultMap="SupervisionThreestepResult">
+		<include refid="selectSupervisionThreestepVo" />
+		<where>
+			<if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+			<if test="type != null "> and type = #{type}</if>
+			<if test="place != null  and place != ''"> and place = #{place}</if>
+			<if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
+			<if test="earthsitesId != null  and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
+			<if test="checkTime != null "> and check_time = #{checkTime}</if>
+			<if test="earthsitesName != null  and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName},
+				'%')</if>
+			<if test="contract != null  and contract != ''"> and contract = #{contract}</if>
+			<if test="companys != null  and companys != ''"> and companys = #{companys}</if>
+			<if test="companyTrucks != null  and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
+			<if test="img0 != null  and img0 != ''"> and img0 = #{img0}</if>
+			<if test="img1 != null  and img1 != ''"> and img1 = #{img1}</if>
+			<if test="img2 != null  and img2 != ''"> and img2 = #{img2}</if>
+			<if test="img3 != null  and img3 != ''"> and img3 = #{img3}</if>
+			<if test="img4 != null  and img4 != ''"> and img4 = #{img4}</if>
+			<if test="img5 != null  and img5 != ''"> and img5 = #{img5}</if>
+			<if test="img6 != null  and img6 != ''"> and img6 = #{img6}</if>
+			<if test="img7 != null  and img7 != ''"> and img7 = #{img7}</if>
+			<if test="img8 != null  and img8 != ''"> and img8 = #{img8}</if>
+			<if test="img9 != null  and img9 != ''"> and img9 = #{img9}</if>
+			<if test="img10 != null  and img10 != ''"> and img10 = #{img10}</if>
+			<if test="img11 != null  and img11 != ''"> and img11 = #{img11}</if>
+			<if test="img12 != null  and img12 != ''"> and img12 = #{img12}</if>
+			<if test="person != null  and person != ''"> and person = #{person}</if>
+			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+			<if test="status != null  and status != ''"> and status = #{status}</if>
+			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
+				#{workEndTime}</if>
+		</where>
+		ORDER BY create_time desc
+	</select>
+
+	<select id="getNames" parameterType="TruckCredit" resultType="String">
+		select DISTINCT name from supervision_threestep
+		<where>
+			<if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+			<if test="type != null "> and type = #{type}</if>
+			<if test="place != null  and place != ''"> and place = #{place}</if>
+			<if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
+			<if test="earthsitesId != null  and earthsitesId != ''"> and earthsites_id = #{earthsitesId}</if>
+			<if test="checkTime != null "> and check_time = #{checkTime}</if>
+			<if test="earthsitesName != null  and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName},
+				'%')</if>
+			<if test="contract != null  and contract != ''"> and contract = #{contract}</if>
+			<if test="companys != null  and companys != ''"> and companys = #{companys}</if>
+			<if test="companyTrucks != null  and companyTrucks != ''"> and company_trucks = #{companyTrucks}</if>
+			<if test="img0 != null  and img0 != ''"> and img0 = #{img0}</if>
+			<if test="img1 != null  and img1 != ''"> and img1 = #{img1}</if>
+			<if test="img2 != null  and img2 != ''"> and img2 = #{img2}</if>
+			<if test="img3 != null  and img3 != ''"> and img3 = #{img3}</if>
+			<if test="img4 != null  and img4 != ''"> and img4 = #{img4}</if>
+			<if test="img5 != null  and img5 != ''"> and img5 = #{img5}</if>
+			<if test="img6 != null  and img6 != ''"> and img6 = #{img6}</if>
+			<if test="img7 != null  and img7 != ''"> and img7 = #{img7}</if>
+			<if test="img8 != null  and img8 != ''"> and img8 = #{img8}</if>
+			<if test="img9 != null  and img9 != ''"> and img9 = #{img9}</if>
+			<if test="img10 != null  and img10 != ''"> and img10 = #{img10}</if>
+			<if test="img11 != null  and img11 != ''"> and img11 = #{img11}</if>
+			<if test="img12 != null  and img12 != ''"> and img12 = #{img12}</if>
+			<if test="person != null  and person != ''"> and person = #{person}</if>
+			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+			<if test="status != null  and status != ''"> and status = #{status}</if>
+			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
+				#{workEndTime}</if>
+		</where>
+		ORDER BY create_time desc
+	</select>
+
+
+	<select id="selectDayWorkList" parameterType="SupervisionThreestep"
+		resultType="java.util.HashMap">
+		select a.*,b.* from( select x.* from (select * from supervision_threestep a
+		where type = 0
+		and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+		ORDER BY self_check_time DESC) x GROUP BY object_id) a
+		LEFT JOIN
+		(select name ename,object_id eobject_id,sub_reason esub_reason,place
+		eplace,status estatus,self_check_time eself_check_time from
+		supervision_threestep where type = 1) b
+		on a.earthsites_id = b.eobject_id
+		and DATE_FORMAT(a.self_check_time,("%y%m%d")) =
+		DATE_FORMAT(b.eself_check_time,("%y%m%d"))
+		ORDER BY a.create_time DESC
+	</select>
+
+
+
+
+	<select id="selectDayWorkListByType" parameterType="SupervisionThreestep"
+		resultType="java.util.HashMap">
+		select object_id id,name,earthsites_id relationSiteId,company_trucks
+		from supervision_threestep
+		<where>
+			<if test="type != null"> and type = #{type} </if>
+			<if test="objectId != null  and objectId != ''"> and object_id = #{objectId} </if>
+			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+			and status = 1
+		</where>
+		ORDER BY self_check_time DESC
+	</select>
+
+	<select id="selectThreestepByTruckDate" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
+		select * from supervision_threestep
+		where name = #{name}
+		and earthsites_name = #{earthsitesName}
+		<if test="companyTrucks != null">
+			and company_trucks like concat('%', #{companyTrucks}, '%')
+		</if>
+		and type = 0
+		and status = 1
+		and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+		ORDER BY self_check_time DESC
+	</select>
+	
+
+
+
+	<select id="selectSupervisionThreestepById" parameterType="Long"
+		resultMap="SupervisionThreestepResult">
+		<include refid="selectSupervisionThreestepVo" />
+		where id = #{id}
+	</select>
+
+
+	<select id="selectTodayData" parameterType="SupervisionThreestep"
+		resultMap="SupervisionThreestepResult">
+		<include refid="selectSupervisionThreestepVo" />
+		<where>
+			and object_id = #{objectId}
+			and type = #{type}
+			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+		</where>
+	</select>
+
+	<select id="selectTodayDataList" parameterType="SupervisionThreestep"
+		resultMap="SupervisionThreestepResult">
+		<include refid="selectSupervisionThreestepVo" />
+		<where>
+			<if test="status != null"> status = #{status}</if>
+			and type = #{type}
+			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+		</where>
+	</select>
+
+	<insert id="insertSupervisionThreestep" parameterType="SupervisionThreestep"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into supervision_threestep
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="name != null">name,</if>
+			<if test="type != null">type,</if>
+			<if test="place != null">place,</if>
+			<if test="selfCheckTime != null">self_check_time,</if>
+			<if test="objectId != null">object_id,</if>
+			<if test="earthsitesId != null">earthsites_id,</if>
+			<if test="createTime != null">create_time,</if>
+			<if test="earthsitesName != null">earthsites_name,</if>
+			<if test="contract != null">contract,</if>
+			<if test="contractId != null">contract_id,</if>
+			<if test="companys != null">companys,</if>
+			<if test="companyTrucks != null">company_trucks,</if>
+			<if test="img0 != null">img0,</if>
+			<if test="img1 != null">img1,</if>
+			<if test="img2 != null">img2,</if>
+			<if test="img3 != null">img3,</if>
+			<if test="img4 != null">img4,</if>
+			<if test="img5 != null">img5,</if>
+			<if test="img6 != null">img6,</if>
+			<if test="img7 != null">img7,</if>
+			<if test="img8 != null">img8,</if>
+			<if test="img9 != null">img9,</if>
+			<if test="img10 != null">img10,</if>
+			<if test="img11 != null">img11,</if>
+			<if test="img12 != null">img12,</if>
+			<if test="person != null">person,</if>
+			<if test="phone != null">phone,</if>
+			<if test="status != null">status,</if>
+			<if test="createBy != null">create_by,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="name != null">#{name},</if>
+			<if test="type != null">#{type},</if>
+			<if test="place != null">#{place},</if>
+			<if test="selfCheckTime != null">#{selfCheckTime},</if>
+			<if test="objectId != null">#{objectId},</if>
+			<if test="earthsitesId != null">#{earthsitesId},</if>
+			<if test="createTime != null">#{createTime},</if>
+			<if test="earthsitesName != null">#{earthsitesName},</if>
+			<if test="contract != null">#{contract},</if>
+			<if test="contractId != null">#{contractId},</if>
+			<if test="companys != null">#{companys},</if>
+			<if test="companyTrucks != null">#{companyTrucks},</if>
+			<if test="img0 != null">#{img0},</if>
+			<if test="img1 != null">#{img1},</if>
+			<if test="img2 != null">#{img2},</if>
+			<if test="img3 != null">#{img3},</if>
+			<if test="img4 != null">#{img4},</if>
+			<if test="img5 != null">#{img5},</if>
+			<if test="img6 != null">#{img6},</if>
+			<if test="img7 != null">#{img7},</if>
+			<if test="img8 != null">#{img8},</if>
+			<if test="img9 != null">#{img9},</if>
+			<if test="img10 != null">#{img10},</if>
+			<if test="img11 != null">#{img11},</if>
+			<if test="img12 != null">#{img12},</if>
+			<if test="person != null">#{person},</if>
+			<if test="phone != null">#{phone},</if>
+			<if test="status != null">#{status},</if>
+			<if test="createBy != null"> #{createBy},</if>
+		</trim>
+	</insert>
+
+	<update id="updateSupervisionThreestep" parameterType="SupervisionThreestep">
+		update supervision_threestep
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="name != null">name = #{name},</if>
+			<if test="type != null">type = #{type},</if>
+			<if test="place != null">place = #{place},</if>
+			<if test="selfCheckTime != null">self_check_time = #{selfCheckTime},</if>
+			<if test="objectId != null">object_id = #{objectId},</if>
+			<if test="earthsitesId != null">earthsites_id = #{earthsitesId},</if>
+			<if test="createTime != null">create_time = #{createTime},</if>
+			<if test="checkTime != null">check_time = #{checkTime},</if>
+			<if test="earthsitesName != null">earthsites_name = #{earthsitesName},</if>
+			<if test="contract != null">contract = #{contract},</if>
+			<if test="contractId != null">contract_id = #{contractId},</if>
+			<if test="companys != null">companys = #{companys},</if>
+			<if test="companyTrucks != null">company_trucks = #{companyTrucks},</if>
+			<if test="img0 != null">img0 = #{img0},</if>
+			<if test="img1 != null">img1 = #{img1},</if>
+			<if test="img2 != null">img2 = #{img2},</if>
+			<if test="img3 != null">img3 = #{img3},</if>
+			<if test="img4 != null">img4 = #{img4},</if>
+			<if test="img5 != null">img5 = #{img5},</if>
+			<if test="img6 != null">img6 = #{img6},</if>
+			<if test="img7 != null">img7 = #{img7},</if>
+			<if test="img8 != null">img8 = #{img8},</if>
+			<if test="img9 != null">img9 = #{img9},</if>
+			<if test="img10 != null">img10 = #{img10},</if>
+			<if test="img11 != null">img11 = #{img11},</if>
+			<if test="img12 != null">img12 = #{img12},</if>
+			<if test="sub_img0 != null">sub_img0 = #{sub_img0},</if>
+			<if test="sub_img1 != null">sub_img1 = #{sub_img1},</if>
+			<if test="sub_img2 != null">sub_img2 = #{sub_img2},</if>
+			<if test="sub_img3 != null">sub_img3 = #{sub_img3},</if>
+			<if test="sub_img4 != null">sub_img4 = #{sub_img4},</if>
+			<if test="sub_img5 != null">sub_img5 = #{sub_img5},</if>
+			<if test="sub_img6 != null">sub_img6 = #{sub_img6},</if>
+			<if test="sub_img7 != null">sub_img7 = #{sub_img7},</if>
+			<if test="sub_img8 != null">sub_img8 = #{sub_img8},</if>
+			<if test="sub_img9 != null">sub_img9 = #{sub_img9},</if>
+			<if test="sub_img10 != null">sub_img10 = #{sub_img10},</if>
+			<if test="sub_img11 != null">sub_img11 = #{sub_img11},</if>
+			<if test="sub_img12 != null">sub_img12 = #{sub_img12},</if>
+			<if test="subReason != null">sub_reason = #{subReason},</if>
+			<if test="earthPipPerson != null">earth_pip_person = #{earthPipPerson},</if>
+			<if test="enforcePerson != null">enforce_person = #{enforcePerson},</if>
+			<if test="subSubReason != null">sub_sub_reason = #{subSubReason},</if>
+			<if test="attchItem1 != null">attch_item1 = #{attchItem1},</if>
+			<if test="attchItem2 != null">attch_item2 = #{attchItem2},</if>
+			<if test="attchItem3 != null">attch_item3 = #{attchItem3},</if>
+			<if test="person != null">person = #{person},</if>
+			<if test="phone != null">phone = #{phone},</if>
+			<if test="status != null">status = #{status},</if>
+			<if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>
+		</trim>
+		where id = #{id}
+	</update>
+
+	<delete id="deleteSupervisionThreestepById" parameterType="Long">
+		delete from supervision_threestep where id = #{id}
+	</delete>
+
+	<delete id="deleteSupervisionThreestepByIds" parameterType="String">
+		delete from supervision_threestep where id in
+		<foreach item="id" collection="array" open="(" separator=","
+			close=")">
+			#{id}
+		</foreach>
+	</delete>
  
-    <update id="updateSupervisionThreestep" parameterType="SupervisionThreestep">
-        update supervision_threestep
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="name != null">name = #{name},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="place != null">place = #{place},</if>
-            <if test="selfCheckTime != null">self_check_time = #{selfCheckTime},</if>
-            <if test="objectId != null">object_id = #{objectId},</if>
-            <if test="earthsitesId != null">earthsites_id = #{earthsitesId},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="checkTime != null">check_time = #{checkTime},</if>
-            <if test="earthsitesName != null">earthsites_name = #{earthsitesName},</if>
-            <if test="contract != null">contract = #{contract},</if>
-            <if test="companys != null">companys = #{companys},</if>
-            <if test="companyTrucks != null">company_trucks = #{companyTrucks},</if>
-            <if test="img0 != null">img0 = #{img0},</if>
-            <if test="img1 != null">img1 = #{img1},</if>
-            <if test="img2 != null">img2 = #{img2},</if>
-            <if test="img3 != null">img3 = #{img3},</if>
-            <if test="img4 != null">img4 = #{img4},</if>
-            <if test="img5 != null">img5 = #{img5},</if>
-            <if test="img6 != null">img6 = #{img6},</if>
-            <if test="img7 != null">img7 = #{img7},</if>
-            <if test="img8 != null">img8 = #{img8},</if>
-            <if test="img9 != null">img9 = #{img9},</if>
-            <if test="img10 != null">img10 = #{img10},</if>
-            <if test="img11 != null">img11 = #{img11},</if>
-            <if test="img12 != null">img12 = #{img12},</if>
-            <if test="sub_img0 != null">sub_img0 = #{sub_img0},</if>
-            <if test="sub_img1 != null">sub_img1 = #{sub_img1},</if>
-            <if test="sub_img2 != null">sub_img2 = #{sub_img2},</if>
-            <if test="sub_img3 != null">sub_img3 = #{sub_img3},</if>
-            <if test="sub_img4 != null">sub_img4 = #{sub_img4},</if>
-            <if test="sub_img5 != null">sub_img5 = #{sub_img5},</if>
-            <if test="sub_img6 != null">sub_img6 = #{sub_img6},</if>
-            <if test="sub_img7 != null">sub_img7 = #{sub_img7},</if>
-            <if test="sub_img8 != null">sub_img8 = #{sub_img8},</if>
-            <if test="sub_img9 != null">sub_img9 = #{sub_img9},</if>
-            <if test="sub_img10 != null">sub_img10 = #{sub_img10},</if>
-            <if test="sub_img11 != null">sub_img11 = #{sub_img11},</if>
-            <if test="sub_img12 != null">sub_img12 = #{sub_img12},</if>
-            <if test="subReason != null">sub_reason = #{subReason},</if>
-            <if test="earthPipPerson != null">earth_pip_person = #{earthPipPerson},</if>
-            <if test="enforcePerson != null">enforce_person = #{enforcePerson},</if>
-            <if test="subSubReason != null">sub_sub_reason = #{subSubReason},</if>
-            <if test="attchItem1 != null">attch_item1 = #{attchItem1},</if>
-            <if test="attchItem2 != null">attch_item2 = #{attchItem2},</if>
-            <if test="attchItem3 != null">attch_item3 = #{attchItem3},</if>
-            <if test="person != null">person = #{person},</if>
-            <if test="phone != null">phone = #{phone},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
  
-    <delete id="deleteSupervisionThreestepById" parameterType="Long">
-        delete from supervision_threestep where id = #{id}
-    </delete>
  
-    <delete id="deleteSupervisionThreestepByIds" parameterType="String">
-        delete from supervision_threestep where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    
-    
-    
 </mapper>
 \ No newline at end of file
@@ -33,12 +33,39 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null "> and status = #{status}</if>
             <if test="earthsite != null  and earthsite != ''"> and earthsite = #{earthsite}</if>
             <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
-            <if test="createType != null "> and create_type = #{createType}</if>
-            <if test="activateTime != null "> and activate_time = #{activateTime}</if>
-            <if test="startTime != null "> and activate_time BETWEEN #{startTime} and ${endTime}</if>
+            <if test="createType != null "> and create_type = #{createType}</if>       
+            <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
         </where>
     </select>
  
+     <select id="getActivedTruckList" parameterType="TruckActivate" resultMap="TruckActivateResult">
+     	select object_id,time as create_time,activate_time from truck_activate
+        <where>    
+            <if test="startTime != null "> and time BETWEEN #{startTime} and #{endTime}</if>
+        </where>
+    </select>
+    
+    
+	<select id="getConractByObjectId" parameterType="TruckActivate" resultType="String">
+        select three.contract_id from(
+			select id, company, license_plate, time, construction, status, 
+			earthsite, object_id, create_by, create_type, activate_time, create_time 
+			from truck_activate
+			where 
+			object_id = #{objectId} and
+			activate_time between #{startTime} and #{endTime}) truck
+			LEFT JOIN (select * from supervision_threestep WHERE company_trucks LIKE CONCAT("%",#{objectId},"%")) three 
+			on 
+			truck.construction = three.name
+			and truck.earthsite = three.earthsites_name
+    </select>
+            
+     <select id="selectTodayTruckByObjId" parameterType="String" resultMap="TruckActivateResult">
+        <include refid="selectTruckActivateVo"/>
+        where object_id = #{objId} and status = 0
+    </select>
+       
+    
     <select id="selectTruckActivateById" parameterType="Long" resultMap="TruckActivateResult">
         <include refid="selectTruckActivateVo"/>
         where id = #{id}
@@ -48,6 +75,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectTruckActivateVo"/>
         where object_id = #{objId} and activate_time is not null and status = 0
     </select>
+    
+    
+     <select id="selectActivatedTruck" parameterType="String" resultMap="TruckActivateResult">
+        <include refid="selectTruckActivateVo"/>
+        <where>
+        	<if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
+        </where>
+      </select>
  
  
     <insert id="insertTruckActivate" parameterType="TruckActivate" useGeneratedKeys="true" keyProperty="id">