m

youxiw2000
1 parent 688c46d1
Showing 6 changed files with 54 additions and 38 deletions
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/logback.xml
trash-ui/src/views/business/TruckCredit/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/resources/mapper/TruckCreditMapper.xml
@@ -16,9 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://183.66.242.6:6001
-    #remotePath: http://183.66.242.6:14601
+    #remotePath: http://183.66.242.6:6001
+    remotePath: http://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
+
 # 数据源配置
 spring:
     datasource:
@@ -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" />
@@ -15,7 +15,7 @@
       <el-row type="flex" justify="center">
         <el-col>
           <el-form-item label="车牌号码" prop="licensePlate" style="float:right;">
-            <el-select v-model="queryParams.licensePlate" filterable reserve-keyword placeholder="车牌号码" 
+            <el-select v-model="queryParams.licensePlate" filterable reserve-keyword placeholder="车牌号码"
               size="small" :loading="loading">
               <el-option v-for="item in dictNames" :label="item" :value="item">
               </el-option>
@@ -25,7 +25,7 @@
         <el-col>
           <el-form-item label="运输企业" prop="companyId">
-            <el-select v-model="queryParams.companyId" filterable reserve-keyword placeholder="运输企业" 
+            <el-select v-model="queryParams.companyId" filterable reserve-keyword placeholder="运输企业"
               size="small" :loading="loading">
               <el-option v-for="item in dictCompanys" :label="item" :value="item">
               </el-option>
@@ -94,13 +94,13 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
         <el-form-item label="运输企业" prop="companyId">
           <el-select v-model="form.companyId" filterable reserve-keyword placeholder="运输企业">
-            <el-option v-for="item in companyList"  @click.native="form.licensePlate=null;" :key="item.name" :label="item.name" :value="item.name" v-if="item.dishonestState==0">
+            <el-option v-for="item in companyList"  @click.native="form.licensePlate=null;" :key="item.name" :label="item.name" :value="item.name">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="车牌号码" prop="licensePlate">
           <el-select v-model="form.licensePlate" filterable reserve-keyword placeholder="车牌号码">
-            <el-option @click.native="getObjId(item)"  v-for="item in truckList" :key="item.id" :label="item.licenseplateNo" :value="item.licenseplateNo" v-if="form.companyId==item.companyName && item.creditStatus==0">
+            <el-option @click.native="getObjId(item)"  v-for="item in truckList" :key="item.id" :label="item.licenseplateNo" :value="item.licenseplateNo" v-if="form.companyId==item.companyName">
             </el-option>
           </el-select>
         </el-form-item>
@@ -295,11 +295,11 @@
       getData(stauts) {
         this.queryParams.status = 0;
         this.queryParams.lostCredit = stauts;
-        this.getList();
+        this.init();
       },
       getHistoryData() {
         this.queryParams.status = 1;
-        this.getList();
+        this.init();
       },
       colStyle(obj) {
         if (obj.column.property == "id") {
 <template>
   <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-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-row>
+
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="工地名称" prop="name">
@@ -21,12 +32,12 @@
           <el-option v-for="item in areas" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
-      <el-form-item label="开始时间" prop="workStartTime">
+      <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.his==1">
         <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
           value-format="yyyy-MM-dd" placeholder="开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="workEndTime">
+      <el-form-item label="结束时间" prop="workEndTime" v-if="this.queryParams.his==1">
         <el-date-picker  size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
           value-format="yyyy-MM-dd" placeholder="结束时间">
         </el-date-picker>
@@ -195,7 +206,20 @@
         this.loading = true;
-          dayWorkList(this.queryParams).then(response => {
+        let query = this.queryParams;
+
+        if(this.queryParams.his != tabIdx && tabIdx == 1){
+          this.queryParams.his = tabIdx;
+          query.workStartTime = "2000-01-01 00:00:00";
+          query.workEndTime = "2999-01-01 00:00:00";
+        }else if(tabIdx==0){
+          this.queryParams.his = null;
+          query.workStartTime = null;
+          query.workEndTime = null;
+        }
+
+          dayWorkList(query).then(response => {
+
             this.threestepList = response.rows;
             getArea().then(res => {
@@ -207,6 +231,7 @@
                     this.threestepList[i].descript = "开工";
                   }
                 }
+
               }
             });
@@ -225,23 +250,23 @@
                   }
                 }
               }
