订单信息添加处置场所

liujun001
1 parent cfe521c4
Showing 11 changed files with 184 additions and 16 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchDisposalMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderCarReport.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDisposalCompanyReport.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchDisposalService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchDisposalMapper.xml
trash-ui/src/views/gar/order/index.vue
@@ -16,6 +16,8 @@ import java.util.List;
 public interface GarOrderMatchDisposalMapper extends BaseMapper<GarOrderMatchDisposal> {
  
     List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(@Param("orderId") String orderId);
+
+    List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(@Param("orderId") String orderId);
 }
  
  
+package com.trash.garbage.pojo.vo;
+
+public class OrderCarReport {
+    private String carNo;
+    private String carWeight;
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public String getCarWeight() {
+        return carWeight;
+    }
+
+    public void setCarWeight(String carWeight) {
+        this.carWeight = carWeight;
+    }
+}
@@ -166,10 +166,15 @@ public class OrderDetailVo {
  
     private String garEstimatedCost;
  
+    private List<String> panoramas;
+    private Collection<OrderCarReport> carReports;
+    private Collection<OrderDisposalCompanyReport> orderDisposalCompanyReports;
+
     public OrderDetailVo() {
         this.currentImages = new ArrayList<>();
         this.putDownImages = new ArrayList<>();
         this.putOnImages = new ArrayList<>();
+        this.panoramas = new ArrayList<>();
         this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
  
@@ -472,4 +477,28 @@ public class OrderDetailVo {
     public void setOrderDrivers(Collection<OrderDriver> orderDrivers) {
         this.orderDrivers = orderDrivers;
     }
+
+    public List<String> getPanoramas() {
+        return panoramas;
+    }
+
+    public void setPanoramas(List<String> panoramas) {
+        this.panoramas = panoramas;
+    }
+
+    public Collection<OrderCarReport> getCarReports() {
+        return carReports;
+    }
+
+    public void setCarReports(Collection<OrderCarReport> carReports) {
+        this.carReports = carReports;
+    }
+
+    public Collection<OrderDisposalCompanyReport> getOrderDisposalCompanyReports() {
+        return orderDisposalCompanyReports;
+    }
+
+    public void setOrderDisposalCompanyReports(Collection<OrderDisposalCompanyReport> orderDisposalCompanyReports) {
+        this.orderDisposalCompanyReports = orderDisposalCompanyReports;
+    }
 }
+package com.trash.garbage.pojo.vo;
+
+public class OrderDisposalCompanyReport {
+    private String disposalCompanyName;
+    private String telphone;
+
+    public String getDisposalCompanyName() {
+        return disposalCompanyName;
+    }
+
+    public void setDisposalCompanyName(String disposalCompanyName) {
+        this.disposalCompanyName = disposalCompanyName;
+    }
+
+    public String getTelphone() {
+        return telphone;
+    }
+
+    public void setTelphone(String telphone) {
+        this.telphone = telphone;
+    }
+}
@@ -12,5 +12,5 @@ import java.util.List;
 * @createDate 2024-05-10 11:25:16
 */
 public interface GarOrderMatchAskService extends IService<GarOrderMatchAsk> {
-
+    List<GarOrderMatchAsk> queryByOrderId(String orderId);
 }
@@ -24,4 +24,6 @@ public interface GarOrderMatchDisposalService extends IService&lt;GarOrderMatchDisp
      * @return java.util.List<com.trash.garbage.pojo.vo.DispatchDisposalVo>
      */
     List<GarOrderMatchDisposal>  queryDisposalListByOrderId(String orderId);
+
+    List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId);
 }
 package com.trash.garbage.service.impl;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.mapper.GarOrderMatchAskMapper;
 import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.service.GarOrderMatchAskService;
 import org.springframework.stereotype.Service;
  
+import java.util.List;
+
 /**
-* @author 20412
-* @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Service实现
-* @createDate 2024-05-10 11:25:16
-*/
+ * @author 20412
+ * @description 针对表【gar_order_match_ask(匹配处理场所人员表)】的数据库操作Service实现
+ * @createDate 2024-05-10 11:25:16
+ */
 @Service
 public class GarOrderMatchAskServiceImpl extends ServiceImpl<GarOrderMatchAskMapper, GarOrderMatchAsk>
