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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

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

@@ -6,6 +6,7 @@
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.system.entity.User;
import com.zy.crm.system.service.UserService;
@@ -122,6 +123,13 @@
    @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) {
@@ -160,6 +168,30 @@
//            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)){
            return "";
@@ -183,11 +215,32 @@
//        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()+"---"+order.getName());
//            return String.valueOf(order.getId()+"---"+order.getName());
            return String.valueOf(order.getId());
        }
        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 "非项目型报销";
    }