#

LSH

2023-11-29 f6af1863a4f68c1be2ec07cc6b5992f9e7464e52

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

@@ -73,14 +73,80 @@
    private Long orderId;

    /**
     * 项目ID
     */
    @ApiModelProperty(value= "项目ID")
    @TableField("cstmr_id")
    private Long cstmrId;

    /**
     * 实际收款
     */
    @ApiModelProperty(value= "实际收款")
    @TableField("actual_receipts")
    private Double actualReceipts;

    /**
     * 余款
     */
    @ApiModelProperty(value= "余款")
    @TableField("balance_now")
    private Double balanceNow;

    /**
     * 余款
     */
    @ApiModelProperty(value= "0：未结销、1：部分结销、2：已结销")
    private Integer status;

    @ApiModelProperty(value = "")
    private String memo;

    @ApiModelProperty(value= "")
    @TableField("delivery_time")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date deliveryTime;

    @ApiModelProperty(value = "")
    @TableField("cstmr_name")
    private String cstmrName;

    @ApiModelProperty(value = "")
    @TableField("user_name")
    private String userName;

    @ApiModelProperty(value = "")
    @TableField("receivables_type")
    private Integer receivablesType;

    @ApiModelProperty(value = "")
    @TableField("receivables_type_name")
    private String receivablesTypeName;


    public CompanyMoney() {}

    public CompanyMoney(CompanyMoney companyMoney) {
        this.year = companyMoney.getYear();
        this.receivables = companyMoney.getReceivables();
        this.createTime = companyMoney.getCreateTime();
        this.userId = companyMoney.getUserId();
        this.updateTime = companyMoney.getUpdateTime();
        this.updateUserId = companyMoney.getUpdateUserId();
        this.staff = companyMoney.getStaff();
        this.complete = companyMoney.getComplete();
        this.orderId = companyMoney.getOrderId();
        this.actualReceipts = companyMoney.getActualReceipts();
        this.balanceNow = companyMoney.getBalanceNow();
        this.status = companyMoney.getStatus();
        this.memo = companyMoney.getMemo();
        this.deliveryTime = companyMoney.getDeliveryTime();
        this.cstmrName = companyMoney.getCstmrName();
        this.userName = companyMoney.getUserName();
        this.receivablesType = companyMoney.getReceivablesType();
        this.receivablesTypeName = companyMoney.getReceivablesTypeName();
    }

    public CompanyMoney(String year, Double receivables, Date createTime, Long userId, Date updateTime, Long updateUserId, Long staff, String complete, Long orderId, Double actualReceipts) {
        this.year = year;
        this.receivables = receivables;