调整

lichao
1 parent a1cd3fdd
Showing 4 changed files with 58 additions and 2 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
@@ -7,9 +7,11 @@ import com.trash.garbage.pojo.vo.GarOrderDisposalVo;
 import com.trash.garbage.pojo.vo.GarOrderDriverVo;
 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Map;
 /**
 * @author 20412
@@ -218,6 +218,49 @@ public class GarOrderMatchAsk implements Serializable {
      */
     private String unloadingLonLat;
+    /**
+     * 总趟次数
+     */
+    @TableField(exist = false)
+    private Integer totalTrips;
+
+    /**
+     * 已完成趟次数
+     */
+    @TableField(exist = false)
+    private Integer finishedTrips;
+
+    /**
+     * 待完成趟次数
+     */
+    @TableField(exist = false)
+    private Integer pendingTrips;
+
+    // 添加 getter 和 setter 方法
+    public Integer getTotalTrips() {
+        return totalTrips;
+    }
+
+    public void setTotalTrips(Integer totalTrips) {
+        this.totalTrips = totalTrips;
+    }
+
+    public Integer getFinishedTrips() {
+        return finishedTrips;
+    }
+
+    public void setFinishedTrips(Integer finishedTrips) {
+        this.finishedTrips = finishedTrips;
+    }
+
+    public Integer getPendingTrips() {
+        return pendingTrips;
+    }
+
+    public void setPendingTrips(Integer pendingTrips) {
+        this.pendingTrips = pendingTrips;
+    }
+
     public Date getUpdateTime() {
@@ -206,6 +206,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
         qwi.eq(GarOrderImage::getGarOrderId, orderId)
                 .eq(GarOrderImage::getGarCreateBy, user.getGarUserId());
+
         OrderDetailVo vo = new OrderDetailVo();
         GarOrderDriverVo orderVo = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), orderId, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
         vo.setHandleFlag(true);
@@ -217,6 +218,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 .eq(GarOrderImage::getGarOrderId, orderId)
                 .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue()));
         imageAll.addAll(garOrderImageService.list(qwi));
+
+
         imageAll.addAll(currentImageList);
         for (GarOrderImage image : imageAll) {
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) {
@@ -226,7 +229,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
                 SimpleDateFormat date = new SimpleDateFormat("HHmmss");
                 String imageDate = date.format(image.getGarCreateTime());
-                vo.getPutOnImages().add(image.getGarOrderImageUrl()+imageDate);
+                String garCreateBy = image.getGarCreateBy();
+                GarUser byId = garUserService.getById(garCreateBy);
+                String garUserName = byId.getGarUserName();
+                vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName);
             }
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
@@ -292,7 +298,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
                 SimpleDateFormat date = new SimpleDateFormat("HHmmss");
                 String imageDate = date.format(image.getGarCreateTime());
-                vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate);
+                String garCreateBy = image.getGarCreateBy();
+                GarUser byId = garUserService.getById(garCreateBy);
+                String garUserName = byId.getGarUserName();
+                vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName);
             }
             if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
@@ -91,6 +91,8 @@
             <if test="garOrderPhone != null  and garOrderPhone != ''"> and gar_order_phone = #{garOrderPhone}</if>
             <if test="garOrderName != null  and garOrderName != ''"> and gar_order_name like concat('%', #{garOrderName}, '%')</if>
         </where>
+        <!-- 添加按创建时间倒序排序 -->
+        order by gar_create_time desc
     </select>
     <select id="selectGarOrderMatchAskById" parameterType="String" resultMap="GarOrderMatchAskResult">