m

youxiw2000
1 parent 6d4662af
Showing 12 changed files with 76 additions and 37 deletions
trash-admin/src/main/resources/application.yml
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/construction_credit.js
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/driver_credit.js
trash-ui/src/api/earthsites_credit.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_credit.js
trash-ui/src/layout/index333.vue → trash-ui/src/layout/inde3x.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/h5/dayWorkReport/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
@@ -19,6 +19,7 @@ spring:
       group-id: trash123
       key-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
+      max-poll-records: 1
  
   # 资源信息
   messages:
@@ -126,7 +126,11 @@ public class DriverTask
     	List<SupervisionThreestep> cs = SpringUtils.getBean(SupervisionThreestepMapper.class).selectTodayDataList(param);
  
     	for(SupervisionThreestep c:cs){
-    	       SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c,TOKEN);
+    		try {
+     	       SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c,TOKEN);
+			} catch (Exception e) {
+				// TODO: handle exception
+			}
     	}
  
 	}
@@ -18,8 +18,13 @@ import {
     updateConstructionsites
   } from "@/api/dict";
  
+import h5Page from '@/views/h5/Pagination';
+
   export default {
-    name: "ConstructionCredit",
+    name: "ConstructionCredit",  
+    components: {
+    h5Page
+    },
     data() {
       return {
         // 遮罩层
@@ -288,4 +293,4 @@ import {
         })
       }
     }
-  };
 \ No newline at end of file
