m

youxiw2000
1 parent c9e9108d
Showing 11 changed files with 208 additions and 308 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/logback.xml
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/dict.js
trash-ui/src/api/three_step.js
trash-ui/src/views/activiti/task/companyInfo.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
@@ -43,6 +43,16 @@ public class TaskController extends BaseController {
         List<String> names =  actReDeploymentMapper.selectTitles();
         TableDataInfo tableDataInfo = getDataTable(hashMaps);
+        
+        int pageNum = pageDomain.getPageNum();
+        int pageSize = pageDomain.getPageSize();
+        
+        if(tableDataInfo.getRows().size() > (pageNum)*pageSize){
+        	tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, (pageNum)*pageSize));
+        }else{
+        	tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, tableDataInfo.getRows().size()));
+        }
+        
         tableDataInfo.setNames(names);
         return tableDataInfo;
@@ -104,7 +104,7 @@ public class ActTaskServiceImpl implements IActTaskService {
-		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
+		org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of(0,999999));
 		List<Task> tasks = pageTasks.getContent();
 		int totalItems = pageTasks.getTotalItems();
@@ -16,10 +16,11 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-#    remotePath: http://183.66.242.6:6001
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
     remotePath: http://183.66.242.6:14601
-    token: auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjoxNjg2MjcwMTcyLCJjcmVhdGVkIjoxNjg2MjEwMTcyODk2fQ.T_azsalyEnb1dukZ0CghG2GfQt3M41zwi18sutPXhjM8hYfca74WWJT6kXETFaUbOHICWp-OcEqydHhVE-Ewjg
-
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    
 # 数据源配置
 spring:
     datasource:
@@ -30,7 +31,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: asd0731.
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -84,7 +85,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: bsth123
+        password: 
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -2,7 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="/home/trash/logs" />-->
-    <property name="log.path" value="D:/work/project/logs/trash" />
+    <property name="log.path" value="C:/work/project/logs/trash" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -11,6 +11,14 @@
 		<encoder>
 			<pattern>${log.pattern}</pattern>
 		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
 	</appender>
 	<!-- 系统日志输出 -->
@@ -28,7 +36,7 @@
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>INFO</level>
+            <level>ERROR</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->
@@ -8,7 +8,14 @@ import {
 } from "@/api/business/daywork";
 import {
-  postThreestep,
+  listThreestep,
+  getThreestep,
+  delThreestep,
+  addThreestep,
+  updateThreestep,
+  exportThreestep,
+  getNames,
+  postThreestep
 } from "@/api/business/threestep";