+                this.loading = false;
             });
             earthsitesList(this.remoteQueryData).then(res => {
               this.earthsitesList = res.result.list;
               for(let i =0;i< this.threestepList.length;i++){
                 for(let j =0;j<this.earthsitesList.length;j++){
-                console.log(this.threestepList[i].eid  + "==" + this.earthsitesList[j].id);
                   if(this.threestepList[i].eid == this.earthsitesList[j].id){
                         this.threestepList[i].etype = this.earthsitesList[j].typeName;
                         this.threestepList[i].eplace = this.earthsitesList[j].areaName;
                   }
                 }
               }
+                this.loading = false;
             });
             this.total = response.total;
-            this.loading = false;
           });
@@ -118,11 +118,11 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
         else
         	turckList = RemoteServerUtils.getTruckList(map,token);
-        List<Map> updateList = new ArrayList();
         if(turckList != null){
         	 for(Object objec:turckList){
-        		 
+
+        	     List<Map> updateList = new ArrayList();
         		 JSONObject truck = (JSONObject)objec;
         		 String truckId = truck.getString("id");
@@ -137,21 +137,22 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
         		 if(oldData.size() > 0){
         			 data = oldData.get(0);
         			 if(data.getLostCredit() != credit){
-        				 if(credit == 0 && data.getCreateType() == 1){
+        				 if(credit == 0 && (data.getCreateType() != null &&  data.getCreateType() == 1)){
             				 data.setLostCredit(credit);
             				 data.setReason("公司失信恢复");
             				 truckService.updateTruckCredit(data);
-            				 
             				 Map upParam = new HashedMap<>();
             				 upParam.put("creditStatus", credit);
             				 upParam.put("id", truckId);
             				 updateList.add(upParam);
+
+            				 if(token != null)
+                    			 RemoteServerUtils.updateTruckList(updateList,token);
+                    		 else
+                    			 RemoteServerUtils.updateTruckList(updateList);
             				 continue;
         				 }
-        				 if(credit == 1 && data.getCreateType() == 1){
-        					 continue;
-        				 }
         			 }
         		 }else{
         			 if(credit==0)
@@ -182,27 +183,15 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
     				 upParam.put("creditStatus", credit);
     				 upParam.put("id", truckId);
     				 updateList.add(upParam);
+    				 if(token != null)
+            			 RemoteServerUtils.updateTruckList(updateList,token);
+            		 else
+            			 RemoteServerUtils.updateTruckList(updateList);
+    				 
         		 }
         	 }
-        	 if(updateList.size() > 0){
-        		 if(token != null)
-        			 RemoteServerUtils.updateTruckList(updateList,token);
-        		 else
-        			 RemoteServerUtils.updateTruckList(updateList);
-        	 }
         }
-        updateList.clear();
-        
-        Map upParam = new HashedMap<>();
-		upParam.put("dishonestState", credit);
-		upParam.put("id", companyId);
-		updateList.add(upParam);
-        
-		 if(token != null)
-			 RemoteServerUtils.updateTruckList(updateList,token);
-		 else
-			 RemoteServerUtils.updateTruckList(updateList);
     }
     /**
@@ -120,6 +120,7 @@
         select c.* from (select a.* from truck_credit a where not exists (select b.* from truck_credit b where a.license_plate = b.license_plate and a.id &lt; id )) c
         <where>
+            <if test="companyId != null  and companyId != ''"> and company_id like concat('%',#{companyId},'%')</if>
             <if test="licensePlate != null  and licensePlate != ''"> and license_plate like concat('%', #{license_plate}, '%')</if>
         </where>
     </select>