#

Junjie

2023-09-08 376674980fd9a7d79df70988dd1de03d3d482493

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

@@ -62,7 +62,7 @@
    @TableField("order_num")
    private String orderNum;

    @ApiModelProperty(value= "模板名")
    @ApiModelProperty(value= "报销类型")
    @TableField("template_name")
    private String templateName;

@@ -74,6 +74,10 @@
    @TableField("dept_id")
    private Long deptId;

    @ApiModelProperty(value= "")
    @TableField("host_id")
    private Long hostId;

    @ApiModelProperty(value= "状态{0：未完成，1：已完成}")
    @TableField("status")
    private Integer status;
@@ -83,7 +87,7 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    @ApiModelProperty(value= "上传报价excel数据")
    @ApiModelProperty(value= "是否冲账")
    @TableField("check_data")
    private String checkData;

@@ -98,6 +102,32 @@
    @ApiModelProperty(value= "上传报价excel数据的原始文件地址")
    @TableField("check_data_file")
    private String checkDataFile;

    /**
     * 表单内容
     */
    @ApiModelProperty(value= "表单内容")
    private String form;

    /**
     * 进度 1: 开始  2: 组长审核  3: 售前组长审核  4: 规划员审核  5: 审批通过
     */
    @ApiModelProperty(value= "进度 1: 开始  2: 组长审核  3: 售前审核  4: 审批通过  ")
    private Integer settle;

    /**
     * 审核进度
     */
    @ApiModelProperty(value= "审核进度")
    @TableField("settle_msg")
    private String settleMsg;

    /**
     * 客户名称
     */
    @ApiModelProperty(value= "客户名称")
    @TableField("name")
    private String name;

    public ReimburseOnline() {}

@@ -119,6 +149,17 @@
        this.updateUserId = user.getId();
    }

    public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user,Integer settle) {
        this.itemId = itemId;
        this.orderNum = orderNum;
        this.createTime = createTime;
        this.updateTime = createTime;
        this.userId = user.getId();
        this.deptId = user.getDeptId();
        this.status = 0;
        this.updateUserId = user.getId();
        this.settle = settle;
    }

//    PriOnline priOnline = new PriOnline(
//            null,    // excel表标题
@@ -153,9 +194,9 @@
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        Order order = orderService.selectById(this.itemId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getUuid());
            return String.valueOf(order.getUuid()+"---"+order.getName());
        }
        return null;
        return "非项目型报销";
    }

    public String getUser$() {