Merge remote-tracking branch 'origin/dev' into dev

273548560@qq.com
2 parents a803ea63 780c131f
Showing 20 changed files with 182 additions and 86 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/index3.vue → trash-ui/src/layout/inde3x.vue
trash-ui/src/views/activiti/task/constructsiteInfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/business/DriverCredit/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/threestepInfo.vue
trash-ui/src/views/h5/DriverCredit/index.vue
trash-ui/src/views/h5/dayWorkReport/index.vue
trash-ui/src/views/h5/task/constructsiteInfo.vue
trash-ui/src/views/h5/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
@@ -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,35 +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;
-
-
-          for (let i = 0; i < this.threestepList.length; i++) {
-            if (this.outside.indexOf(this.threestepList[i].place) > -1) {
-              if (this.threestepList[i].status == "开工") {
-                this.threestepList[i].estatus = "开工";
-                this.threestepList[i].eselfCheckTime = this.threestepList[i].selfCheckTime;
-                this.threestepList[i].descript = "开工";
-              }
-            }
-
-          }
+          this.loading.close();
-            this.loading = false;
           this.dayWorkCount = response.msg;
           this.total = response.total;
       });
@@ -299,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
+};
@@ -13,6 +13,7 @@
   import threestepInfo from "@/views/business/threestep/threestepInfo";
   import h5Info from "@/views/h5/task/threestepInfo";
+  import h5Page from '@/views/h5/Pagination';
   import {
     Upload
@@ -37,7 +38,9 @@
     name: "Threestep",
     components: {
       threestepInfo,
-      h5Info
+      h5Info,
+
+      h5Page
     },
     data() {
       return {
@@ -189,6 +192,12 @@
       };
     },
     created() {
+      if(window.location.search){
+        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++){
@@ -196,7 +205,7 @@
         }
       });
-      this.getList(0);
+      this.getList(this.queryParams.pageStatus);
     },
     methods: {
@@ -339,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});
@@ -660,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 {
         // 遮罩层
@@ -129,21 +129,16 @@
           <el-col :span="6" class="bd_right bd_padding">消纳场地</el-col>
           <el-col :span="18" class="bd_padding">{{infoData.earthSiteNames}}</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.routeNames}}</el-col>
         </el-row>
-      </el-col>
-    </el-row>
-
-
-    <el-row class="bd_left bd_right bd_bottom" v-if="signData && signData.sign1">
-      <el-col :span="1" class="bd_padding bd_right"  >部门意见</el-col>
-        <el-col :span="23" >
-          <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
-          <el-row >
-            <label style="float: right;">勘察人:<img :src="signData.sign1" width="100px" height="40px"  v-if="signData.sign1"/></label>
-          </el-row>
+        <el-col :span="24" >
+            <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
+            <el-row class="bd_padding">
+              <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
+            </el-row>
+        </el-col>
       </el-col>
     </el-row>
@@ -198,8 +198,7 @@
     <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
       <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
       <el-row>
-
-        <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
+        <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;" ></el-input>
       </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
@@ -90,6 +90,7 @@
             placeholder="驾驶员姓名"
             @change="getObjId">
             <el-option
+              v-if="dictNames.indexOf(item.name) == -1"
               v-for="item in driverList"
               :key="item.id"
               :label="item.name"
@@ -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" />
@@ -455,7 +455,6 @@
        window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
      },
       getInfo() {
-        debugger;
         let id;
         if(this.businessKey.split(":").length == 2){
           id = this.businessKey.split(":")[1];
@@ -95,6 +95,7 @@
             placeholder="驾驶员姓名"
             @change="getObjId">
             <el-option
+              v-if="dictNames.indexOf(item.name) == -1"
               v-for="item in driverList"
               :key="item.id"
               :label="item.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" />
@@ -132,17 +132,13 @@
           <el-col :span="6" class="bd_right bd_padding">行驶路线</el-col>
           <el-col :span="18" class="bd_padding">{{infoData.routeNames}}</el-col>
         </el-row>
-      </el-col>
-    </el-row>
-
-
-    <el-row class="bd_left bd_right bd_bottom" v-if="signData.sign1">
-      <el-col :span="2" class="bd_padding bd_right"  >部门意见</el-col>
-        <el-col :span="22" >
-          <el-row class="bd_padding">{{signData.sign1Text}}</el-row>
-          <el-row >
-            <label style="float: right;">勘察人:<img :src="signData.sign1" width="100px" height="40px"  v-if="signData.sign1"/></label>
-          </el-row>
+        <el-col :span="24" >
+              <el-row class="bd_padding">{{infoData.applyOpinion}}</el-row>
+              <el-row class="bd_padding">
+                <label style="float: right;">勘察人:{{infoData.surveyor}}</label>
+              </el-row>
+          </el-col>
+        </el-col>
       </el-col>
     </el-row>
@@ -71,7 +71,7 @@
      </el-card>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <h5Page v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
     <el-dialog :title="title" :visible.sync="open" width="330px" append-to-body v-loading="loading">
@@ -273,7 +273,7 @@
       <el-dialog title="查看详情" width="400px" append-to-body :visible.sync="info2" >
         <h5Info :businessKey="businessKey" v-if="info2"/>
-      
+
       </el-dialog>
     <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose" width="330px">
@@ -296,8 +296,6 @@
 <script>
-import pagination from '../Pagination';
-
 </script>
 <script src="../../../api/three_step.js" />
@@ -305,4 +303,8 @@ import pagination from &#39;../Pagination&#39;;
   .el-select-dropdown__item{
     width:300px;
   }
-</style>
 \ No newline at end of file
+  
+  .card_title{
+    word-break: break-all;
+  }
+</style>
@@ -178,6 +178,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
@@ -207,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<>();
@@ -232,7 +236,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				if(yearFomat.format(s.getSelfCheckTime()).equals(yearFomat.format(new Date()))){
 					continue;
 				}
-			
 			}
 			if(s.getType() == 0){
@@ -313,6 +316,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			}
 			list.add(map);
 		}
