Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

lichao
2 parents bf4c7bf9 48c41f3c
Showing 8 changed files with 90 additions and 18 deletions
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-ui/dist.7z
trash-ui/src/api/truck_active.js
trash-ui/src/views/gar/order/index.vue
@@ -89,7 +89,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 密码
-        password: bsth123
+        password: 
         # 连接超时时间
         timeout: 10s
         database: 10
@@ -51,11 +51,9 @@ public class GarCarController {
     @Autowired
     private GarCarServer garCarServer;
  
-
     public GarCarController(CarInfoServiceImpl carInfoServiceImpl) {
         this.carInfoServiceImpl = carInfoServiceImpl;
     }
-
     @PostMapping("/list/group/by/carType")
     public TableDataInfo listGroupByCarTypePost(GarCarInfoVo carInfo) throws ParseException{
         return listGroupByCarType(carInfo);
@@ -65,8 +63,6 @@ public class GarCarController {
  
         List<GarCarInfoVo> list = garCarServer.requestGarCarInfoVo(carInfo.getCompanyId());
  
-
-
 //        saveOrUpdateCarInfoAndDriver(list);
  
         TableDataInfo data = getDataTable(list);
@@ -194,8 +194,42 @@ public class GarOrder implements Serializable {
  
     @TableField(exist = false)
     private Integer garNowCarCount;
+    
+    
  
-    /**
+    public String getGarOrderHandlerStatusStr() {
+		return garOrderHandlerStatusStr;
+	}
+
+	public void setGarOrderHandlerStatusStr(String garOrderHandlerStatusStr) {
+		this.garOrderHandlerStatusStr = garOrderHandlerStatusStr;
+	}
+
+	public String getGarCancelFlagStr() {
+		return garCancelFlagStr;
+	}
+
+	public void setGarCancelFlagStr(String garCancelFlagStr) {
+		this.garCancelFlagStr = garCancelFlagStr;
+	}
+
+	public Boolean getNeedFollowCar() {
+		return needFollowCar;
+	}
+
+	public void setNeedFollowCar(Boolean needFollowCar) {
+		this.needFollowCar = needFollowCar;
+	}
+
+	public Integer getGarNowCarCount() {
+		return garNowCarCount;
+	}
+
+	public void setGarNowCarCount(Integer garNowCarCount) {
+		this.garNowCarCount = garNowCarCount;
+	}
+
+	/**
      * 是否有用户的评价，默认值是0，默认没有
      *
      * @author liujun
@@ -64,6 +64,11 @@ public class GarOrderCar implements Serializable {
     private String carId;
     /**车辆容积*/
     private String containerVolume;
+    
+
+    @TableField(exist = false)
+    private String plateNo;
+
  
     /**
      * 
@@ -75,7 +80,15 @@ public class GarOrderCar implements Serializable {
  
  
  
-    public String getGarId() {
+    public String getPlateNo() {
+		return plateNo;
+	}
+
+	public void setPlateNo(String plateNo) {
+		this.plateNo = plateNo;
+	}
+
+	public String getGarId() {
         return garId;
     }
  
@@ -13,7 +13,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
+import com.trash.carInfo.mapper.CarInfoMapper;
+import com.trash.carInfo.service.impl.CarInfoServiceImpl;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -111,6 +114,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Autowired
     private GarOrderAssociationServiceAsync garOrderAssociationServiceAsync;
     @Autowired
+    private CarInfoMapper carInfoMapper;
+    @Autowired
     private GarOrderCarMapper garOrderCarMapper;
  
     private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd");
@@ -222,6 +222,7 @@ export default {
       this.companyList = [];
       this.truckList = [];
  
+      let checkedList = [];
  
       constructionById(item.objectId).then(res => {
         for(let i in this.remoteCompanys){
@@ -233,7 +234,6 @@ export default {
             if(this.remoteCompanys[i].dishonestState != 0){
               credit ="(失信)";
             }
-
             this.companyList.push({
               id: res.result.transportCompanyId,
               name: res.result.transportCompany + credit,
@@ -241,12 +241,8 @@ export default {
             });
             break;
           }
-
         }
  
-
-
-
         let param = {
           companyID:res.result.transportCompanyId,
           auditStatus:1,
@@ -267,7 +263,6 @@ export default {
                continue;
             }
  
-
             for(let i in this.remoteCompanys){
               if(this.remoteCompanys[i].id == unit.companyId){
                 if(this.remoteCompanys[i].auditStatus != 1){
@@ -305,9 +300,9 @@ export default {
             let taList = response.rows;
             for(let i = 0;i< list.length;i++){
               //过滤勾选车辆
-              // if(vids.indexOf(list[i].id) == -1){
-              //   continue;
-              // }
+              if(vids.indexOf(list[i].id) == -1){
+                continue;
+              }
               let count = 0;
                 for(let j in taList){
                   if(taList[j].objectId == list[i].id){
@@ -160,7 +160,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <div v-for="(carItem,index) in form.orderCarStatistics" :key="index">
           <el-row :gutter="20">
             <el-col :span="12">
@@ -305,6 +304,10 @@
 <script>
 import { delOrder, exportOrder, getOrder, listOrder } from "@/api/gar/order";
  
+import {
+  truckList,
+} from "@/api/dict";
+
 export default {
   name: "Order",
   data() {
@@ -329,6 +332,7 @@ export default {
       open: false,
       // 是否显示弹出层
       openEvaluate: false,
+      tList:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -361,7 +365,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
     };
   },
   created() {
@@ -543,6 +547,15 @@ export default {
       // 开始处理
       processBatch();
     },
+    checkId(id){
+      return true;
+      for(let i in this.form.garCarInfoList){
+          if(this.form.garCarInfoList[i].carId == id){
+            return true;
+          }
+      }
+      return false;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -559,6 +572,22 @@ export default {
         this.combnationImagePath(this.form.putOnImages);
         this.combnationImagePath(this.form.panoramas);
  
+        let param = {
+          auditStatus:1,
+          valid:0,
+          page:1,
+          size:1000,
+          tag:"1",
+          companyID : row.garOrderCompanyId,
+        };
+
+
+
+        truckList(param).then(tres=>{
+          this.tList = tres.result.list;
+        });
+
+
         this.open = true;
         this.title = "清运派单详情";
       });