修改发送邮件

李宇

2021-06-15 d00d1d584875b5b38c70c235963b46543a3eba28

 src/main/java/com/nanometer/smartlab/entity/OpeApply.java

@@ -2,6 +2,7 @@

import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.util.Validator;

import java.io.Serializable;
import java.math.BigDecimal;
@@ -99,6 +100,9 @@
    private BigDecimal applyPrice;
    private int stockFlag;
    private String stockFlagValue;
    //用于存放仓库 和仓库货柜的id
    private String warehouseId;
    private String warehouseContainerId;

    public String getStockFlagValue() {
        return stockFlagValue;
@@ -129,7 +133,7 @@
    }

    public void setApplyGoal(String applyGoal) {
        this.applyGoal = applyGoal;
        this.applyGoal = Validator.filter(applyGoal);
    }

    public String getId() {
@@ -153,7 +157,7 @@
    }

    public void setNum(Integer num) {
        this.num = num;
        this.num = Integer.parseInt(Validator.filter(num.toString()));
    }

    public String getApplyUserId() {
@@ -169,7 +173,7 @@
    }

    public void setObjective(String objective) {
        this.objective = objective;
        this.objective = Validator.filter(objective);
    }

    public Timestamp getCreateTime() {
@@ -207,7 +211,7 @@
        this.beforeApproveUserId=beforeApproveUserId;
    }
    public void setApproveUserId(String approveUserId) {
        this.approveUserId = approveUserId;
        this.approveUserId = Validator.filter(approveUserId);
    }

    public String getMemo() {
@@ -356,7 +360,23 @@
      this.ownerDepartment = ownerDepartment;
   }

   @Override
    public String getWarehouseId() {
        return warehouseId;
    }

    public void setWarehouseId(String warehouseId) {
        this.warehouseId = warehouseId;
    }

    public String getWarehouseContainerId() {
        return warehouseContainerId;
    }

    public void setWarehouseContainerId(String warehouseContainerId) {
        this.warehouseContainerId = warehouseContainerId;
    }

    @Override
   public int compareTo(OpeApply o) {
        if(this.projectOwner == null || o.getProjectOwner() == null){
            return 1;