-    implements GarOrderMatchAskService {
-
+        implements GarOrderMatchAskService {
+
+    @Override
+    public List<GarOrderMatchAsk> queryByOrderId(String orderId) {
+        LambdaQueryWrapper<GarOrderMatchAsk> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarOrderMatchAsk::getGarOrderId, orderId);
+        return list(wrapper);
+    }
  
 }
  
@@ -8,16 +8,17 @@ import com.trash.garbage.pojo.vo.DispatchDisposalVo;
 import com.trash.garbage.service.GarOrderMatchDisposalService;
 import org.springframework.stereotype.Service;
  
+import java.util.Collections;
 import java.util.List;
  
 /**
-* @author 20412
-* @description 针对表【gar_order_match_dispotal(派单分发处理场所表)】的数据库操作Service实现
-* @createDate 2024-05-10 11:25:17
-*/
+ * @author 20412
+ * @description 针对表【gar_order_match_dispotal(派单分发处理场所表)】的数据库操作Service实现
+ * @createDate 2024-05-10 11:25:17
+ */
 @Service
 public class GarOrderMatchDisposalServiceImpl extends ServiceImpl<GarOrderMatchDisposalMapper, GarOrderMatchDisposal>
-    implements GarOrderMatchDisposalService {
+        implements GarOrderMatchDisposalService {
  
     @Override
     public List<DispatchDisposalVo> queryDisposalListWithDispatchStatus(String orderId) {
@@ -27,8 +28,13 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
     @Override
     public List<GarOrderMatchDisposal> queryDisposalListByOrderId(String orderId) {
         LambdaQueryWrapper<GarOrderMatchDisposal> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(GarOrderMatchDisposal::getGarOrderId,orderId);
-       return baseMapper.selectList(wrapper);
+        wrapper.eq(GarOrderMatchDisposal::getGarOrderId, orderId);
+        return baseMapper.selectList(wrapper);
+    }
+
+    @Override
+    public List<DispatchDisposalVo> queryDisposalListWithDispatchByOrderId(String orderId) {
+        return baseMapper.queryDisposalListWithDispatchByOrderId(orderId);
     }
 }
  
@@ -654,6 +654,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
             }
+
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_FILL_CAR.getValue().equals(image.getGarOrderImageType())) {
+                if (Objects.isNull(vo.getPanoramas())) {
+                    vo.setPanoramas(new ArrayList<>());
+                }
+                vo.getPanoramas().add(image.getGarOrderImageUrl());
+            }
         }
         if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())) {
             GarUser handleUser = garUserService.getById(vo.getGarOrderHandlerId());
@@ -699,6 +706,34 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             vo.setOrderCarStatistics(orderCarStatistics);
         }
         vo.setGarCarInfoList(carList);
+
+        List<GarOrderMatchAsk> matchAsks = matchAskService.queryByOrderId(order.getGarOrderId());
+        if (CollectionUtils.isNotEmpty(matchAsks)) {
+            List<OrderCarReport> orderCarReports = new ArrayList<>();
+            for (GarOrderMatchAsk matchAsk : matchAsks) {
+                OrderCarReport carReport = new OrderCarReport();
+                carReport.setCarNo(matchAsk.getGarHandlerCarCode());
+                carReport.setCarWeight(Convert.toStr(matchAsk.getGarCarryingWeight()));
+                orderCarReports.add(carReport);
+            }
+            vo.setCarReports(orderCarReports);
+        }
+        List<DispatchDisposalVo> dispatchDisposalVos = garOrderMatchDisposalService.queryDisposalListWithDispatchByOrderId(id);
+        if(CollectionUtils.isNotEmpty(dispatchDisposalVos)){
+            List<OrderDisposalCompanyReport> disposalCompanyReports = new ArrayList<>();
+            for (DispatchDisposalVo disposalVo : dispatchDisposalVos) {
+                OrderDisposalCompanyReport report = new OrderDisposalCompanyReport();
+                report.setDisposalCompanyName(disposalVo.getGarOrderDisposalCompanyName());
+                if(CollectionUtils.isNotEmpty(disposalVo.getPersonnelInfo())){
+                    report.setTelphone(disposalVo.getPersonnelInfo().get(0).getTel());
+                }
+                disposalCompanyReports.add(report);
+            }
+            vo.setOrderDisposalCompanyReports(disposalCompanyReports);
+
+        }
+
+
         return vo;
     }
  
