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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

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

@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CompanyService;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.OrderProductTypeService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
@@ -178,16 +179,35 @@
    @TableField("step")
    private int step;


    /**
     * 注释
     */
    @ApiModelProperty(value= "注释")
    private String memo;
    /**
     * 注释
     */
    @ApiModelProperty(value= "心得体会")
    @TableField("memo_experience")
    private String memoExperience;

    /**
     * 预计成交率
     */
    @ApiModelProperty(value= "预计成交率")
    private String transactionRate;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "产品类型")
    @TableField("order_product_type_id")
    private Long orderProductTypeId;

    public Order() {}

    public Order(Long hostId,Long deptId,Long userId,Long cstmrId,String uuid,String name,Double money,Long company,String remarks,Long director,String province,String city,String district,String town,String addr,String files,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,Integer step,String memo) {
    public Order(Long id, Long hostId, Long deptId, Long userId, Long cstmrId, String uuid, String name, Double money, Long company, String remarks, Long director, String province, String city, String district, String town, String addr, String files, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, int step, String memo, String transactionRate, String pcd,Long orderProductTypeId) {
        this.id = id;
        this.hostId = hostId;
        this.deptId = deptId;
        this.userId = userId;
@@ -211,6 +231,9 @@
        this.updateTime = updateTime;
        this.step = step;
        this.memo = memo;
        this.transactionRate = transactionRate;
        this.pcd = pcd;
        this.orderProductTypeId = orderProductTypeId;
    }

//    Order order = new Order(
@@ -247,6 +270,15 @@
        return null;
    }

    public String getOrderProductTypeId$(){
        OrderProductTypeService orderProductTypeService = SpringUtils.getBean(OrderProductTypeService.class);
        OrderProductType orderProductType = orderProductTypeService.selectById(this.orderProductTypeId);
        if (!Cools.isEmpty(orderProductType)){
            return String.valueOf(orderProductType.getName());
        }
        return null;
    }

    public String getDeptId$(){
        DeptService service = SpringUtils.getBean(DeptService.class);
        Dept dept = service.selectById(this.deptId);