From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
index 7d348a0..8a795af 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/OrderTask.java
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -29,6 +30,7 @@
@ApiModel(value = "璁㈠崟浠诲姟琛�")
public class OrderTask extends XbootBaseEntity {
+ //瀛樻斁7澶╁唴鐨勬暟鎹�
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "璁㈠崟鍙�")
@@ -79,7 +81,7 @@
@ApiModelProperty(value = "鏄惁椹跺嚭鏈堝彴锛�0锛氬惁 1:鏄級")
private int isOut;
- @ApiModelProperty(value = "0閰嶉�佷腑锛�1宸查�佽揪锛�3寮傚父绛炬敹")
+ @ApiModelProperty(value = "0閰嶉�佷腑锛�1宸查�佽揪锛�2寮傚父绛炬敹")
private int status;
@ApiModelProperty(value = "鏃犳硶閫佽揪鐨勫師鍥�")
@@ -95,12 +97,18 @@
private String customerReceiveId;
@ApiModelProperty(value = "鏄惁鐐硅禐 0锛氬惁 1锛氭槸")
- private String likes;
+ private int likes;
- @Transient
- @TableField(exist = false)
+ @ApiModelProperty(value = "鑰楁椂 姣")
+ private int time;
+
+// @Transient
+// @TableField(exist = false)
@ApiModelProperty(value = "鍟嗘埛鍚嶇О")
private String customerName;
+
+ @ApiModelProperty(value = "鍟嗘埛鑱旂郴浜�")
+ private String linker;
@Transient
@TableField(exist = false)
@@ -109,6 +117,63 @@
@Transient
@TableField(exist = false)
+ @ApiModelProperty(value = "杞︾墝鍙�")
+ private String carNo;
+
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ private String areaName;
+
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍒嗘鍚嶇О")
+ private String areaSectionName;
+
+ @Transient
+ @TableField(exist = false)
@ApiModelProperty(value = "璁㈠崟璇︽儏")
private List<OrderDetail> orderDetails;
-}
\ No newline at end of file
+
+ public String getImg() {
+ if (StrUtil.isEmpty(img)) {
+ return null;
+ }
+ String temp = "";
+ String[] imgs = img.split(",");
+ for (int i = 0; i < imgs.length; i++) {
+ String url = imgs[i];
+ if (StrUtil.isNotEmpty(url)) {
+ if (url.contains("http") && url.contains("/xboot")) {
+ try{
+ if("".equals(temp)){
+ temp += "/xboot" + url.split("/xboot")[1];
+ }else{
+ temp += ",/xboot" + url.split("/xboot")[1];
+ }
+ }catch (Exception e){
+ if("".equals(temp)){
+ temp += url;
+ }else{
+ temp += "," + url;
+ }
+ }
+ } else {
+ if("".equals(temp)){
+ temp += url;
+ }else {
+ temp += "," + url;
+ }
+ }
+ }
+ }
+ img = temp;
+ return img;
+ }
+ public static void main(String[] args) {
+ String img = ",,http://111.63.178.115:9091/xboot/file/view/1712990736426864641,,/xboot/file/view/1712990822305239041,,";
+ OrderTask o = new OrderTask();
+ o.setImg(img);
+ System.out.println(o.getImg());
+ }
+}
--
Gitblit v1.9.1