@@ -55,4 +55,14 @@
                             WHERE `order`.gar_order_id = #{orderId}) `temp`
                            ON `temp`.gar_order_disposal_tel = disposal.construction_unit_person_phone
     </select>
+
+    <select id="queryDisposalListWithDispatchByOrderId" resultMap="DispatchDisposalVo">
+        SELECT disposal.`name`                         AS `name`,
+               disposal.`id`,
+               disposal.construction_unit_person_phone AS tel,
+               disposal.construction_unit_person
+        FROM disposal_site disposal
+        inner JOIN gar_order_match_disposal gomd on gomd.gar_order_disposal_tel= disposal.construction_unit_person_phone
+        where gomd. gar_order_id=#{orderId}
+    </select>
 </mapper>
@@ -134,10 +134,10 @@
         <el-form :inline="true" :model="form">
           <div v-for="(orderDriver,index) in form.orderDrivers" :key="index">
             <el-form-item label="派单负责人" prop="garOrderHandler">
-              <el-input v-model="orderDriver.driverName" placeholder="派单负责人" />
+              <el-input v-model="orderDriver.driverName" placeholder="派单负责人" :disabled="true"/>
             </el-form-item>
             <el-form-item label="派单负责人电话" prop="garOrderHandlerTel">
-              <el-input v-model="orderDriver.driverPhone" placeholder="派单负责人电话" />
+              <el-input v-model="orderDriver.driverPhone" placeholder="派单负责人电话" :disabled="true"/>
             </el-form-item>
           </div>
  
@@ -153,6 +153,35 @@
         </el-form>
       </div>
  
+      <div class="handle-box" v-if="form.garOrderHandlerStatus == 3">
+        <div class="handle-box-title" style="display: flex; align-items: center;margin: 10px 0;">
+          <div class="handle-box-title-ui"
+            style="height: 30px; width: 10px; background-color: #409EFF;margin-right: 15px;"></div>
+          <div class="handle-box-title-text" style="color: #409EFF; font-size: 25px;">处置场所</div>
+        </div>
+        <el-form :inline="true" :model="form">
+          <div v-for="(carReport,index) in form.carReports" :key="index">
+            <el-form-item label=" 车       牌 " prop="garOrderHandler">
+              <el-input v-model="carReport.carNo" placeholder="车牌" :disabled="true"/>
+            </el-form-item>
+            <el-form-item label=" 载重(单位:t) " prop="garOrderHandlerTel">
+              <el-input v-model="carReport.carWeight" placeholder="载重" :disabled="true"/>
+            </el-form-item>
+          </div>
+
+          <div v-for="(disposalCompanyReport,index) in form.orderDisposalCompanyReports" :key="index">
+            <el-form-item label="处置场所" prop="garOrderHandler" :span="2">
+              <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>
+          </el-form-item>
+        </el-form>
+      </div>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
@@ -321,9 +350,11 @@ export default {
         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)
         this.form.putOnImages = this.form.putOnImages.map(map => process.env.VUE_APP_BASE_API + map)
+        this.form.panoramas = this.form.panoramas.map(map => process.env.VUE_APP_BASE_API + map)
         this.combnationImagePath(this.form.currentImages);
         this.combnationImagePath(this.form.putDownImages);
         this.combnationImagePath(this.form.putOnImages);
+        this.combnationImagePath(this.form.panoramas);
         console.log(this.form);
  
         this.open = true;