fix: remove broken duplicate page return

zhou zhou

3 天以前 f27309d45c7ef46b0aea98107b67d0c5b46d4217

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java

@@ -5,6 +5,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -19,6 +20,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -149,6 +152,9 @@
    @ApiModelProperty(value = "添加人员")
    private Long createBy;

    @TableField(exist = false)
    private String createBy$;

    /**
     * 添加时间
     */
@@ -163,6 +169,9 @@
    @ApiModelProperty(value = "修改人员")
    private Long updateBy;

    @TableField(exist = false)
    private String updateBy$;

    /**
     * 修改时间
     */
@@ -170,6 +179,9 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @Version
    private Integer version;

    /**
     * 备注
@@ -343,6 +355,30 @@
        this.memo = memo;
    }

    public WkOrder(SyncOrderParams syncOrderParams) {
//        this.reportOnce = syncOrderParams.getre();
//        this.businessTime = syncOrderParams.getBusinessTime().toString();
        this.stationId = syncOrderParams.getStationId();
        this.orderInternalCode = syncOrderParams.getOrderInternalCode().toString();
        this.stockDirect = syncOrderParams.getStockDirect();
        this.customerId = syncOrderParams.getCustomerId();
        this.customerName = syncOrderParams.getCustomerName();
        this.supplierId = syncOrderParams.getSupplierId();
        this.supplierName = syncOrderParams.getSupplierName();
        this.stockOrgId = syncOrderParams.getStockOrgId();
        this.stockOrgName = syncOrderParams.getStockOrgName();
        this.purchaseOrgId = syncOrderParams.getPurchaseOrgId();
        this.purchaseOrgName = syncOrderParams.getPurchaseOrgName();
        this.purchaseUserId = syncOrderParams.getPurchaseUserId();
        this.purchaseUserName = syncOrderParams.getPurchaseUserName();
        this.prdOrgId = syncOrderParams.getPrdOrgId();
        this.prdOrgName = syncOrderParams.getPrdOrgName();
        this.saleOrgId = syncOrderParams.getSaleOrgId();
        this.saleOrgName = syncOrderParams.getSaleOrgName();
        this.saleUserId = syncOrderParams.getSaleUserId();
        this.saleUserName = syncOrderParams.getSaleUserName();
    }

    public String getExceStatus$() {
        if (Cools.isEmpty(this.exceStatus)) {
            return "";
@@ -453,29 +489,11 @@
        }
    }

    public String getCreateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getUpdateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getUpdateTime$() {