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

youxiw2000
2 parents 83aacd22 e3e9e4b2
Showing 3 changed files with 29 additions and 16 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderImage.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-ui/src/views/gar/order/index.vue
@@ -29,6 +29,11 @@ public class GarOrderImage implements Serializable {
      */
     private String garOrderId;
+	/**
+	 * 趟次表 id
+	 */
+	private String garOrderAskId;
+
     /**
      * 图片类型
      */
@@ -146,7 +151,12 @@ public class GarOrderImage implements Serializable {
 	public void setGarRemark(String garRemark) {
 		this.garRemark = garRemark;
 	}
-    
-    
+	public String getGarOrderAskId() {
+		return garOrderAskId;
+	}
+
+	public void setGarOrderAskId(String garOrderAskId) {
+		this.garOrderAskId = garOrderAskId;
+	}
 }
 \ No newline at end of file
@@ -607,15 +607,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     @Transactional
     public String uploadImageUrlByType(UploadDto dto) {
-        List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
-        for (String imageUrl : dto.getImageUrls()) {
-            GarOrderImage orderImage = new GarOrderImage();
-            orderImage.setGarOrderId(dto.getGarOrderId());
-            orderImage.setGarOrderImageUrl(imageUrl);
-            orderImage.setGarOrderImageType(dto.getType());
-            garOrderImages.add(orderImage);
-        }
-
+        String GarOrderAskId = "";
         GarOrder order = getById(dto.getGarOrderId());
         //判断是否已开始装车
         if (dto.getType() == 1) {
@@ -678,6 +670,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     garOrderMatchAsk.setDropCarNum(++dropCarNum);
                     garOrderMatchAsk.setGarCreateTime(new Date());
                     garOrderMatchAsk.setGarCarCode(dto.getCarPlate());
+                    GarOrderAskId = garOrderMatchAsk.getGarOrderNumber();
                     askService.updateById(garOrderMatchAsk);
                     break;
                 }
@@ -686,6 +679,16 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
+        List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
+        for (String imageUrl : dto.getImageUrls()) {
+            GarOrderImage orderImage = new GarOrderImage();
+            orderImage.setGarOrderAskId(GarOrderAskId);
+            orderImage.setGarOrderId(dto.getGarOrderId());
+            orderImage.setGarOrderImageUrl(imageUrl);
+            orderImage.setGarOrderImageType(dto.getType());
+            garOrderImages.add(orderImage);
+        }
+
         garOrderImageService.saveBatch(garOrderImages);
         return "上传成功！";
     }
@@ -140,7 +140,7 @@
               <el-input v-model="orderDriver.driverPhone" placeholder="派单负责人电话" :disabled="true"/>
             </el-form-item>
           </div>
-          
+
           <el-form-item v-if="form.putOnImages" label="现场图片" prop="putOnImages">
             <el-image style="width: 100px; height: 100px" :src="form.putOnImages[0]" :preview-src-list="form.putOnImages">
             </el-image>
@@ -174,7 +174,7 @@
               <el-input v-model="disposalCompanyReport.disposalCompanyName" placeholder="处置场所" style="width: 446px;" :disabled="true"/>
             </el-form-item>
           </div>
-          
+
           <el-form-item v-if="form.panoramas" label="现场图片" prop="putOnImages">
             <el-image style="width: 100px; height: 100px" :src="form.panoramas[0]" :preview-src-list="form.panoramas">
             </el-image>
@@ -345,7 +345,7 @@ export default {
       this.reset();
       const garOrderId = row.garOrderId || this.ids
       getOrder(garOrderId).then(response => {
-        
+
         this.form = response.data;
         this.form.currentImages = this.form.currentImages.map(map => process.env.VUE_APP_BASE_API + map)
         this.form.putDownImages = this.form.putDownImages.map(map => process.env.VUE_APP_BASE_API + map)
@@ -355,7 +355,7 @@ export default {
         this.combnationImagePath(this.form.putDownImages);
         this.combnationImagePath(this.form.putOnImages);
         this.combnationImagePath(this.form.panoramas);
-        
+
         this.open = true;
         this.title = "清运派单详情";
       });
@@ -403,7 +403,7 @@ export default {
       })
     },
     displayImage(url){
-      return null == url|| undefined == url || "" == url?"":this.smallProgramRemoteFrame+url;
+      return null == url|| undefined == url || "" == url?"":process.env.VUE_APP_BASE_API+url;
     },
     combnationImagePath(nodes){
       if(nodes){