#权限审核添加，优化报价审核，可编辑

LSH

2023-08-22 be5ded9ff80082512529831a8256334a8a4fa1e5

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

@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -54,7 +54,7 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @ApiModelProperty(value= "项目id{man_item}")
    @ApiModelProperty(value= "项目id{man_item}/planId")
    @TableField("item_id")
    private Long itemId;

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

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

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

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

@@ -99,6 +99,25 @@
    @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;

    public ReimburseOnline() {}

    public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {
@@ -107,6 +126,18 @@
        this.createTime = createTime;
        this.filepath = filepath;
    }

    public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user) {
        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();
    }


//    PriOnline priOnline = new PriOnline(
//            null,    // excel表标题
@@ -138,12 +169,12 @@
//    }

    public String getPlanId$() {
        PlanService planService = SpringUtils.getBean(PlanService.class);
        Plan plan = planService.selectById(this.itemId);
        if (!Cools.isEmpty(plan)){
            return String.valueOf(plan.getUuid());
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        Order order = orderService.selectById(this.itemId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getUuid()+"---"+order.getName());
        }
        return null;
        return "非项目型报销";
    }

    public String getUser$() {