#

LSH

2023-11-04 93ef3f2ab542b7b6fe941c30bf56b35e743cf299

 src/main/java/com/zy/crm/manager/entity/PriOnline2.java

@@ -8,7 +8,9 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,6 +46,20 @@
    @TableField("sheet_data")
    private String sheetData;

    /**
     * excel表标题
     */
    @ApiModelProperty(value= "excel表标题")
    @TableField("sales_title")
    private String salesTitle;

    /**
     * excel表数据
     */
    @ApiModelProperty(value= "excel表数据")
    @TableField("sales_sheet_data")
    private String salesSheetData;

    @ApiModelProperty(value= "文件保存地址")
    private String filepath;

@@ -55,7 +71,7 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @ApiModelProperty(value= "项目id{man_item}")
    @ApiModelProperty(value= "规划单ID plan_id")
    @TableField("item_id")
    private Long itemId;

@@ -96,6 +112,10 @@
    @TableField("member_id")
    private Long memberId;

    @ApiModelProperty(value= "规划单ID")
    @TableField("plan_id")
    private Long planId;

    @ApiModelProperty(value= "上传报价excel数据的原始文件地址")
    @TableField("check_data_file")
    private String checkDataFile;
@@ -114,6 +134,13 @@
    private Integer settle;

    /**
     * 进度
     */
    @ApiModelProperty(value= "进度")
    @TableField("settle_size")
    private Integer settleSize;

    /**
     * 流程进度
     */
    @ApiModelProperty(value= "流程进度")
@@ -125,12 +152,13 @@

    public PriOnline2() {}

    public PriOnline2(String title, String sheetData, Date createTime, String filepath,Integer settle) {
    public PriOnline2(String title, String sheetData, Date createTime, String filepath,Integer settle,Integer settleSize) {
        this.title = title;
        this.sheetData = sheetData;
        this.createTime = createTime;
        this.filepath = filepath;
        this.settle = settle;
        this.settleSize = settleSize;
    }

//    PriOnline priOnline = new PriOnline(
@@ -145,9 +173,9 @@
            case 0:
                return "等待提交";
            case 1:
                return "等待审批";
            case 2:
                return "等待确认";
            case 2:
                return this.settleSize.equals(this.settle+1)? "审批通过" : "等待确认";
            case 3:
                return "审批通过";
            default:
@@ -207,6 +235,15 @@
        return null;
    }

    public String getDeptId$(){
        DeptService service = SpringUtils.getBean(DeptService.class);
        Dept dept = service.selectById(this.deptId);
        if (!Cools.isEmpty(dept)){
            return String.valueOf(dept.getName());
        }
        return null;
    }

    public String getUpdateUserId$() {
        UserService userService = SpringUtils.getBean(UserService.class);
        User user = userService.selectById(this.updateUserId);