+
 		List newList = new ArrayList<>();
@@ -334,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()));
@@ -357,6 +362,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			list.addAll(newList);
 		}
+
 		List FilterList = new ArrayList<>();
@@ -400,7 +406,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			FilterList.add(map);
 		}
-		
+
 		return FilterList;
 	}
@@ -582,6 +588,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	 * @return 结果
 	 */
 	@Override
+	@Transactional
 	public int updateSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
 		return supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
 	} 
@@ -591,15 +598,63 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	@Override
 	public int activeSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
-		int i = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
+		int j = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
-
 		supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
+		
+		JSONArray areas = RemoteServerUtils.getAreas();
+		
+		for(int i =0;i< outside.length;i++){
+			
+			for(Object object:areas){
+				
+				JSONObject area = (JSONObject)object;
+
+				if(outside[i].equals(area.getString("name"))){
+					outside[i] = area.getString("code");
+				}
+				
+			}
+			
+		}
+		
+		
+		
+		if(supervisionThreestep.getStatus() == 1 && supervisionThreestep.getType() == 0){
+			for(String out:outside){
+        		if(out.equals(supervisionThreestep.getPlace())){
+        			
+        			
+        			supervisionThreestep.setId(null);
+        			String name = supervisionThreestep.getName();
+        			String objId = supervisionThreestep.getObjectId();
+        			String eName = supervisionThreestep.getEarthsitesName();
+        			String eId = supervisionThreestep.getEarthsitesId();
+        			supervisionThreestep.setCompanys(null);
+        			supervisionThreestep.setCompanyTrucks(null);
+        			supervisionThreestep.setType(1L);
+        			
+        			supervisionThreestep.setEarthsitesId(objId);
+        			supervisionThreestep.setEarthsitesName(name);
+        			supervisionThreestep.setName(eName);
+        			supervisionThreestep.setObjectId(eId);
+        			supervisionThreestep.setCheckTime(new Date());
+        			
+        			supervisionThreestepMapper.insertSupervisionThreestep(supervisionThreestep);
+        			
+        			return j;
+        		}
+        	}
+			
+			
+		}
+		
+		
 //		if(supervisionThreestep.getType() == 0 && supervisionThreestep.getStatus() == 1)
 //			checkDataToActiveTruck(supervisionThreestep,null);
-		return i;
+		return j;
 	}
 	@Override
@@ -607,12 +662,33 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		String trucks = construct.getCompanyTrucks();
-		if(trucks != null){
-			String[] truckArray = trucks.split(",");
+		String[] truckArray = trucks.split(",");
+		
+		String unActiveTruck = "";
+		
+		for(String truckId:truckArray){
+
+			TruckActivate truckActivate = new TruckActivate();
+			truckActivate.setObjectId(truckId); //设置ID
+			truckActivate.setCreateTime(construct.getCheckTime());
+
+			List<TruckActivate> taList = truckActivateService.selectTruckActivateList(truckActivate);
+			
+			if(taList.size() == 0 || taList.get(0).getActivateTime() == null){
+				unActiveTruck += truckId + ",";
+			}
+		}
+		
+		
+		if(!unActiveTruck.isEmpty()){
+
+			unActiveTruck = unActiveTruck.substring(0,unActiveTruck.length()-1);
 			Map<String,Object> params = new HashedMap<>();
+			truckArray = unActiveTruck.split(",");
+			
 			params.put("vehicleIds", truckArray);
 			params.put("page", 1);
 			params.put("size", 9999);
@@ -657,10 +733,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 							truckActivate.setActivateTime(new Date());
 						}
-						
-						System.out.println(truckObject.getString("licenseplateNo") + "  " + truckObject.getInteger("vehicleStatus"));
-						
-						
 						if(taList.size() > 0){
 							truckActivate.setId(taList.get(0).getId());
 							truckActivateMapper.updateTruckActivate(truckActivate);
@@ -38,6 +38,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="activateDate != null "> and activate_time like concat('%',#{activateDate},'%')</if>
             <if test="activateStatus == 0 "> and activate_time is null</if>
             <if test="activateStatus == 1 "> and activate_time is not null</if>
+            <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
         </where>
     </select>