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;
@@ -214,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 "非项目型报销";
    }