m

youxiw2000
1 parent 3a9d1c24
Showing 51 changed files with 2100 additions and 354 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/FormHistoryDataServiceImpl.java
trash-admin/src/main/resources/logback.xml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/public/bpmnjs/index.js
trash-ui/src/api/business/threeHistory.js
trash-ui/src/api/business/truckActivate.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index44.vue → trash-ui/src/layout/index5.vue
trash-ui/src/main.js
trash-ui/src/views/activiti/task/companyInfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/activiti/task/sitePaper.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threeHistory/earthInfo.vue
trash-ui/src/views/business/threeHistory/index.vue
@@ -117,7 +117,7 @@ public class FormHistoryDataServiceImpl implements IFormHistoryDataService {
 //                }
 //        );
  
-        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((y,x) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
+        returnHistoryFromDataDTOS = returnHistoryFromDataDTOS.stream().sorted((x,y) -> x.getCreateTime().compareTo(y.getCreateTime())).collect(Collectors.toList());
  
  
         return returnHistoryFromDataDTOS;
@@ -11,14 +11,14 @@
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
+<!-- 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            过滤的级别
             <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
+            匹配时的操作：接收（记录）
             <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
+            不匹配时的操作：拒绝（不记录）
             <onMismatch>DENY</onMismatch>
-        </filter>
+        </filter> -->
 	</appender>
  
 	<!-- 系统日志输出 -->
@@ -47,6 +47,9 @@ public class RemoteServerUtils {
 	public static String EarthSitesList = "//api/siteservice/cs/earthsites/ledger/list";
  
 	public static String ConstructionInfo = "/api/siteservice/cs/constructionsites/";
+	
+
+	public static String constructionLicenseById = "/api/siteservice/cs/constructionsites/license/";
  
 	public static String ConstructionList = "/api/siteservice/cs/constructionsites/search";
  
@@ -262,6 +265,19 @@ public class RemoteServerUtils {
 		return turckList;
 	}
  
+	public static JSONObject getConstructionLicenseById(String id) {
+		JSONObject turckList=null;
+		Object object = get(constructionLicenseById + id,null);
+		
+		if(object != null){
+			turckList = JSON.parseObject(object.toString());
+			return turckList;
+		}
+		
+		return turckList;
+		
+	}
+
  
 	public static JSONObject getConstructionInfo(String id) {
 		JSONObject turckList=null;
@@ -160,7 +160,7 @@ public class DriverTask
 						TruckCredit truckCredit = new TruckCredit();
 						truckCredit.setTime(new Date());
 						truckCredit.setCreateBy("定时器");
-						truckCredit.setReason("证件过期");
+						truckCredit.setReason("道路运输证有效期:"+truck.getString("transportCertValid") + " 行驶证有效期:" +  truck.getString("licenseValid") +  ",证件过期");
 						truckCredit.setLostCredit(1L);
 						truckCredit.setObjectId(truck.getString("id"));
 						truckCredit.setLicensePlate(truck.getString("licenseplateNo"));
@@ -224,7 +224,7 @@ public class DriverTask
         				CompanyCredit companyCredit = new CompanyCredit();
         				companyCredit.setTime(new Date());
         				companyCredit.setCreateBy("定时器");
-        				companyCredit.setReason("证件过期");
+        				companyCredit.setReason("企业道路运输经营许可证有效期:" + company.getString("businessLicenseValidTime") + " 企业营业执照有效期:" + company.getString("registrationValidTime") + ",证件过期");
         				companyCredit.setLostCredit(1L);
         				companyCredit.setObjectId(company.getString("id"));
         				companyCredit.setName(company.getString("name"));
@@ -83558,7 +83558,21 @@ module.exports = function(group, element, bpmnFactory, translate) {
     var value = $("#activiti-form-field-id").val();
  
     value = value.split("--__!!")[0];
-
+    debugger;
+    if($("#FormProperty_type").val() == "radio"){
+        $("#FormLabel").val("审批");
+        $("#FormValue").val("通过,驳回");
+        
+         $("#FormLabel").value = "审批";
+         $("#FormValue").value = "通过,驳回";
+    }
+    if($("#FormProperty_type").val() == "textarea"){
+        $("#FormLabel").val("批注");
+        $("#FormValue").val("NULL");
+        
+         $("#FormLabel").value = "批注";
+         $("#FormValue").value = "NULL";
+    }
     var label = $("#FormLabel").val() == "" ? "NULL" : $("#FormLabel").val();
     var labelValue = $("#FormValue").val() == "" ? "NULL" : $("#FormValue").val();
  
@@ -83642,14 +83656,14 @@ module.exports = function(group, element, bpmnFactory, translate) {
              if(param[2]){
                p = param[2];
              }
-             $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>标签</p><input id=FormLabel type=input value="+p +">");
+             $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>标签</p><input id=FormLabel type=input value='审批'>");
  
               p = "";
  
              if(param[4]){
                p = param[4].replace("--__--",",");
               }
-              $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>参数</p><input id=FormValue type=input value="+p +">");
+              $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>参数</p><input id=FormValue type=input value='通过,驳回'>");
  
               p = '';
  
@@ -83659,12 +83673,12 @@ module.exports = function(group, element, bpmnFactory, translate) {
  
               $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>是否关键</p><input id=isprime type=checkbox "+p+">");
  
-
            $("#FormProperty_type").change(updateParamInput);
            $("#FormLabel").change(updateParamInput);
            $("#FormValue").change(updateParamInput);
            $("#isprime").change(updateParamInput);
  
+
         if (!idValue || idValue.trim() === '') {
           return { id: 'Form field id must not be empty' };
         }
+import request from '@/utils/request'
+
+// 查询开停工列表
+export function listThreeHistory(query) {
+  return request({
+    url: '/threehistory/threeHistory/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询开停工详细
+export function getThreeHistory(id) {
+  return request({
+    url: '/threehistory/threeHistory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增开停工
+export function addThreeHistory(data) {
+  return request({
+    url: '/threehistory/threeHistory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改开停工
+export function updateThreeHistory(data) {
+  return request({
+    url: '/threehistory/threeHistory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除开停工
+export function delThreeHistory(id) {
+  return request({
+    url: '/threehistory/threeHistory/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出开停工
+export function exportThreeHistory(query) {
+  return request({
+    url: '/threehistory/threeHistory/export',
+    method: 'get',
+    params: query
+  })
+}
 \ No newline at end of file
@@ -50,4 +50,12 @@ export function exportTruckActivate(query) {
     method: 'get',
     params: query
   })
-}
 \ No newline at end of file
+}
+// 导出车辆激活
+export function exportTruckInfoActivate(query) {
+  return request({
+    url: '/business/truckActivate/exportInfo',
+    method: 'get',
+    params: query
+  })
+}
@@ -146,26 +146,29 @@ export default {
   },
   methods: {
     getSite(item){
-
       this.remoteQueryData.name = item;
-
-      constructionsitesList(this.remoteQueryData).then(res => {
-         this.data[0]= res.result.list;
-         for(let i in res.result.list){
-           if(res.result.list[i].name == item){
-             this.form.objectId = res.result.list[i].id;
+      if(this.form.siteType == 0){
+        constructionsitesList(this.remoteQueryData).then(res => {
+           this.data[0]= res.result.list;
+           for(let i in res.result.list){
+             if(res.result.list[i].name == item){
+               this.form.objectId = res.result.list[i].id;
+             }
            }
-         }
-      });
-
-      earthsitesList(this.remoteQueryData).then(res => {
-          this.data[1]= res.result.list;
-          for(let i in res.result.list){
-            if(res.result.list[i].name == item){
-              this.form.objectId = res.result.list[i].id;
+        });
+      }else{
+        earthsitesList(this.remoteQueryData).then(res => {
+            this.data[1]= res.result.list;
+            for(let i in res.result.list){
+              if(res.result.list[i].name == item){
+                this.form.objectId = res.result.list[i].id;
+              }
             }
-          }
-      });
+        });
+      }
+     
+
+     
  
     },
     /** 查询线下交办案卷列表 */
 import h5Page from '@/views/h5/Pagination';
  
+import threeHistory from '@/views/business/threeHistory/index';
+import earthInfo from '@/views/business/threeHistory/earthInfo';
  
 import {
   dayWorkList,
@@ -19,7 +21,6 @@ import {
 } from "@/api/business/threestep";
  
  
-
 import {
   Upload
 } from "element-ui";
@@ -41,6 +42,8 @@ export default {
   components: {
     h5Page,
     threestepInfo,
+    threeHistory,
+    earthInfo,
   },
   data() {
     return {
@@ -118,6 +121,7 @@ export default {
       businessKey:null,
       names:null,
       enames:null,
+      threeHistoryType:0,
     };
   },
   created() {
@@ -216,12 +220,9 @@ export default {
       var page = this.queryParams.page;
       var size = this.queryParams.pageSize;
  
-
       this.queryParams.page = 1;
       this.queryParams.pageSize = 9999;
  
-      console.log(this.queryParams);
-
       if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
         this.queryParams.workEndTime = this.queryParams.timeRange[1];
@@ -290,6 +291,15 @@ export default {
     },
     /** 查询开工报表列表 */
     getList(tabIdx) {
+
+      if(tabIdx && tabIdx > 3){
+
+        this.queryParams.his = tabIdx;
+        this.$forceUpdate();
+        return;
+      }
+
+
       this.loading = this.$loading({
                 lock: true,
                 text: 'Loading',
@@ -341,9 +341,6 @@ export default {
       this.remoteQueryData.name = value;
       this.remoteData = [];
       this.getRemoteData();
-
-
-
     },
     getCompanyTrucks(objId){
       this.form.companys = null;
@@ -4,7 +4,8 @@ import {
   delTruckActivate,
   addTruckActivate,
   updateTruckActivate,
-  exportTruckActivate
+  exportTruckActivate,
+  exportTruckInfoActivate
 } from "@/api/business/truckActivate";
  
  
@@ -436,6 +437,21 @@ export default {
       }).then(response => {
         this.download(response.message);
       })
+    },
+
+    /** 导出按钮操作 */
+    handleInfoExport() {
+      const queryParams = this.queryParams;
+
+      this.$confirm('是否确认导出所有车辆激活数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportTruckInfoActivate(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
     }
   }
 };
 <template>
-      <app-main />
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <tags-view v-if="needTagsView"/>
+      <app-main/>
+
+    </div>
+  </div>
 </template>
  
 <script>
 import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
  
 export default {
   name: 'Layout',
@@ -38,52 +45,63 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
     }
   }
 }
 </script>
  
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
  
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
  
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
  
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
  
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height:calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <tags-view v-if="needTagsView"/>
-      <app-main/>
-
-    </div>
-  </div>
+      <app-main />
 </template>
  
 <script>
 import RightPanel from '@/components/RightPanel'
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
  
 export default {
   name: 'Layout',
@@ -45,63 +38,52 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
  
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
  
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
  
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
  
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
  
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
  
-.preview figure {
-  float: left;
-  width: 30%;
-  height:calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
  
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
@@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
 Vue.prototype.checkPer = checkPermi
  
-// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
-Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
  
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
-<template>
-    <iframe width="100%" height="600px" frameborder="no" id="iFrame" :src=src></iframe>
+<template >
+    <iframe width="1400px" height="2000px" frameborder="no" id="iFrame" :src="src"></iframe>
 </template>
  
 <script>
@@ -102,5 +102,9 @@ import store from &quot;@/store&quot;;
   }
  
  
+  iframe{
+    overflow: hidden;
+  }
+
  
 </style>
@@ -320,7 +320,7 @@
     </el-dialog>
  
  
-    <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
       <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
        <div v-for="item in this.form.formData">
          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -339,7 +339,7 @@
       </div>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="earthsites" width="1500px" append-to-body>
       <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -359,7 +359,7 @@
       </div>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="contract" width="1500px" append-to-body>
       <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
  
       <div v-for="item in this.form.formData">
@@ -562,7 +562,7 @@
       </div>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="company" width="1500px" append-to-body :close-on-click-modal="false">
       <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -581,7 +581,7 @@
       </div>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="vehicle" width="1200px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="vehicle" width="1500px" append-to-body :close-on-click-modal="false">
       <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -600,7 +600,7 @@
       </div>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="driver" width="1200px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="driver" width="1500px" append-to-body :close-on-click-modal="false">
       <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
       <div v-for="item in this.form.formData">
         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -53,36 +53,26 @@
           <el-col :span="18" class="bd_padding">{{infoData.effectiveFrom}} 至 {{infoData.effectiveEnd}}</el-col>
         </el-row>
  
-        <!-- <el-row class="bd_bottom">
-          <el-col :span="6" >申报资料</el-col>
+        <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_right bd_padding">视频监控设施</el-col>
+          <el-col :span="18" class="bd_padding">{{infoData.monitorBallName}}</el-col>
+        </el-row>
+
+       <el-row class="bd_bottom">
+          <el-col :span="6" class="bd_padding">洗车作业平台及设施设备情况</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 :span="6" class="bd_right bd_padding">净车出场保洁设施</el-col>
+              <el-col :span="18" class="bd_padding">{{infoData.washingPlatformName}}
               </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-col :span="6" class="bd_right bd_padding" style="height: 80px;">照明设施</el-col>
+              <el-col :span="18" class="bd_padding">{{infoData.lightingFacilitiesName}}
+              </el-col>
             </el-row>
-
           </el-col>
-        </el-row> -->
+        </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>
@@ -15,9 +15,15 @@
         <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==3}" size="mini" @click="getList(3);">处理场所报工记录</el-button>
       </el-col>
  
+      <el-col :span="1.5">
+        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==4}" size="mini" @click="getList(4);">工地开停工</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==5}" size="mini" @click="getList(5);">处理场所开停工</el-button>
+      </el-col>
     </el-row>
  
-    <el-form :model="queryParams" ref="queryForm" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" label-width="100px" v-if="queryParams.his < 4">
       <el-row v-if="this.queryParams.his < 2">
         <el-col :span="6">
           <el-form-item label="工地名称" >
@@ -43,7 +49,7 @@
           <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
- </el-col>
+        </el-col>
         <el-col :span="6">
       <el-form-item label="处理场所区属" >
         <el-select v-model="queryParams.subReason" placeholder="工地所属区域 "  size="small">
@@ -73,16 +79,16 @@
            </el-row>
       <el-row>
         <el-col :span="6">
-      <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
-            <el-date-picker
-              v-model="queryParams.timeRange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期">
-            </el-date-picker>
-      </el-form-item>
+          <el-form-item label="开始时间" v-if="this.queryParams.his > 0">
+                <el-date-picker
+                  v-model="queryParams.timeRange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-form-item>
@@ -93,7 +99,7 @@
  
     <p v-if="queryParams.his < 2"> {{dayWorkCount}}</p>
  
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="queryParams.his < 4">
       <el-col :span="1.5">
         <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
       </el-col>
@@ -130,7 +136,7 @@
         <el-table-column label="备注" align="center" prop="descript"/>
     </el-table>
  
-    <el-table :data="threestepList"  v-show="queryParams.his > 1">
+    <el-table :data="threestepList"  v-show="queryParams.his > 1 && queryParams.his < 4">
       <el-table-column label="序号" align="center" type='index'/>
  
       <el-table-column label="项目类型" align="center" prop="type">
@@ -164,10 +170,16 @@
       <threestepInfo :businessKey="businessKey" v-if="info2"/>
     </el-dialog>
  
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-if="this.queryParams.his < 4" v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList(queryParams.his)" />
+
+
+      <threeHistory v-if="queryParams.his == 4"/>
+      <earthInfo v-if="queryParams.his == 5"/>
+
   </div>
  
+
 </template>
  
 <script src="../../../api/dayWorkReport.js" />
+<template>
+    <report :type="1"/>
+</template>
+
+<script>
+
+import report from "./index";
+
+ export default {
+   name: "day",
+   components: {
+     report
+   },
+
+   }
+
+</script>
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属区域" prop="place">
+        <el-select v-model="queryParams.place" placeholder="请选择所属区域 "  size="small">
+         <el-option v-for="item in areas" :label="item.name" :value="item.name" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd(3)"
+          v-hasPermi="['threehistory:threeHistory:add']"
+        >申请开工</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd(1)"
+          v-hasPermi="['threehistory:threeHistory:add']"
+        >申请停工</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['threehistory:threeHistory:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="threeHistoryList" @selection-change="handleSelectionChange">
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column :label="pageLabel" align="center" prop="name" />
+      <el-table-column :label="pageType" align="center" prop="projectType" />
+      <el-table-column label="所属区域" align="center" prop="place" />
+      <el-table-column label="操作时间" align="center" prop="createTime" />
+      <el-table-column label="操作人" align="center" prop="createBy" />
+      <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status == 3 ? "申请停工" : "申请开工"}}</span>
+          </template>
+      </el-table-column>
+      <el-table-column label="开停工原因" align="center" prop="reason" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改开停工对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item :label="pageLabel" prop="objectId">
+          <el-select v-model="form.objectId" filterable  reserve-keyword @change="getObjId" :filter-method="getObjId">
+            <el-option v-for="item in threestepList" :label="item.name"
+              :value="item.objectId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执法部门负责人" prop="person">
+          <el-input v-model="form.person" placeholder="请输入执法部门负责人" :maxlength="40" show-word-limit />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="personNumber">
+          <el-input v-model="form.personNumber" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="管理部门负责人" prop="person1">
+          <el-input v-model="form.person1" placeholder="请输入管理部门负责人"  :maxlength="40" show-word-limit />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="person1Number">
+          <el-input v-model="form.person1Number" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="开停工原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入开停工原因" :maxlength="200" show-word-limit type="textarea" rows="3"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import { listThreeHistory, getThreeHistory,
+delThreeHistory, addThreeHistory,
+updateThreeHistory, exportThreeHistory } from "@/api/business/threeHistory";
+
+import {
+  listThreestep,
+  getThreestep,
+  delThreestep,
+  addThreestep,
+  updateThreestep,
+  exportThreestep,
+  getNames
+} from "@/api/business/threestep";
+
+import {
+  getArea,
+  constructionLicenseById,
+  earthsitesById
+} from "@/api/dict";
+
+export default {
+  name: "ThreeHistory",
+  props: {
+    type: {
+      type: Number
+    },
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 开停工表格数据
+      threeHistoryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type:0,
+        name: null,
+        place: null,
+      },
+      workQuery : {
+       pageNum: 1,
+       pageSize: 500,
+      },
+      pageLabel:"名称",
+      pageType:"类型",
+      threestepList:null,
+      areas: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objectId: [{
+          required: true,
+          message: '请填写完整',
+          trigger: 'change'
+        },],
+      }
+    };
+  },
+  created() {
+    if(!this.type){
+      this.type = 0;
+    }
+    if(this.type == 0){
+      this.pageLabel = "工地名称";
+      this.pageType = "工地类型";
+    }else{
+      this.pageLabel = "处理场所名称";
+      this.pageType = "处理场所类型";
+    }
+
+    this.workQuery.type = this.type;
+    this.queryParams.type = this.type;
+    getArea().then(res => {
+      this.areas = res.result;
+    });
+
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listThreeHistory(this.queryParams).then(response => {
+        this.threeHistoryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        place: null,
+        reason: null,
+        status: 0,
+        objectId: null,
+        createBy: null,
+        createTime: null,
+        person: null,
+        personNumber: null,
+        person1: null,
+        person1Number: null
+      };
+
+
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd(status) {
+      this.reset();
+
+      let date = new Date();
+      let d = date.getDate();
+      if(date.getHours() < 8){
+          d -= 1;
+      }
+      let start = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + d + " 08:00:00"
+      let end = date.getFullYear() + "-" +  (date.getMonth()+1) + "-" + (d+1) + " 08:00:00"
+
+      this.workQuery.name = null;
+      this.workQuery.workStartTime = start;
+      this.workQuery.workEndTime = end;
+      this.workQuery.status = status;
+
+      this.form.workStartTime = start;
+      this.form.workEndTime = end;
+      this.form.type = this.type;
+
+
+      if(status == 3){
+        this.form.status = 1;
+      }else{
+        this.form.status = 3;
+      }
+
+      listThreestep(this.workQuery).then(response => {
+        this.open = true;
+        this.title = "添加开停工";
+        this.threestepList = response.rows;
+      });
+
+    },
+    getObjId(value) {
+      this.workQuery.name = value;
+
+      listThreestep(this.workQuery).then(response => {
+
+        this.open = true;
+        this.title = "添加开停工";
+        this.threestepList = response.rows;
+      });
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getThreeHistory(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改开停工";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateThreeHistory(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThreeHistory(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除开停工编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delThreeHistory(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      queryParams.pageNum = 1;
+      queryParams.pageSize = 99999;
+      this.$confirm('是否确认导出所有开停工数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportThreeHistory(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+    }
+  }
+};
+</script>
@@ -66,6 +66,16 @@
           v-hasPermi="['business:truckActivate:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          size="mini"
+          @click="handleInfoExport"
+          v-hasPermi="['business:truckActivate:export']"
+        >导出详情</el-button>
+      </el-col>
+      
+      
     </el-row>
  
     <el-table v-loading="loading" :data="truckActivateList" @selection-change="handleSelectionChange">
@@ -100,7 +100,7 @@
           <el-select 
             :popper-append-to-body="false" class="product-style"
             v-model="form.siteName" placeholder="请选择类型" 
-            allow-create  filterable @change="getSite(item)">
+            allow-create  filterable @change="getSite">
             <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name"/>
           </el-select>
         </el-form-item>
@@ -95,7 +95,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable @change="getSite(item)">
+          <el-select v-model="form.siteName" placeholder="请选择类型" allow-create  filterable @change="getSite">
               <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" />
           </el-select>
         </el-form-item>
@@ -26,6 +26,7 @@
           <el-option label="丧假" value="丧假"/>
           <el-option label="探亲假" value="探亲假"/>
           <el-option label="护理假" value="护理假"/>
+          <el-option label="公休假" value="公休假"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -113,6 +114,7 @@
             <el-option label="产假" value="产假"/>
             <el-option label="丧假" value="丧假"/>
             <el-option label="探亲假" value="探亲假"/>
+            <el-option label="公休假" value="公休假"/>
             <el-option label="护理假" value="护理假"/>
           </el-select>
         </el-form-item>
-<template>
-  <div v-loading="loading">
-
-    <div id="printItem">
-      <h2 style="text-align:center;">长沙市建筑垃圾处置技术勘查意见表</h2>
-    <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
-      <el-col :span="2" class="bd_padding">
-        勘查人员填写
-        </el-col>
-      <el-col :span="22" 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" >申报资料</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">{{infoData.routeName}}</el-col>
-        </el-row>
-        <el-col :span="24" >
-              <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
-             <el-row >
-               <label style="float: right;" v-if="signData && signData.sign1">签字:<img :src="signData.sign1" width="100px" height="40px" />{{signData.sign1Time}}</label>
-             </el-row>
-          </el-col>
-        </el-col>
-      </el-col>
-    </el-row>
-
-    <el-row class="bd_left bd_right bd_bottom"  v-if="signData && signData.sign2Text">
-      <el-col :span="2" class="bd_padding bd_right">主管领导意见</el-col>
-        <el-col :span="22" >
-          <el-row class="bd_padding">{{signData.sign2Text}}</el-row>
-          <el-row >
-            <label style="float: right;">签字:<img :src="signData.sign2" width="100px" height="40px" v-if="signData.sign2"/>{{signData.sign2Time}}</label>
-          </el-row>
-      </el-col>
-    </el-row>
-
-    <el-row class="bd_left bd_right"  v-if="signData && signData.sign3Text">
-      <el-col :span="2" class="bd_padding bd_right">分管领导意见</el-col>
-        <el-col :span="22" >
-          <el-row class="bd_padding">{{signData.sign3Text}}</el-row>
-          <el-row >
-            <label style="float: right;">签字:<img :src="signData.sign3" width="100px" height="40px"  v-if="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 && signData.sign4Text">
-      <el-col :span="2" class="bd_right bd_padding">渣土事务中心负责人意见</el-col>
-        <el-col :span="22" >
-          <el-row class="bd_padding">{{signData.sign4Text}}</el-row>
-          <el-row >
-            <label style="float: right;">签字:<img :src="signData.sign4" width="100px" height="40px"  v-if="signData.sign4"/>{{signData.sign4Time}}</label>
-          </el-row>
-      </el-col>
-    </el-row>
-</div>
-  </div>
-</template>
-
-
-<script src="../../../api/sitePaper">
-<style>
-  .bd_padding{
-
-    padding:5px;
-  }
-
-  .bd_right {
-    border-right: 1px solid black;
-  }
-
-  .bd_left {
-    border-left: 1px solid black;
-  }
-
-  .bd_top {
-    border-top: 1px solid black;
-  }
-
-  .bd_bottom {
-    border-bottom: 1px solid black;
-  }
-</style>
@@ -26,6 +26,7 @@
           <el-option label="丧假" value="丧假"/>
           <el-option label="探亲假" value="探亲假"/>
           <el-option label="护理假" value="护理假"/>
+          <el-option label="公休假" value="公休假"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -160,6 +161,7 @@
             <el-option label="丧假" value="丧假"/>
             <el-option label="探亲假" value="探亲假"/>
             <el-option label="护理假" value="护理假"/>
+            <el-option label="公休假" value="公休假"/>
           </el-select>
         </el-form-item>
  
@@ -137,6 +137,12 @@ public class SupervisionThreestepController extends BaseController
         return AjaxResult.success(list);
     }
  
+    @PostMapping("/getByObjects")
+    public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep)
+    {
+        List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
+        return AjaxResult.success(list);
+    }
  
     String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
  
+package com.trash.business.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.trash.business.domain.ThreestepHistory;
+import com.trash.business.domain.TruckActivate;
+import com.trash.business.service.IThreestepHistoryService;
+import com.trash.common.annotation.Log;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.poi.ExcelUtil;
+
+/**
+ * 开停工Controller
+ * 
+ * @author trash
+ * @date 2023-08-15
+ */
+@RestController
+@RequestMapping("/threehistory/threeHistory")
+public class ThreestepHistoryController extends BaseController
+{
+    @Autowired
+    private IThreestepHistoryService threestepHistoryService;
+
+    /**
+     * 查询开停工列表
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ThreestepHistory threestepHistory)
+    {
+        startPage();
+        List<ThreestepHistory> list = threestepHistoryService.selectThreestepHistoryList(threestepHistory);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出开停工列表
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:export')")
+    @Log(title = "开停工", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(ThreestepHistory threestepHistory)
+    {
+        List<ThreestepHistory> list = threestepHistoryService.selectThreestepHistoryList(threestepHistory);
+        
+    	for(int i = 0;i<list.size();i++){
+        	list.get(i).setId((long)i+1);
+        }
+        
+        
+        ExcelUtil<ThreestepHistory> util = new ExcelUtil<ThreestepHistory>(ThreestepHistory.class);
+        return util.exportExcel(list, "threeHistory");
+    }
+
+    /**
+     * 获取开停工详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(threestepHistoryService.selectThreestepHistoryById(id));
+    }
+
+    /**
+     * 新增开停工
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:add')")
+    @Log(title = "开停工", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ThreestepHistory threestepHistory)
+    {
+        return toAjax(threestepHistoryService.insertThreestepHistory(threestepHistory));
+    }
+
+    /**
+     * 修改开停工
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:edit')")
+    @Log(title = "开停工", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ThreestepHistory threestepHistory)
+    {
+        return toAjax(threestepHistoryService.updateThreestepHistory(threestepHistory));
+    }
+
+    /**
+     * 删除开停工
+     */
+    @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:remove')")
+    @Log(title = "开停工", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(threestepHistoryService.deleteThreestepHistoryByIds(ids));
+    }
+}
@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.TruckActivate;
+import com.trash.business.domain.TruckActivateInfo;
 import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.mapper.TruckActivateMapper;
 import com.trash.business.service.ISupervisionThreestepService;
@@ -169,6 +170,48 @@ public class TruckActivateController extends BaseController
         return util.exportExcel(list, title);
     }
  
+    @Log(title = "车辆激活", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportInfo")
+    public AjaxResult exportInfo(TruckActivate truckActivate)
+    {
+        List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
+        List<TruckActivateInfo> outList = new ArrayList<>();
+
+
+    	for(int i = 0;i<list.size();i++){
+    		
+    		TruckActivate turck = list.get(i);
+        	
+        	TruckActivateInfo info = new TruckActivateInfo();
+        	
+        	info.setId((long)i+1);
+        	info.setLicensePlate(turck.getLicensePlate());
+        	info.setConstruction(turck.getConstruction());
+        	info.setCompany(turck.getCompany());
+        	
+        	JSONObject object = RemoteServerUtils.getConstructionLicenseById(turck.getConstructionId());
+        	
+        	info.setAddress(object.getString("address"));
+        	info.setEarthName(object.getString("earthName"));
+        	info.setRouteName(object.getString("routeName"));
+        	info.setTransportEndTime(object.getString("transportEndTime"));
+        	info.setTransportStartTime(object.getString("transportStartTime"));
+        	info.setEffectiveFrom(object.getString("effectiveFrom"));
+        	info.setEffectiveEnd(object.getString("effectiveEnd"));
+        	
+        	
+        	outList.add(info);
+        	
+        }
+    	
+        String title ="车辆激活详情";
+        
+        ExcelUtil<TruckActivateInfo> util = new ExcelUtil<TruckActivateInfo>(TruckActivateInfo.class);
+        return util.exportExcel(outList, title);
+    }
+
+    
+    
     /**
      * 获取车辆激活详细信息
      */
@@ -214,6 +257,14 @@ public class TruckActivateController extends BaseController
         return result;
     }
  
+    @PostMapping(value="/getTruckListByObjects")
+    public AjaxResult getTruckListByObjects(@RequestBody TruckActivate truckActivate)
+    {
+    	List<TruckActivate> list = truckActivateService.getTruckListByObjects(truckActivate);
+            	
+        return AjaxResult.success(list);
+    }
+    
  
     /**
      * 修改车辆激活
+package com.trash.business.domain;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * 开停工对象 threestep_history
+ * 
+ * @author trash
+ * @date 2023-08-15
+ */
+public class ThreestepHistory extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    private Long id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    private int type;
+
+    @Excel(name = "类型")
+    private String projectType;
+
+    /** 所属区域 */
+    @Excel(name = "所属区域")
+    private String place;
+    
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间")
+    private Date createTime;
+
+    @Excel(name = "操作人")
+    private String createBy;
+    
+    /** 1开工 3停工 */
+    @Excel(name = "状态" ,readConverterExp = "1=申请开工,3=申请停工")
+    private Long status;
+    
+
+    /** 开停工原因 */
+    @Excel(name = "开停工原因")
+    private String reason;
+
+    /** 基础数据ID */
+    private String objectId;
+
+    /** 执法部门负责人 */
+    @Excel(name = "执法部门负责人")
+    private String person;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式 ")
+    private String personNumber;
+
+    /** 管理部门负责人 */
+    @Excel(name = "管理部门负责人")
+    private String person1;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式 ")
+    private String person1Number;
+    
+    public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+
+	public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(int type) 
+    {
+        this.type = type;
+    }
+
+    public int getType() 
+    {
+        return type;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+    public void setStatus(Long status) 
+    {
+        this.status = status;
+    }
+
+    public Long getStatus() 
+    {
+        return status;
+    }
+    public void setObjectId(String objectId) 
+    {
+        this.objectId = objectId;
+    }
+
+    public String getObjectId() 
+    {
+        return objectId;
+    }
+    public void setPerson(String person) 
+    {
+        this.person = person;
+    }
+
+    public String getPerson() 
+    {
+        return person;
+    }
+    public void setPersonNumber(String personNumber) 
+    {
+        this.personNumber = personNumber;
+    }
+
+    public String getPersonNumber() 
+    {
+        return personNumber;
+    }
+    public void setPerson1(String person1) 
+    {
+        this.person1 = person1;
+    }
+
+    public String getPerson1() 
+    {
+        return person1;
+    }
+    public void setPerson1Number(String person1Number) 
+    {
+        this.person1Number = person1Number;
+    }
+
+    public String getPerson1Number() 
+    {
+        return person1Number;
+    }
+
+    
+    public String getProjectType() {
+		return projectType;
+	}
+
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
+
+	@Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("place", getPlace())
+            .append("reason", getReason())
+            .append("status", getStatus())
+            .append("objectId", getObjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("person", getPerson())
+            .append("personNumber", getPersonNumber())
+            .append("person1", getPerson1())
+            .append("person1Number", getPerson1Number())
+            .toString();
+    }
+}
+package com.trash.business.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * 车辆激活对象 truck_activate
+ * 
+ * @author trash
+ * @date 2023-05-02
+ */
+public class TruckActivateInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序号 */
+    @Excel(name = "序号")
+    private Long id;
+
+    /** 所属工地 */
+    @Excel(name = "工地名称")
+    private String construction;
+
+    @Excel(name = "施工地址")
+    private String address;
+    
+    @Excel(name = "运输车辆")
+    private String licensePlate;
+
+    /** 所属企业 */
+    @Excel(name = "运输公司")
+    private String company;
+
+    @Excel(name = "证照有效期起")
+    private String effectiveFrom;
+    
+    @Excel(name = "证照有效期止")
+    private String effectiveEnd;
+
+    @Excel(name = "运输开始时间")
+    private String transportStartTime;
+    
+    @Excel(name = "运输结束时间")
+    private String transportEndTime;
+
+    @Excel(name = "路线描述")
+    private String routeName;
+    
+    @Excel(name = "卸区描述")
+    private String earthName;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getConstruction() {
+		return construction;
+	}
+
+	public void setConstruction(String construction) {
+		this.construction = construction;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getLicensePlate() {
+		return licensePlate;
+	}
+
+	public void setLicensePlate(String licensePlate) {
+		this.licensePlate = licensePlate;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getEffectiveFrom() {
+		return effectiveFrom;
+	}
+
+	public void setEffectiveFrom(String effectiveFrom) {
+		this.effectiveFrom = effectiveFrom;
+	}
+
+	public String getEffectiveEnd() {
+		return effectiveEnd;
+	}
+
+	public void setEffectiveEnd(String effectiveEnd) {
+		this.effectiveEnd = effectiveEnd;
+	}
+
+	public String getTransportStartTime() {
+		return transportStartTime;
+	}
+
+	public void setTransportStartTime(String transportStartTime) {
+		this.transportStartTime = transportStartTime;
+	}
+
+	public String getTransportEndTime() {
+		return transportEndTime;
+	}
+
+	public void setTransportEndTime(String transportEndTime) {
+		this.transportEndTime = transportEndTime;
+	}
+
+	public String getRouteName() {
+		return routeName;
+	}
+
+	public void setRouteName(String routeName) {
+		this.routeName = routeName;
+	}
+
+	public String getEarthName() {
+		return earthName;
+	}
+
+	public void setEarthName(String earthName) {
+		this.earthName = earthName;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+
+
+    
+    
+    
+    
+}
@@ -74,4 +74,6 @@ public interface SupervisionThreestepMapper
 	public SupervisionThreestep selectThreestepByTruckDate(SupervisionThreestep threestep);
  
 	SupervisionThreestep getSupervisionThreestepInfo(SupervisionThreestep supervisionThreestep);
+
+	void updateStatusByObjectAndType(SupervisionThreestep threestep);
 }
+package com.trash.business.mapper;
+
+import java.util.List;
+
+import com.trash.business.domain.ThreestepHistory;
+
+/**
+ * 开停工Mapper接口
+ * 
+ * @author trash
+ * @date 2023-08-15
+ */
+public interface ThreestepHistoryMapper 
+{
+    /**
+     * 查询开停工
+     * 
+     * @param id 开停工ID
+     * @return 开停工
+     */
+        ThreestepHistory selectThreestepHistoryById(Long id);
+
+    /**
+     * 查询开停工列表
+     * 
+     * @param threestepHistory 开停工
+     * @return 开停工集合
+     */	
+    List<ThreestepHistory> selectThreestepHistoryList(ThreestepHistory threestepHistory);
+
+    /**
+     * 新增开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    int insertThreestepHistory(ThreestepHistory threestepHistory);
+
+    /**
+     * 修改开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    int updateThreestepHistory(ThreestepHistory threestepHistory);
+
+    /**
+     * 删除开停工
+     * 
+     * @param id 开停工ID
+     * @return 结果
+     */
+    int deleteThreestepHistoryById(Long id);
+
+    /**
+     * 批量删除开停工
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteThreestepHistoryByIds(Long[] ids);
+}
@@ -74,4 +74,6 @@ public interface TruckActivateMapper
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
  
 	public List<TruckActivate> selectTodayTruckByObjIds(String[] objs);
+
+	public List<TruckActivate> getTruckListByObjects(TruckActivate truckActivate);
 }
+package com.trash.business.service;
+
+import java.util.List;
+
+import com.trash.business.domain.ThreestepHistory;
+
+/**
+ * 开停工Service接口
+ * 
+ * @author trash
+ * @date 2023-08-15
+ */
+public interface IThreestepHistoryService 
+{
+    /**
+     * 查询开停工
+     * 
+     * @param id 开停工ID
+     * @return 开停工
+     */
+        ThreestepHistory selectThreestepHistoryById(Long id);
+
+    /**
+     * 查询开停工列表
+     * 
+     * @param threestepHistory 开停工
+     * @return 开停工集合
+     */
+    List<ThreestepHistory> selectThreestepHistoryList(ThreestepHistory threestepHistory);
+
+    /**
+     * 新增开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    int insertThreestepHistory(ThreestepHistory threestepHistory);
+
+    /**
+     * 修改开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    int updateThreestepHistory(ThreestepHistory threestepHistory);
+
+    /**
+     * 批量删除开停工
+     * 
+     * @param ids 需要删除的开停工ID
+     * @return 结果
+     */
+    int deleteThreestepHistoryByIds(Long[] ids);
+
+    /**
+     * 删除开停工信息
+     * 
+     * @param id 开停工ID
+     * @return 结果
+     */
+    int deleteThreestepHistoryById(Long id);
+}
@@ -65,4 +65,6 @@ public interface ITruckActivateService
 	public String getConractByObjectId(String id);
  
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate);
+
+	public List<TruckActivate> getTruckListByObjects(TruckActivate truckActivate);
 }
 package com.trash.business.service.impl;
  
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
+import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.mapper.ConstructionCreditMapper;
 import com.trash.business.service.IConstructionCreditService;
+import com.trash.common.utils.RemoteServerUtils;
  
 /**
  * 三查机制Service业务层处理
@@ -67,7 +71,32 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
  
     	constructionCredit.setTime(new Date());
  
-        return  constructionCreditMapper.insertConstructionCredit(constructionCredit);
+    	List<Map> map = new ArrayList<Map>();
+    	
+    	ConstructionCredit cc = new ConstructionCredit();
+        
+        cc.setStatus(0L);
+        cc.setLostCredit(constructionCredit.getLostCredit());
+        cc.setObjectId(constructionCredit.getObjectId());
+        
+        List old = selectConstructionCreditList(cc);
+        
+        int i = 0;
+        
+        if(old.size() > 0){
+        	i = 1;
+        }else{
+        	
+        	Map param = new HashMap();
+        	param.put("objectId", constructionCredit.getObjectId());
+        	param.put("creditStatus", constructionCredit.getLostCredit());
+        	map.add(param);
+        	
+        	RemoteServerUtils.updateConstationCreditAndStatus(map);
+            i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
+        }
+    	
+        return  i;
     }
  
 	/**
 package com.trash.business.service.impl;
  
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -9,6 +12,7 @@ import com.trash.business.mapper.EarthsitesCreditMapper;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.domain.EarthsitesCredit;
 import com.trash.business.service.IEarthsitesCreditService;
+import com.trash.common.utils.RemoteServerUtils;
  
 /**
  * 消纳场失信Service业务层处理
@@ -57,8 +61,32 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     {
         earthsitesCredit.setTime(new Date());
  
-        int i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
-
+        List<Map> map = new ArrayList<Map>();
+    	
+        EarthsitesCredit cc = new EarthsitesCredit();
+        
+        cc.setStatus(0L);
+        cc.setLostCredit(earthsitesCredit.getLostCredit());
+        cc.setObjectId(earthsitesCredit.getObjectId());
+        
+        List old = selectEarthsitesCreditList(cc);
+        
+        int i = 0;
+        
+        if(old.size() > 0){
+        	i = 1;
+        }else{
+        	
+        	Map param = new HashMap();
+        	param.put("objectId", earthsitesCredit.getObjectId());
+        	param.put("creditStatus", earthsitesCredit.getLostCredit());
+        	map.add(param);
+        	
+        	RemoteServerUtils.updateEarthSitesCreditAndStatus(map);
+        	
+            i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
+        }
+        
         return i;
     }
  
@@ -649,7 +649,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				end = yearFomat.format(date);
 			}
  
-			end += " 4:00:00";
+			end += " 8:00:00";
 			start += " 8:00:00";
  
 			try {
@@ -761,7 +761,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
         				end = yearFomat.format(date);
         			}
  
-        			end += " 4:00:00";
+        			end += " 8:00:00";
         			start += " 8:00:00";
  
         			try {
@@ -1023,6 +1023,37 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 	@Override
 	public SupervisionThreestep getSupervisionThreestepInfo(SupervisionThreestep supervisionThreestep) {
+		if(supervisionThreestep.getWorkStartTime() == null){
+
+			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			
+			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 += " 08:00:00";
+			start += " 08:00:00";
+
+			try {
+				supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
+				supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		
 		return  supervisionThreestepMapper.getSupervisionThreestepInfo(supervisionThreestep);
 	}
  
+package com.trash.business.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+import com.trash.business.domain.SupervisionThreestep;
+import com.trash.business.domain.ThreestepHistory;
+import com.trash.business.mapper.SupervisionThreestepMapper;
+import com.trash.business.mapper.ThreestepHistoryMapper;
+import com.trash.business.service.ISupervisionThreestepService;
+import com.trash.business.service.IThreestepHistoryService;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
+
+/**
+ * 开停工Service业务层处理
+ * 
+ * @author trash
+ * @date 2023-08-15
+ */
+@Service
+public class ThreestepHistoryServiceImpl implements IThreestepHistoryService 
+{
+    @Autowired
+    private ThreestepHistoryMapper threestepHistoryMapper;
+
+
+    @Autowired
+    private SupervisionThreestepMapper threestepMapper;
+    
+    /**
+     * 查询开停工
+     * 
+     * @param id 开停工ID
+     * @return 开停工
+     */
+    @Override
+    public ThreestepHistory selectThreestepHistoryById(Long id)
+    {
+        return threestepHistoryMapper.selectThreestepHistoryById(id);
+    }
+
+    /**
+     * 查询开停工列表
+     * 
+     * @param threestepHistory 开停工
+     * @return 开停工
+     */
+    @Override
+    public List<ThreestepHistory> selectThreestepHistoryList(ThreestepHistory threestepHistory)
+    {
+        return threestepHistoryMapper.selectThreestepHistoryList(threestepHistory);
+    }
+
+    /**
+     * 新增开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertThreestepHistory(ThreestepHistory threestepHistory)
+    {
+        threestepHistory.setCreateTime(DateUtils.getNowDate());
+        
+        threestepHistory.setCreateBy(SecurityUtils.getUsername());
+        
+        SupervisionThreestep threestep = new SupervisionThreestep();
+        
+        threestep.setStatus(threestepHistory.getStatus());
+        threestep.setObjectId(threestepHistory.getObjectId());
+        threestep.setType((long)threestepHistory.getType());
+        JSONObject jsonObject = null;
+        if(threestepHistory.getType() == 0){
+            jsonObject = RemoteServerUtils.getConstructionInfo(threestepHistory.getObjectId());
+            threestepHistory.setProjectType(jsonObject.getString("projectTypeName"));
+            threestepHistory.setName(jsonObject.getString("name"));
+            threestepHistory.setPlace(jsonObject.getString("areaCodeName"));
+        }else{
+            jsonObject = RemoteServerUtils.getEarthSitesInfo(threestepHistory.getObjectId());
+
+            threestepHistory.setProjectType(jsonObject.getString("projectTypeName"));
+            threestepHistory.setName(jsonObject.getJSONObject("site").getString("name"));
+            threestepHistory.setPlace(jsonObject.getString("areaName"));
+        }
+
+
+        
+        
+        
+        String start, end;
+
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		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 += " 8:00:00";
+		start += " 8:00:00";
+
+		try {
+			threestep.setWorkStartTime(yearFomat.parse(start));
+			threestep.setWorkEndTime(yearFomat.parse(end));
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        
+        threestepMapper.updateStatusByObjectAndType(threestep);
+        
+        
+        return threestepHistoryMapper.insertThreestepHistory(threestepHistory);
+    }
+
+    /**
+     * 修改开停工
+     * 
+     * @param threestepHistory 开停工
+     * @return 结果
+     */
+    @Override
+    public int updateThreestepHistory(ThreestepHistory threestepHistory)
+    {
+        return threestepHistoryMapper.updateThreestepHistory(threestepHistory);
+    }
+
+    /**
+     * 批量删除开停工
+     * 
+     * @param ids 需要删除的开停工ID
+     * @return 结果
+     */
+    @Override
+    public int deleteThreestepHistoryByIds(Long[] ids)
+    {
+        return threestepHistoryMapper.deleteThreestepHistoryByIds(ids);
+    }
+
+    /**
+     * 删除开停工信息
+     * 
+     * @param id 开停工ID
+     * @return 结果
+     */
+    @Override
+    public int deleteThreestepHistoryById(Long id)
+    {
+        return threestepHistoryMapper.deleteThreestepHistoryById(id);
+    }
+}
@@ -104,8 +104,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 			end = yearFomat.format(date);
 		}
  
-		end += " 4:00:00";
-		start += " 8:00:00";
+		end += " 08:00:00";
+		start += " 08:00:00";
  
 		String[] objs = truckActivate.getObjectId().split(",");
 		String[] nos = truckActivate.getLicensePlate().split(",");
@@ -330,7 +330,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 				end = yearFomat.format(date);
 			}
  
-			end += " 04:00:00";
+			end += " 08:00:00";
 			start += " 08:00:00";
  
 			try {
@@ -420,6 +420,11 @@ public class TruckActivateServiceImpl implements ITruckActivateService
 	}
  
 	@Override
+	public List<TruckActivate> getTruckListByObjects(TruckActivate truckActivate) {
+		return truckActivateMapper.getTruckListByObjects(truckActivate);
+	}
+	
+	@Override
 	public List<TruckActivate> getActivedTruckList(TruckActivate truckActivate) {
  
 		return truckActivateMapper.getActivedTruckList(truckActivate);
 package com.trash.caseOffline.controller;
  
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,8 +23,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.caseOffline.service.ICaseOfflineService;
 import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.core.redis.RedisCache;
  
 /**
  * 线下交办案卷Controller
@@ -36,6 +41,9 @@ public class CaseOfflineController extends BaseController
     @Autowired
     private ICaseOfflineService caseOfflineService;
  
+    @Autowired
+    RedisCache redisCache;
+
     /**
      * 查询线下交办案卷列表
      */
@@ -43,6 +51,60 @@ public class CaseOfflineController extends BaseController
     public TableDataInfo list(CaseOffline caseOffline)
     {
         startPage();
+        
+		JSONArray depts = redisCache.getCacheObject("CSUserDepartmentType");
+    	
+    	JSONArray areas = redisCache.getCacheObject("areas");
+    	
+    	if(areas == null){
+            areas = RemoteServerUtils.getAreas();
+	        redisCache.setCacheObject("areas", areas);
+    	}
+    	
+    	if(depts == null){
+	       	 Map<String, String> map = new HashMap<String, String>();
+	         map.put("type", "CSUserDepartmentType");
+	         depts = RemoteServerUtils.getDict(map);
+	         redisCache.setCacheObject("CSUserDepartmentType", depts);
+    	}
+    	
+        
+        for(Object object :depts){
+        	JSONObject dept = (JSONObject) object;
+        	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        	
+        	for(String role:roles){
+            	if(dept.getString("code").equals(role)){
+
+        			if(dept.getString("name").equals("事务中心")){
+        		        List<CaseOffline> list = caseOfflineService.selectCaseOfflineList(caseOffline);
+        		        return getDataTable(list);        			
+        		    }
+            		
+            		if(dept.getString("name").contains("渣土办")){
+            			String deptName = dept.getString("name").replace("渣土办", "");
+            			if(!deptName.isEmpty()){
+            				for(Object obj:areas){
+            					JSONObject area = (JSONObject)obj;
+            					
+            					if(area.getString("name").equals(deptName)){
+            						
+            						caseOffline.setPlace(area.getString("code"));
+            						
+            				        List<CaseOffline> list = caseOfflineService.selectCaseOfflineList(caseOffline);
+            				        return getDataTable(list);
+            					}
+            				}
+            			}
+            		
+            		}
+            	}
+        	}
+        }
+        
+        
+        caseOffline.setCreateBy(SecurityUtils.getUsername());
+        
         List<CaseOffline> list = caseOfflineService.selectCaseOfflineList(caseOffline);
         return getDataTable(list);
     }
@@ -98,7 +160,9 @@ public class CaseOfflineController extends BaseController
     @Log(title = "线下交办案卷", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CaseOffline caseOffline)
-    {
+    {	
+    	
+    	
         return toAjax(caseOfflineService.insertCaseOffline(caseOffline));
     }
  
@@ -6,12 +6,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.workflow.service.IWorkflowService;
  
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.trash.caseOffline.mapper.CaseOfflineMapper;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.trash.business.domain.ConstructionCredit;
+import com.trash.business.domain.EarthsitesCredit;
+import com.trash.business.service.IConstructionCreditService;
+import com.trash.business.service.IEarthsitesCreditService;
+import com.trash.business.service.impl.ConstructionCreditServiceImpl;
+import com.trash.business.service.impl.EarthsitesCreditServiceImpl;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.caseOffline.service.ICaseOfflineService;
  
@@ -30,6 +43,17 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
  
     @Autowired
     private IWorkflowService workflowservice;
+    
+
+    @Autowired
+    IConstructionCreditService constructionCredit;
+    
+    @Autowired
+    IEarthsitesCreditService earthsitesCredit;
+    
+    @Autowired
+    RedisCache redisCache;
+    
     /**
      * 查询线下交办案卷
      * 
@@ -54,6 +78,19 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
         return caseOfflineMapper.selectCaseOfflineList(caseOffline);
     }
  
+    
+    String[] typeName = {
+    		"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥",
+    		"未洗车出场或者出场清洁不彻底",
+    		"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场",
+    	    "非核准车辆进入渣土处置工地运输渣土",
+    	    "渣土处置工地未按规定时间开停工",
+    	    "渣土处置工地洗车设施等破损、未正常使用及措施不到位的",
+    	    "渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
+    	    "无许可消纳（工）",
+    	    "无许可消纳（消）",
+    	    "使用非专用车辆"};
+    
     /**
      * 新增线下交办案卷
      * 
@@ -61,11 +98,61 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertCaseOffline(CaseOffline caseOffline)
     {
         caseOffline.setCreateTime(DateUtils.getNowDate());
-        caseOfflineMapper.insertCaseOffline(caseOffline);
+    	caseOffline.setCreateBy(SecurityUtils.getUsername());
  
+        if(caseOffline.getObjectId() != null && Integer.parseInt(caseOffline.getType()) < 7){
+        	JSONArray areas = redisCache.getCacheObject("areas");
+        	
+        	if(areas == null){
+                areas = RemoteServerUtils.getAreas();
+    	        redisCache.setCacheObject("areas", areas);
+        	}
+        	
+        	String placeName = null;
+        	
+        	for(Object obj:areas){
+				JSONObject area = (JSONObject)obj;
+				
+				if(area.getString("code").equals(caseOffline.getPlace())){
+					
+					placeName = area.getString("name");
+					break;
+				}
+			}
+        	
+        	if(caseOffline.getSiteType() == 0){
+        		ConstructionCredit credit = new ConstructionCredit();
+
+        		JSONObject object = RemoteServerUtils.getConstructionInfo(caseOffline.getObjectId());
+        		
+        		credit.setObjectId(caseOffline.getObjectId());
+        		credit.setLostCredit(1L);
+        		credit.setName(caseOffline.getSiteName());
+        		credit.setReason(typeName[Integer.parseInt(caseOffline.getType())]);
+        		credit.setPlace(placeName);
+        		credit.setType(object.getString("cargoIdName"));
+        		constructionCredit.insertConstructionCredit(credit);
+        	}else if(caseOffline.getSiteType() == 1){
+        		EarthsitesCredit credit = new EarthsitesCredit();
+        		
+        		JSONObject object = RemoteServerUtils.getEarthSitesInfo(caseOffline.getObjectId());
+        		
+        		credit.setObjectId(caseOffline.getObjectId());
+        		credit.setLostCredit(1L);
+        		credit.setName(caseOffline.getSiteName());
+        		credit.setReason(typeName[Integer.parseInt(caseOffline.getType())]);
+        		credit.setPlace(placeName);
+        		credit.setType(object.getString("typeName"));
+        		
+        		earthsitesCredit.insertEarthsitesCredit(credit);
+        	}        	
+        }
+
+        caseOfflineMapper.insertCaseOffline(caseOffline);
  
         return workflowservice.createCaseOffline(caseOffline);
     }
@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
  
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.casefile.domain.vo.ViolationCaseFileVo;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
@@ -18,12 +20,16 @@ import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
+import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.service.IViolationCaseFileService;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.core.redis.RedisCache;
+
 import org.springframework.web.multipart.MultipartFile;
  
 /**
@@ -39,6 +45,9 @@ public class ViolationCaseFileController extends BaseController
     @Autowired
     private IViolationCaseFileService violationCaseFileService;
  
+    @Autowired
+    RedisCache redisCache;
+
     /**
      * 查询平台违规案卷列表
      */
@@ -46,6 +55,67 @@ public class ViolationCaseFileController extends BaseController
     public TableDataInfo list(ViolationCaseFile violationCaseFile)
     {
         startPage();
+        
+        JSONArray depts = redisCache.getCacheObject("CSUserDepartmentType");
+    	
+    	JSONArray areas = redisCache.getCacheObject("areas");
+    	
+    	if(areas == null){
+            areas = RemoteServerUtils.getAreas();
+	        redisCache.setCacheObject("areas", areas);
+    	}
+    	
+    	if(depts == null){
+	       	 Map<String, String> map = new HashMap<String, String>();
+	         map.put("type", "CSUserDepartmentType");
+	         depts = RemoteServerUtils.getDict(map);
+	         redisCache.setCacheObject("CSUserDepartmentType", depts);
+    	}
+    	
+        
+        for(Object object :depts){
+        	JSONObject dept = (JSONObject) object;
+        	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        	
+        	for(String role:roles){
+            	if(dept.getString("code").equals(role)){
+
+        			if(dept.getString("name").equals("事务中心")){
+        		        List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
+        		        return getDataTable(list);        			
+        		    }
+            		
+            		if(dept.getString("name").contains("渣土办")){
+            			String deptName = dept.getString("name").replace("渣土办", "");
+            			if(!deptName.isEmpty()){
+            					violationCaseFile.setOwningRegion(deptName);
+            						
+            				        List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
+            				        return getDataTable(list);
+            			}
+            				
+            		
+            		}
+            	}
+        	}
+        }
+        
+   	 String companyName = null;
+     JSONArray compnayList = redisCache.getCacheObject("companyList");
+     for(Object obj:compnayList){
+		 JSONObject con = (JSONObject) obj;
+		 if(con.getString("abbreviation").equals(SecurityUtils.getUsername().replace("公司", ""))){
+			 companyName =  con.getString("name");
+			 break;
+		 }
+     }
+        
+     if(companyName!=null){
+    	 violationCaseFile.setCompanyName(companyName);
+     }else{
+    	 violationCaseFile.setCreateBy(SecurityUtils.getUsername());
+     }
+     
         List<ViolationCaseFile> list = violationCaseFileService.selectViolationCaseFileList(violationCaseFile);
         return getDataTable(list);
     }
@@ -5,12 +5,16 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.office.domain.LeaveApplication;
 import com.trash.office.domain.UploadFile;
@@ -26,6 +30,8 @@ import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.casefile.service.IViolationWarningInformationService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.core.redis.RedisCache;
+
 import org.springframework.web.multipart.MultipartFile;
  
 /**
@@ -41,6 +47,9 @@ public class ViolationWarningInformationController extends BaseController
     @Autowired
     private IViolationWarningInformationService violationWarningInformationService;
  
+    @Autowired
+    RedisCache redisCache;
+
     /**
      * 查询违规预警信息列表
      */
@@ -48,6 +57,68 @@ public class ViolationWarningInformationController extends BaseController
     public TableDataInfo list(ViolationWarningInformation violationWarningInformation)
     {
         startPage();
+        
+        
+        JSONArray depts = redisCache.getCacheObject("CSUserDepartmentType");
+    	
+    	JSONArray areas = redisCache.getCacheObject("areas");
+    	
+    	if(areas == null){
+            areas = RemoteServerUtils.getAreas();
+	        redisCache.setCacheObject("areas", areas);
+    	}
+    	
+    	if(depts == null){
+	       	 Map<String, String> map = new HashMap<String, String>();
+	         map.put("type", "CSUserDepartmentType");
+	         depts = RemoteServerUtils.getDict(map);
+	         redisCache.setCacheObject("CSUserDepartmentType", depts);
+    	}
+    	
+        
+        for(Object object :depts){
+        	JSONObject dept = (JSONObject) object;
+        	List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        	
+        	for(String role:roles){
+            	if(dept.getString("code").equals(role)){
+
+        			if(dept.getString("name").equals("事务中心")){
+        		        List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation);
+        		        return getDataTable(list);      			
+        		    }
+            		
+            		if(dept.getString("name").contains("渣土办")){
+            			String deptName = dept.getString("name").replace("渣土办", "");
+            			if(!deptName.isEmpty()){
+            				violationWarningInformation.setOwningRegion(deptName);
+            			        List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation);
+            			        return getDataTable(list);
+            			}
+            				
+            		
+            		}
+            	}
+        	}
+        }
+        
+   	 String companyName = null;
+     JSONArray compnayList = redisCache.getCacheObject("companyList");
+     for(Object obj:compnayList){
+		 JSONObject con = (JSONObject) obj;
+		 if(con.getString("abbreviation").equals(SecurityUtils.getUsername().replace("公司", ""))){
+			 companyName =  con.getString("name");
+			 break;
+		 }
+     }
+        
+     if(companyName!=null){
+    	 violationWarningInformation.setCompanyName(companyName);
+     }else{
+    	 violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
+     }
+        
+        
         List<ViolationWarningInformation> list = violationWarningInformationService.selectViolationWarningInformationList(violationWarningInformation);
         return getDataTable(list);
     }
@@ -61,7 +61,7 @@ public class Consumer {
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
-                "44030033=闯禁行驶", "44030034=失信车辆作业"};
+                "44030033=闯禁行驶", "44030034=失信车辆作业", "44030035=卫星定位异常"};
  
         //卫星定位异常
  
@@ -227,7 +227,14 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
         workflow.setState("0");
         workflow.setCreateBy(SecurityUtils.getUsername());
         workflow.setCreateTime(DateUtils.getNowDate());
-        if(roleId!=1 && !"0.5".equals(numberDays)){//判断非部长 && 请假天数不等于0.5天
+        
+        if("公休假".equals(leaveApplication.getType())){
+        	if(roleId == 1){
+                workflowService.createLeaveWorkFlow(workflow,5);
+        	}else{
+                workflowService.createLeaveWorkFlow(workflow,4);
+        	}
+        }else if(roleId!=1 && !"0.5".equals(numberDays)){//判断非部长 && 请假天数不等于0.5天
             workflowService.createLeaveWorkFlow(workflow,0);
         }else if(roleId==1 && !"0.5".equals(numberDays)){//判断部长 && 请假天数不等于0.5天
             workflowService.createLeaveWorkFlow(workflow,1);
@@ -213,7 +213,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		awf.setControlName("发起人");
 		awf.setFormKey("CREATED");
 		awf.setTaskNodeName(user.getUserName() + "发起");
-		awf.setControlValue(workflow.getTitle());
+		awf.setControlValue(workflow.getReason());
  
 		awfServer.insertActWorkflowFormData(awf);
 		return awf;
@@ -275,8 +275,33 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		ActWorkflowFormData awf = null;
 		try {
 			String name = "报工自查:" + supervision.getName();
+			
+			    	
+			JSONArray areas = redisCache.getCacheObject("areas");
+			 
+			int route = 0;
+			    	
+			    	
+			  if(areas == null){
+			            areas = RemoteServerUtils.getAreas();
+				        redisCache.setCacheObject("areas", areas);
+			    	}		
+					
+
+				for(Object obj : areas){
+					JSONObject jsonObject = (JSONObject) obj;
+					if(supervision.getPlace().equals(jsonObject.getString("code"))){
+						if(jsonObject.getString("name").contains("湘江新区")){
+							route = 1;
+						}
+						break;
+					}
+				}
+			
+			
 			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
 					.withProcessDefinitionKey("workflow_threestep").withName(name)
+					.withVariable("route", route)
 					.withBusinessKey("workflow_threestep:" + supervision.getId()).build());
  
 			PorcThreeStepTask(processInstance, supervision.getPlace());
@@ -344,6 +344,22 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createBy != null"> #{createBy},</if>
 		</trim>
 	</insert>
+	
+	
+	
+	<update id="updateStatusByObjectAndType" parameterType="SupervisionThreestep">
+		update supervision_threestep
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="status != null">status = #{status},</if>
+		</trim>		
+		<where>
+			and object_id = #{objectId}
+			and type = #{type}
+			and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
+		</where>
+	</update>
+	
+	
  
 	<update id="updateSupervisionThreestep" parameterType="SupervisionThreestep">
 		update supervision_threestep
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.business.mapper.ThreestepHistoryMapper">
+    
+    <resultMap type="ThreestepHistory" id="ThreestepHistoryResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="type"    column="type"    />
+        <result property="place"    column="place"    />
+        <result property="reason"    column="reason"    />
+        <result property="status"    column="status"    />
+        <result property="objectId"    column="object_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="person"    column="person"    />
+        <result property="personNumber"    column="person_number"    />
+        <result property="person1"    column="person1"    />
+        <result property="person1Number"    column="person1_number"    />
+    </resultMap>
+
+    <sql id="selectThreestepHistoryVo">
+        select id, name, project_type,type, place, reason, status, object_id, create_by, create_time, person, person_number, person1, person1_number from threestep_history
+    </sql>
+
+    <select id="selectThreestepHistoryList" parameterType="ThreestepHistory" resultMap="ThreestepHistoryResult">
+        <include refid="selectThreestepHistoryVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+            <if test="type != -1"> and type = #{type}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectThreestepHistoryById" parameterType="Long" resultMap="ThreestepHistoryResult">
+        <include refid="selectThreestepHistoryVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertThreestepHistory" parameterType="ThreestepHistory" useGeneratedKeys="true" keyProperty="id">
+        insert into threestep_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
+            <if test="projectType != null">project_type,</if>
+            <if test="place != null">place,</if>
+            <if test="reason != null">reason,</if>
+            <if test="status != null">status,</if>
+            <if test="objectId != null">object_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="person != null">person,</if>
+            <if test="personNumber != null">person_number,</if>
+            <if test="person1 != null">person1,</if>
+            <if test="person1Number != null">person1_number,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="place != null">#{place},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="status != null">#{status},</if>
+            <if test="objectId != null">#{objectId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="person != null">#{person},</if>
+            <if test="personNumber != null">#{personNumber},</if>
+            <if test="person1 != null">#{person1},</if>
+            <if test="person1Number != null">#{person1Number},</if>
+         </trim>
+    </insert>
+
+    <update id="updateThreestepHistory" parameterType="ThreestepHistory">
+        update threestep_history
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="objectId != null">object_id = #{objectId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="person != null">person = #{person},</if>
+            <if test="personNumber != null">person_number = #{personNumber},</if>
+            <if test="person1 != null">person1 = #{person1},</if>
+            <if test="person1Number != null">person1_number = #{person1Number},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteThreestepHistoryById" parameterType="Long">
+        delete from threestep_history where id = #{id}
+    </delete>
+
+    <delete id="deleteThreestepHistoryByIds" parameterType="String">
+        delete from threestep_history where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>
 \ No newline at end of file
@@ -159,7 +159,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </update>
  
     <update id="endAllTurckUnActive" parameterType="TruckActivate">
-        update truck_activate set status = 1;
+        update truck_activate set status = 1 where create_time &lt; DATE_FORMAT(NOW(),"%y-%m-%d 08:00:00")
     </update>
  
  
@@ -172,6 +172,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
     </delete>
  
+    <select id="getTruckListByObjects" parameterType="TruckActivate" resultMap="TruckActivateResult">
+        <include refid="selectTruckActivateVo"/>
+        where status = 0 and object_id in 
+         <foreach item="id" collection="cIds" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+    
     <select id="selectTodayTruckByObjIds" parameterType="String" resultMap="TruckActivateResult">
         <include refid="selectTruckActivateVo"/>
         where status = 0 and object_id in