Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

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

@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -55,7 +55,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;

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

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

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

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

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

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

@@ -100,6 +104,32 @@
    @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() {}

    public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {
@@ -109,11 +139,58 @@
        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();
    }

    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表标题
//            null,    // excel表数据
//            null    // 创建时间
//    );

    public String getSettle$(){
        if (null == this.settle){ return null; }
        switch (this.settle){
            case 0:
                return "待提交";
            case 1:
                return "等待部门经理审核";
            case 2:
                return "等待结点3审核";
            case 3:
                return "等待结点4审核";
            case 4:
                return "等待结点5审核";
            case 5:
                return "等待结点6审核";
            case 6:
                return "申请通过";
            case 7:
                return "申请通过";
            default:
                return String.valueOf(this.settle);
        }
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
@@ -138,13 +215,34 @@
//        return null;
//    }

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

    public String getOrderId$() {
        if (null == this.itemId){ return "非项目型报销"; }
        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.getId()+"---"+order.getName());
            return String.valueOf(order.getId());
        }
        return null;
        return "非项目型报销";
    }

    public String getName$() {
        if (null == this.itemId){ return "非项目型报销"; }
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        Order order = orderService.selectById(this.itemId);
        if (!Cools.isEmpty(order)){
            return String.valueOf(order.getCstmrId$());
        }
        return "非项目型报销";
    }

    public String getUser$() {