youxiw2000 / trash · Commits

Commit 5ee98a6d2a0ac373a685bac198df13d23dd26a57

Authored by lichao
1 parent a1cd3fdd
build: skipped

调整

Inline Side-by-side
Showing 4 changed files with 58 additions and 2 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
  View file @5ee98a6
... ... @@ -7,9 +7,11 @@ import com.trash.garbage.pojo.vo.GarOrderDisposalVo;
7 7 import com.trash.garbage.pojo.vo.GarOrderDriverVo;
8 8 import com.trash.garbage.pojo.vo.OrderDetailTransportVo;
9 9 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
  10 +import org.apache.ibatis.annotations.MapKey;
10 11 import org.apache.ibatis.annotations.Param;
11 12  
12 13 import java.util.List;
  14 +import java.util.Map;
13 15  
14 16 /**
15 17 * @author 20412
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
  View file @5ee98a6
... ... @@ -218,6 +218,49 @@ public class GarOrderMatchAsk implements Serializable {
218 218 */
219 219 private String unloadingLonLat;
220 220  
  221 + /**
  222 + * 总趟次数
  223 + */
  224 + @TableField(exist = false)
  225 + private Integer totalTrips;
  226 +
  227 + /**
  228 + * 已完成趟次数
  229 + */
  230 + @TableField(exist = false)
  231 + private Integer finishedTrips;
  232 +
  233 + /**
  234 + * 待完成趟次数
  235 + */
  236 + @TableField(exist = false)
  237 + private Integer pendingTrips;
  238 +
  239 + // 添加 getter 和 setter 方法
  240 + public Integer getTotalTrips() {
  241 + return totalTrips;
  242 + }
  243 +
  244 + public void setTotalTrips(Integer totalTrips) {
  245 + this.totalTrips = totalTrips;
  246 + }
  247 +
  248 + public Integer getFinishedTrips() {
  249 + return finishedTrips;
  250 + }
  251 +
  252 + public void setFinishedTrips(Integer finishedTrips) {
  253 + this.finishedTrips = finishedTrips;
  254 + }
  255 +
  256 + public Integer getPendingTrips() {
  257 + return pendingTrips;
  258 + }
  259 +
  260 + public void setPendingTrips(Integer pendingTrips) {
  261 + this.pendingTrips = pendingTrips;
  262 + }
  263 +
221 264  
222 265  
223 266 public Date getUpdateTime() {
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @5ee98a6
... ... @@ -206,6 +206,7 @@ public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
206 206 LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
207 207 qwi.eq(GarOrderImage::getGarOrderId, orderId)
208 208 .eq(GarOrderImage::getGarCreateBy, user.getGarUserId());
  209 +
209 210 OrderDetailVo vo = new OrderDetailVo();
210 211 GarOrderDriverVo orderVo = baseMapper.queryOrderByTelWithType(user.getGarUserTel(), orderId, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
211 212 vo.setHandleFlag(true);
... ... @@ -217,6 +218,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
217 218 .eq(GarOrderImage::getGarOrderId, orderId)
218 219 .eq(GarOrderImage::getGarOrderImageType, GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue()));
219 220 imageAll.addAll(garOrderImageService.list(qwi));
  221 +
  222 +
220 223 imageAll.addAll(currentImageList);
221 224 for (GarOrderImage image : imageAll) {
222 225 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue().equals(image.getGarOrderImageType())) {
... ... @@ -226,7 +229,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
226 229 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
227 230 SimpleDateFormat date = new SimpleDateFormat("HHmmss");
228 231 String imageDate = date.format(image.getGarCreateTime());
229   - vo.getPutOnImages().add(image.getGarOrderImageUrl()+imageDate);
  232 + String garCreateBy = image.getGarCreateBy();
  233 + GarUser byId = garUserService.getById(garCreateBy);
  234 + String garUserName = byId.getGarUserName();
  235 + vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName);
230 236 }
231 237 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
232 238 vo.getPutDownImages().add(image.getGarOrderImageUrl());
... ... @@ -292,7 +298,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
292 298 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
293 299 SimpleDateFormat date = new SimpleDateFormat("HHmmss");
294 300 String imageDate = date.format(image.getGarCreateTime());
295   - vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate);
  301 + String garCreateBy = image.getGarCreateBy();
  302 + GarUser byId = garUserService.getById(garCreateBy);
  303 + String garUserName = byId.getGarUserName();
  304 + vo.getPutOnImages().add(image.getGarOrderImageUrl() + imageDate + "name" + garUserName);
296 305 }
297 306 if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
298 307 vo.getPutDownImages().add(image.getGarOrderImageUrl());
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
  View file @5ee98a6
... ... @@ -91,6 +91,8 @@
91 91 <if test="garOrderPhone != null and garOrderPhone != ''"> and gar_order_phone = #{garOrderPhone}</if>
92 92 <if test="garOrderName != null and garOrderName != ''"> and gar_order_name like concat('%', #{garOrderName}, '%')</if>
93 93 </where>
  94 + <!-- 添加按创建时间倒序排序 -->
  95 + order by gar_create_time desc
94 96 </select>
95 97  
96 98 <select id="selectGarOrderMatchAskById" parameterType="String" resultMap="GarOrderMatchAskResult">
... ...