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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

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

@@ -185,9 +185,35 @@
    @TableField("dept_id")
    private Long deptId;

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

    /**
     * 进度
     */
    @ApiModelProperty(value= "进度")
    private Integer settle;

    /**
     * 流程进度
     */
    @ApiModelProperty(value= "流程进度")
    @TableField("settle_msg")
    private String settleMsg;

    /**
     * 节点负责人
     */
    @ApiModelProperty(value= "节点负责人")
    private Long director;

    public Contract() {}

    public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long userId, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial, Long deptId) {
    public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long userId, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial, Long deptId, Long hostId,Integer settle,String settleMsg) {
        this.id = id;
        this.customer = customer;
        this.address = address;
@@ -213,6 +239,9 @@
        this.boss = boss;
        this.serial = serial;
        this.deptId = deptId;
        this.hostId = hostId;
        this.settle = settle;
        this.settleMsg = settleMsg;
    }

    //    Contract contract = new Contract(
@@ -237,6 +266,24 @@
//            null    // 电子邮箱
//    );

    public String getSettle$(){
        if (null == this.settle){ return null; }
        switch (this.settle){
            case 0:
                return "等待提交";
            case 1:
                return "等待组长审批";
            case 2:
                return "等待总裁办审批";
            case 3:
                return "等待确认";
            case 4:
                return "审批通过";
            default:
                return String.valueOf(this.settle);
        }
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";