@@ -250,7 +257,6 @@ export default {
           });
         } else {
           exportDayWorkList(data).then(res => {
-
             console.log(page);
             this.queryParams.page = page;
             console.log(size);
@@ -288,6 +294,9 @@ export default {
         this.queryParams.his = tabIdx;
       }
+
+
+
       const timeRange = this.queryParams.timeRange;
       if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
@@ -295,6 +304,29 @@ export default {
         this.queryParams.timeRange = null;
       }
+      if (tabIdx > 1 || this.queryParams.his > 1) {
+        this.queryParams.his = tabIdx;
+        this.queryParams.status = 1;
+        if(tabIdx == 2){
+          this.queryParams.type = 0;
+        }else{
+          this.queryParams.type = 1;
+        }
+
+        listThreestep(this.queryParams).then(response => {
+          this.threestepList = response.rows;
+          this.total = response.total;
+
+          this.loading.close();
+
+          for (let i = 0; i < this.threestepList.length; i++) {
+            this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
+          }
+        });
+        return;
+      }
+
+
       dayWorkList(this.queryParams).then(response => {
         this.threestepList = response.rows;
@@ -482,6 +514,24 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      if(this.queryParams.his > 1){
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有报工数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return exportThreestep(queryParams);
+        }).then(response => {
+          this.download(response.message);
+        })
+        
+        return;
+      }
+      
+      
+      
+      
       let curPage = this.queryParams.page;
       let curSize = this.queryParams.pageSize;
       let that = this;
@@ -52,15 +52,6 @@ export function updateEarthsites(data) {
 }
-
-
-export function mainworkcompany(id) {
-  return requestRemote({
-    url: '/api/siteservice/cs/constructionsites/' + id,
-    method: 'get',
-  });
-}
-
 export function companyList(data) {
   return requestRemote({
     url: '/api/gpsservice/cs/companies/ledger/list',
@@ -10,7 +10,6 @@ import {
 import threestepInfo from "@/views/business/threestep/threestepInfo";
-
 import h5Info from "@/views/h5/task/threestepInfo";
 import h5Page from '@/views/h5/Pagination';
@@ -26,11 +25,12 @@ import {
   constructionsitesList,
   getDict,
   getArea,
-  mainworkcompany,
   truckList,
   companyList,
   contractList,
   getConstructionTruck,
+  constructionById,
+  earthsitesById,
 } from "@/api/dict";
 export default {
@@ -38,7 +38,6 @@ export default {
   components: {
     threestepInfo,
     h5Info,
-
     h5Page
   },
     data() {
@@ -213,8 +212,6 @@ export default {
           break;
         }
       }
-
-
       if (new Date(item.endTime).getTime() < new Date().getTime()) {
         this.form.contract = null;
         this.$message("合同已过期");
@@ -275,16 +272,6 @@ export default {
       }
       this.form.companyTrucks = arr;
-      // for(let i = 0;)
-
-      // let arr = [];
-      // for(var i in this.form.companyTrucks){
-      //   if(this.form.companys.indexOf(this.form.companyTrucks[i]) > -1){
-      //       arr.push(this.form.companyTrucks[i]);
-      //   }
-      // }
-
-      // this.form.companyTrucks = arr;
     },
     areaClear() {
@@ -302,56 +289,22 @@ export default {
           break;
         }
       }
-      this.form.earthsitesName = null;
-      this.form.earthsitesId = null;
-      this.form.contract = null;
-      this.form.contractId = null;
-      this.bindname = null;
-      let name = this.form.earthsitesName;
-      let objId = this.form.earthsitesId;
       this.form.objectId = item.id;
       this.form.place = Number(item.areaCode);
-      this.filterConract();
-
-      if (this.filterContract.length == 0) {
-        this.$message("未找到对应消纳合同");
-        this.form.objectId = null;
-        this.form.name = null;
-      }
-
-      this.filterConract();
-
-      for (let i in this.filterContract) {
-        if (this.filterContract[i].constructionSiteID == objId || this.filterContract[i].earthSiteID == objId) {
-          this.form.earthsitesName = name;
-          this.form.earthsitesId = objId;
-          break;
-        }
-      }
-
-      if (this.form.type == 0) {
-        let query = {
-          'page': 1,
-          'size': 9999,
-        }
+      if(this.form.type == 1)
+        return;
-        this.filterCompany(item);
-      }
-    },
-    filterCompany(item) {
       this.form.companys = null;
       this.form.companyTrucks = null;
       this.companyList = [];
       this.truckList = [];
-      mainworkcompany(item.id).then(response => {
-
+      constructionById(item.id).then(response => {
         this.companyList.push({id: item.transportCompanyId, name: item.transportCompany});
-
         let query = {
           'page': 1,
           'size': 9999,
@@ -382,99 +335,9 @@ export default {
               this.truckList.push(res.result.list[i]);
             }
           });
-
         });
       });
     },
-    filterConract() {
-      let cId;
-      let eId;
-      if (this.form.type == 0) {
-        cId = this.form.objectId;
-        eId = this.form.earthsitesId;
-      } else {
-        cId = this.form.earthsitesId;
-        eId = this.form.objectId;
-      }
-
-      this.filterContract = [];
-      for (let i in this.contractList) {
-        let obj = this.contractList[i];
-        let canId = true;
-
-
-        //constructionSiteID  //earthSiteID
-        if (cId && cId != obj.constructionSiteID) {
-          continue;
-        }
-
-        if (eId && eId != obj.earthSiteID) {
-          continue;
-        }
-
-        this.filterContract.push(obj);
-      }
-
-
-      for (let j in this.bindData) {
-
-        this.bindData[j].show = false;
-
-        for (let i in this.filterContract) {
-
-          if (this.form.type == 0 && this.filterContract[i].earthSiteID == this.bindData[j].id) {
-            this.bindData[j].show = true;
-          }
-
-          if (this.form.type == 1 && this.filterContract[i].constructionSiteID == this.bindData[j].id) {
-            this.bindData[j].show = true;
-          }
-
-        }
-      }
-    },
-    getEarthsiteId(value) {
-
-      this.form.contract = null;
-      this.form.contractId = null;
-
-      let name = this.form.name;
-      let objId = this.form.objectId;
-
-      this.form.name = null;
-      this.form.objectId = null;
-
-
-      let item;
-      for (let i in this.bindData) {
-        if (this.bindData[i].name == value) {
-          item = this.bindData[i];
-          break;
-        }
-      }
-
-      this.form.earthsitesName = item.name;
-      this.form.earthsitesId = item.id;
-      this.filterConract();
-
-      if (this.filterContract.length == 0) {
-        this.form.earthSiteName = null;
-        this.form.earthSiteID = null;
-        this.$message("未找到对应消纳合同!!");
-      }
-
-      this.filterConract();
-
-      for (let i in this.filterContract) {
-        if (this.filterContract[i].constructionSiteID == objId || this.filterContract[i].earthSiteID == objId) {
-          this.form.name = name;
-          this.form.objectId = objId;
-          break;
-        }
-      }
-
-
-    },
     downloadFile(path) {
       window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
     },
@@ -558,43 +421,25 @@ export default {
         this.rules.companys[0].required = false;
         this.rules.companyTrucks[0].required = false;
+
+        this.form.name = null;
+        this.bindname = null;
+
         if (value == "0") {
           this.labelName = "工地名称";
-          this.labelName2 = "绑定处理场所";
+          constructionsitesList(this.remoteQueryData).then(res => {
+              this.remoteData = res.result.list;
+              this.rules.companys[0].required = true;
+              this.rules.companyTrucks[0].required = true;
+          });
         } else {
           this.labelName = "处理场所名称";
-          this.labelName2 = "绑定工地";
-        }
-
-      this.form.name = null;
-      this.bindname = null;
-      constructionsitesList(this.remoteQueryData).then(res => {
-        if (value == 0) {
-          this.remoteData = res.result.list;
-        } else {
-          this.bindData = res.result.list;
-
-          for (let i in this.bindData) {
-            this.bindData[i].show = true;
-          }
-        }
-      });
-
-      earthsitesList(this.remoteQueryData).then(res => {
-        if (value == 0) {
-          this.bindData = res.result.list;
-          for (let i in this.bindData) {
-            this.bindData[i].show = true;
-          }
-          this.rules.companys[0].required = true;
-          this.rules.companyTrucks[0].required = true;
-        } else {
-          this.remoteData = res.result.list;
+          earthsitesList(this.remoteQueryData).then(res => {
+              this.remoteData = res.result.list;
+          });
         }
-      });
     },
-
     getAreaName(code) {
       for (let i = 0; i < this.areas.length; i++) {
         if (Number(code) == this.areas[i].code) {
@@ -604,7 +449,6 @@ export default {
       }
       return code;
     },
-
     /** 查询报工自查列表 */
     getList(tabIdx) {
       if (tabIdx == 1) {
@@ -636,7 +480,6 @@ export default {
       contractList(query).then(res => {
         this.contractList = res.result.list;
-        this.filterContract = this.contractList
       });
       this.loading = true;
@@ -688,7 +531,6 @@ export default {
         phone: null
       };
       this.resetForm("form");
-      this.filterConract();
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -773,10 +615,44 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-
       this.$refs["form"].validate(valid => {
         if (valid) {
+
+          if(this.form.type == 0){
+            let racts = [];
+            let ractsName = [];
+            let earthIds = [];
+            let earthNames = [];
+
+            for(let i in this.contractList){
+              if(this.contractList[i].constructionSiteID == this.form.objectId){
+                  racts.push(this.contractList[i].id);
+                  ractsName.push(this.contractList[i].contractNo);
+                  earthIds.push(this.contractList[i].earthSiteID);
+                  earthNames.push(this.contractList[i].earthSiteName);
+              }
+            }
+
+            this.form.earthsitesId = earthIds + "";
+            this.form.earthsitesName = earthNames + "";
+            this.form.contract = ractsName + "";
+            this.form.contractId = racts + "";
+          }
+          // else{
+            // for(let i in this.contractList){
+            //   if(this.contractList[i].earthSiteID == this.form.objectId){
+            //       let item = this.contractList[i];
+            //     this.form.contract = item.contractNo;
+            //     this.form.contractId = item.id;
+            //     this.form.earthsitesId  = item.constructionSiteID;
+            //     this.form.earthsitesName = item.constructionSiteName;
+            //     break;
+            //   }
+            // }
+          // }
+
           this.loading = true;
+
           if (this.form.id != null) {
             if (this.queryParams.pageStatus == 1) {
               updateThreestep(this.form).then(response => {
@@ -802,6 +678,7 @@ export default {
               this.form.companys = this.form.companys + "";
               this.form.companyTrucks = this.form.companyTrucks + "";
+
               for (let i = 0; i < 13; i++) {
                 if (this.form["img" + i]) {
                   this.form["img" + i] = this.form["img" + i] + "";
@@ -50,16 +50,25 @@
         <div v-for="dict in dicts">
           <p >{{dict.name}}</p>
-          <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>
+          <el-image v-for="item in infoData.attachmentList"
+                    style="width: 40px; height: 40px; margin: 5px;"
+                    :src="'/remotedown/' + item.attachmentPath"
+                    :z-index="2000"
+                    v-if="item.typeCode == dict.code && (path.toLowerCase().indexOf(".jpg") > -1 || path.toLowerCase().indexOf(".png") > -1)">
+          </el-image>
+          <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" 
+            v-if="item.typeCode == dict.code 
+            && path.toLowerCase().indexOf(".jpg") == -1
+            && path.toLowerCase().indexOf(".png") == -1"><p>{{item.name}}</p></a>
         </div>
-      <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
+      <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
         <el-image
                   style="width: 350px; height: 350px; margin: 5px;"
-                  :src="picImage"
+                  :src="'/remotedown/' + picImage"
                   :preview-src-list="[picImage]"
                   :z-index="2000">
         </el-image>
-      </el-dialog>
+      </el-dialog> -->
     </div>
   </div>
 </template>
@@ -2,11 +2,19 @@
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">报工记录</el-button>
+        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">有效报工记录</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini" @click="getList(1);">历史报工记录</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==2}" size="mini" @click="getList(2);">工地报工记录</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==3}" size="mini" @click="getList(3);">处理场所报工记录</el-button>
+      </el-col>
+
     </el-row>
     <el-form :model="queryParams" ref="queryForm" label-width="100px">
@@ -46,7 +54,7 @@
       </el-row>
       <el-row>
         <el-col :span="6">
-      <el-form-item label="开始时间" v-if="this.queryParams.his==1">
+      <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"
@@ -64,7 +72,7 @@
       </el-form-item>
     </el-form>
-    <p> {{dayWorkCount}}</p>
+    <p v-if="queryParams.his < 2"> {{dayWorkCount}}</p>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -73,7 +81,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table :data="threestepList" @selection-change="handleSelectionChange">
+    <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="日期" align="center" prop="createTime" />
         <el-table-column label="工地名称" align="center" prop="name" >
@@ -97,12 +105,42 @@
         <el-table-column label="备注" align="center" prop="descript"/>
     </el-table>
+    <el-table :data="threestepList" @selection-change="handleSelectionChange"  v-if="queryParams.his > 1">
+      <el-table-column label="序号" align="center" type='index'/>
+
+      <el-table-column label="项目类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <span>{{ scope.row.type==0?"工地":"处理场所"}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="name" />
+
+      <el-table-column label="管辖区" align="center" prop="place">
+      </el-table-column>
+
+      <el-table-column label="自查时间" align="center" prop="selfCheckTime" width="180">
+        <template slot-scope="scope">
+          <span>{{scope.row.selfCheckTime}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡查时间" align="center" prop="checkTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.checkTime}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="getInfo(scope.row,0);"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
     <el-dialog title="查看详情" width="800px" append-to-body :visible.sync="info2">
       <threestepInfo :businessKey="businessKey" v-if="info2"/>
     </el-dialog>
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+      @pagination="getList(queryParams.his)" />
   </div>
 </template>
@@ -120,7 +120,7 @@
           </el-col>
         </el-row>
         <el-row type="flex" justify="center" v-if="form.type != null">
-          <el-col :span="12">
+          <el-col >
             <el-form-item :label="labelName" prop="name">
               <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId">
                 <el-option v-for="item in remoteData" :label="item.name"
@@ -129,7 +129,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item :label="labelName2" prop="place">
               <el-select v-model="bindname" filterable  reserve-keyword @change="getEarthsiteId">
                 <el-option  v-if="item.show"
@@ -140,9 +140,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
-        <el-row type="flex" justify="center"  v-if="form.type != null">
+        <!-- <el-row type="flex" justify="center"  v-if="form.type != null">
           <el-col>
             <el-form-item label="消纳合同" prop="contract">
               <el-select v-model="form.contract" filterable  reserve-keyword  @change="conractCheck">
@@ -151,7 +151,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row type="flex" justify="center" v-if="form.type == 0" >
           <el-col :span="12" >
             <el-form-item label="运输企业" prop="companys">
@@ -263,120 +263,37 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		List<Map<String,String>> list = new ArrayList<Map<String,String>>();
 		for(SupervisionThreestep s:constructions){
-			Map<String,String> map = new HashMap<String, String>();
-			map.put("id", s.getId() + "");
-			map.put("createTime", yearFomat.format(s.getCreateTime()));
-			map.put("name", s.getName());
-			map.put("place", s.getPlace());
-			map.put("status", s.getStatus() == 1 ? "开工" : "未开工");
-			map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
-			map.put("objectId", s.getObjectId());
-			map.put("type", "");
 			for(SupervisionThreestep e:earthsites){
-				if(s.getEarthsitesId() == null || e.getEarthsitesId() == null){
-					continue;
-				}
-				
-				if(s.getEarthsitesId().equals(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime())) 
-						&& e.getEarthsitesId().equals(s.getObjectId())){
+				if(s.getEarthsitesId().contains(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){
-					if(s.getStatus() != 1 && e.getStatus() != 1){
+					if(s.getStatus() != 1 || e.getStatus() != 1){
 						continue;
 					}
+					Map<String,String> map = new HashMap<String, String>();
+					map.put("id", s.getId() + "");
+					map.put("createTime", yearFomat.format(s.getCreateTime()));
+					map.put("name", s.getName());
+					map.put("place", s.getPlace());
+					map.put("status", "开工");
+					map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
+					map.put("objectId", s.getObjectId());
+					map.put("type", "");
 					map.put("eid", e.getObjectId());
 					map.put("ename", e.getName());
 					map.put("eplace", e.getPlace());
-					map.put("estatus", e.getStatus() == 1 ? "开工" : "未开工");
+					map.put("estatus", "开工" );
 					map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
 					map.put("etype", "");
-					if(s.getStatus() == 1 && e.getStatus() == 1){
-						map.put("descript", "有效开工");
-					}else{
-						String string = s.getStatus() != 1 ? "工地未开工" : "";
-						string += e.getStatus() != 1 ? "处理场所未开工" : "";
-						map.put("descript", string );
-					}
-				}
-			}
-			
-			if(map.get("ename") == null){
-				if(s.getStatus() != 1){
-					continue;
-				}
-				
-				Map map2 = new HashedMap<>();
-				List ids = new ArrayList<>();
-				ids.add(s.getEarthsitesId());
-				
-				map2.put("ids", ids);
-				map2.put("size", 1);
-				map2.put("page", 1);
-				
-				JSONObject earthList = RemoteServerUtils.getEarthSitesInfo( s.getEarthsitesId());
-				
-				if(earthList != null && earthList.size() > 0){
-					map.put("eplace",((JSONObject)earthList).getString("areaName"));
-				}
-				
-				map.put("eid", s.getEarthsitesId());
-				map.put("ename", s.getEarthsitesName());
-				map.put("estatus", "未开工");
-				map.put("descript", "处理场所未开工");
-				map.put("etype", "");
-				
-			}
-			list.add(map);
-		}
-
-		
-		List newList = new ArrayList<>();
-
-		for(SupervisionThreestep e:earthsites){
-			if(e.getStatus() != 1){
-				continue;
-			}
-			
-			Map map = new HashMap();
-			boolean needAdd = true;
-			for(Map<String,String> m:list){
-				if(e.getEarthsitesId().equals(m.get("objectId")) && e.getObjectId().equals(m.get("eid"))  && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
-					needAdd = false;
-					break;
+					map.put("descript", "有效开工");
+					
+					list.add(map);
 				}
 			}
-			
-			if(!needAdd)
-				continue;
-			
-			JSONObject con = RemoteServerUtils.getConstructionInfo(e.getEarthsitesId());
-
-			
-			map.put("id", e.getId() + "");
-			map.put("createTime", yearFomat.format(e.getCreateTime()));
-			map.put("name", e.getEarthsitesName());
-			map.put("place", con.getString("areaCode"));
-			map.put("status", "未开工");
-			map.put("objectId", e.getEarthsitesId());
-			map.put("eid", e.getObjectId());
-			map.put("etype", "");
-			map.put("type", "");
-			map.put("ename", e.getName());
-			map.put("eplace", e.getPlace());
-			map.put("estatus", "开工");
-			map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
-			map.put("descript", "工地未开工");
-			
-			newList.add(map);
 		}
-		
-		if(newList.size() >0){
-			list.addAll(newList);
-		}
-		
 		List FilterList = new ArrayList<>();
@@ -773,7 +690,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				for(String truck: truckArray){
-					
 					if(truckObject.getString("vehicleId").equals(truck)){
 						TruckActivate truckActivate = new TruckActivate();