+  };
+
+import h5Page from '@/views/h5/Pagination';
+
+
 import {
   dayWorkList,
   exportDayWorkList,
@@ -21,6 +25,9 @@ import {
  
 export default {
   name: "dayWorkReport",
+  components: {
+    h5Page
+  },
   data() {
     return {
       // 遮罩层
@@ -96,7 +103,7 @@ export default {
   },
   created() {
     this.getList(0);
-    
+
     getArea().then(res=>{
       this.areas = res.result;
     });
@@ -180,7 +187,8 @@ export default {
         if (this.queryParams.his == 1) {
           exportDayWorkHistoryList(data).then(res => {
  
-            this.loading = false;
+            this.loading.close();
+
  
             this.queryParams.page = page;
             this.queryParams.pageSize = size;
@@ -191,7 +199,8 @@ export default {
         } else {
           exportDayWorkList(data).then(res => {
  
-            this.loading = false;
+            this.loading.close();
+
             debugger;
             console.log(page);
             this.queryParams.page = page;
@@ -211,23 +220,29 @@ export default {
     /** 查询开工报表列表 */
     getList(tabIdx) {
  
-      this.loading = true;
-
+      this.loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255, 255, 255, 0.7)'
+              });
       // let query = this.queryParams;
  
       if (tabIdx == 1) {
+      this.queryParams.pageNum = 1;
         this.resetQuery();
         this.queryParams.his = tabIdx;
       } else if (tabIdx == 0) {
+      this.queryParams.pageNum = 1;
         this.resetQuery();
         this.queryParams.his = tabIdx;
       }
  
       dayWorkList(this.queryParams).then(response => {
+          this.threestepList = response.rows;
  
-        this.threestepList = response.rows;
+          this.loading.close();
  
-          this.loading = false;
           this.dayWorkCount = response.msg;
           this.total = response.total;
       });
@@ -287,9 +302,7 @@ export default {
       this.queryParams.earthsitesName = null;
       this.queryParams.name = null;
  
-
       this.resetForm("queryForm");
-      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -8,7 +8,7 @@ import {
   getNames,
   historyCredit
 } from "@/api/business/driver";
-
+import h5Page from '@/views/h5/Pagination';
 import {
   companyList,
   driverList
@@ -16,6 +16,9 @@ import {
  
 export default {
   name: "ConstructionCredit",
+  components: {
+  h5Page
+  },
   data() {
     return {
       // 遮罩层
@@ -233,4 +236,4 @@ export default {
       })
     }
   }
-};
 \ No newline at end of file
+};
@@ -16,11 +16,14 @@ import {
   earthsitesList,
   updateEarthsites
 } from "@/api/dict";
-
+import h5Page from '@/views/h5/Pagination';
 import requestRemote from '@/utils/requestRemote'
  
 export default {
   name: "EarthSitesCredit",
+  components: {
+  h5Page
+  },
   data() {
     return {
       // 遮罩层
@@ -256,4 +259,4 @@ export default {
       })
     }
   }
-};
 \ No newline at end of file
+};
@@ -39,7 +39,7 @@
     components: {
       threestepInfo,
       h5Info,
-      
+
       h5Page
     },
     data() {
@@ -196,8 +196,8 @@
         let arr = window.location.search.split("&");
         this.queryParams.pageStatus = arr[0].split("=")[1];
       }
-      
-      
+
+
       getArea().then(res => {
         this.areas = res.result;
         for(let i =0;i< this.threestepList.length;i++){
@@ -348,7 +348,6 @@
  
               getConstructionTruck(item.id).then(res=>{
                 for(let i in res.result){
-                  debugger;
                     this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
                     for(let j in res.result[i].vehicleList){
                       this.truckList.push({id:res.result[i].vehicleList[j].id,licenseplateNo:res.result[i].vehicleList[j].licenseplateNo,companyName:res.result[i].companyName});
@@ -669,7 +668,6 @@
       },
       /** 修改按钮操作 */
       handleUpdate(row,idx) {
-          debugger;
           this.reset();
           this.businessKey = row.id +"";
           if(idx == 0){
@@ -19,6 +19,9 @@
  
   export default {
     name: "Credit",
+    components: {
+    h5Page
+    },
     data() {
       return {
         // 遮罩层
@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
  
-    <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
+    <el-table :data="threestepList" @selection-change="handleSelectionChange">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="日期" align="center" prop="createTime" />
         <el-table-column label="工地名称" align="center" prop="name" />
 <template>
-  <div class="app-container">
+  <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"
@@ -28,7 +28,7 @@
  
       <el-form-item label="消纳场区属" prop="subReason">
         <el-select v-model="queryParams.subReason" placeholder="工地所属区域 "  size="small">
-          <el-option v-for="item in areas" :label="item.name" :value="item.code" />
+          <el-option v-for="item in areas" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
       <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.his==1">
@@ -108,6 +108,9 @@
   .el-select-dropdown__item{
     width:300px;
   }
+  .card_title{
+    word-break: break-all;
+  }
 </style>
  
 <script src="../../../api/dayWorkReport.js" />
@@ -210,21 +210,22 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-		}
-		if(supervisionThreestep.getHis().equals("1")){
-			try {
-				supervisionThreestep.setWorkStartTime(dateTime.parse("2000-01-01 00:00:00"));
-				supervisionThreestep.setWorkEndTime(dateTime.parse("2100-01-01 00:00:00"));
-			} catch (ParseException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+			if(supervisionThreestep.getHis().equals("1")){
+				try {
+					supervisionThreestep.setWorkStartTime(dateTime.parse("2000-01-01 00:00:00"));
+					supervisionThreestep.setWorkEndTime(dateTime.parse("2100-01-01 00:00:00"));
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
 		}
  
-		
  
 		List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
+
  
+		long start = new Date().getTime();
  
 		List<SupervisionThreestep> constructions = new ArrayList<>();
 		List<SupervisionThreestep> earthsites = new ArrayList<>();
@@ -235,7 +236,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				if(yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))){
 					continue;
 				}
-			
 			}
  
 			if(s.getType() == 0){
@@ -316,6 +316,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 			list.add(map);
 		}
+
  
 		List newList = new ArrayList<>();
  
@@ -337,6 +338,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				continue;
  
 			JSONObject con = RemoteServerUtils.getConstructionInfo(e.getEarthsitesId());
+
  
 			map.put("id", e.getId() + "");
 			map.put("createTime", yearFomat.format(e.getCreateTime()));
@@ -360,6 +362,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			list.addAll(newList);
 		}
  
+
  
 		List FilterList = new ArrayList<>();
  
@@ -403,7 +406,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			FilterList.add(map);
  
 		}
-		
+
 		return FilterList;
 	}
  
@@ -636,6 +639,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
         			supervisionThreestep.setEarthsitesName(name);
         			supervisionThreestep.setName(eName);
         			supervisionThreestep.setObjectId(eId);
+        			supervisionThreestep.setCheckTime(new Date());
  
         			supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
  
@@ -671,7 +675,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 			List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
  
-			if(taList.get(0).getActivateTime() == null){
+			if(taList.size() == 0 || taList.get(0).getActivateTime() == null){
 				unActiveTruck += truckId + ",";
 			}
 		}
@@ -683,7 +687,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 			Map<String,Object> params = new HashedMap<>();
  
-			params.put("vehicleIds", unActiveTruck.split(","));
+			truckArray = unActiveTruck.split(",");
+			
+			params.put("vehicleIds", truckArray);
 			params.put("page", 1);
 			params.put("size", 9999);
 			JSONArray array = null;