完善合同管理;
新增结算管理
This commit is contained in:
@@ -73,6 +73,12 @@ public class TowerContract implements Serializable {
|
||||
@ApiModelProperty(value = "已生成结算次数")
|
||||
private Integer settleNum;
|
||||
|
||||
@ApiModelProperty(value = "结算方式")
|
||||
private Integer settleMethod;
|
||||
|
||||
@ApiModelProperty(value = "跨月结算日期")
|
||||
private Integer extendMonthDate;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 合同结算设备
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-10 16:52:12
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerContractSettleEquipment对象", description = "合同结算设备")
|
||||
public class TowerContractSettleEquipment implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "contract_settle_id", type = IdType.AUTO)
|
||||
private Integer contractSettleId;
|
||||
|
||||
private Integer contractId;
|
||||
|
||||
@ApiModelProperty(value = "设备")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiModelProperty(value = "型号")
|
||||
private String equipmentModel;
|
||||
|
||||
@ApiModelProperty(value = "出厂编号")
|
||||
private String factoryNo;
|
||||
|
||||
@ApiModelProperty(value = "设备编号")
|
||||
private String equipmentNo;
|
||||
|
||||
@ApiModelProperty(value = "计划租期(月)")
|
||||
private Integer rentMonth;
|
||||
|
||||
@ApiModelProperty(value = "租金(元)")
|
||||
private BigDecimal rentAmount;
|
||||
|
||||
@ApiModelProperty(value = "进退场费")
|
||||
private BigDecimal inOutAmount;
|
||||
|
||||
@ApiModelProperty(value = "劳务费")
|
||||
private BigDecimal workerAmount;
|
||||
|
||||
@ApiModelProperty(value = "其他费用")
|
||||
private BigDecimal otherAmount;
|
||||
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "所有人")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 合同结算规则
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-11 13:48:41
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerContractSettleRule对象", description = "合同结算规则")
|
||||
public class TowerContractSettleRule implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "contract_settle_rule_id", type = IdType.AUTO)
|
||||
private Integer contractSettleRuleId;
|
||||
|
||||
@ApiModelProperty(value = "合同ID")
|
||||
private Integer contractId;
|
||||
|
||||
@ApiModelProperty(value = "结算开始日期")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty(value = "结算结束日期")
|
||||
private String endDate;
|
||||
|
||||
@ApiModelProperty(value = "所有人")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
}
|
||||
77
src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java
Normal file
77
src/main/java/com/gxwebsoft/tower/entity/TowerSettle.java
Normal file
@@ -0,0 +1,77 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 结算管理
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-11 19:19:10
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerSettle对象", description = "结算管理")
|
||||
public class TowerSettle implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "settle_id", type = IdType.AUTO)
|
||||
private Integer settleId;
|
||||
|
||||
@ApiModelProperty(value = "结算单号")
|
||||
private String settleNo;
|
||||
|
||||
@ApiModelProperty(value = "合同id")
|
||||
private Integer contractId;
|
||||
|
||||
@ApiModelProperty(value = "本期开始日期")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty(value = "本期结束日期")
|
||||
private String endDate;
|
||||
|
||||
@ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月")
|
||||
private Integer settleMethod;
|
||||
|
||||
@ApiModelProperty(value = "跨月结算日期")
|
||||
private Integer extendMonthDate;
|
||||
|
||||
@ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)")
|
||||
private Boolean status;
|
||||
|
||||
@ApiModelProperty(value = "总额")
|
||||
private Integer totalAmount;
|
||||
|
||||
@ApiModelProperty(value = "所有人")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
@ApiModelProperty(value = "项目名称")
|
||||
@TableField(exist = false)
|
||||
private String projectName;
|
||||
|
||||
@ApiModelProperty(value = "合同编号")
|
||||
@TableField(exist = false)
|
||||
private String contactNumber;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package com.gxwebsoft.tower.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import java.time.LocalDateTime;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import java.io.Serializable;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 合同结算详情
|
||||
*
|
||||
* @author 科技小王子
|
||||
* @since 2023-06-11 19:13:12
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value = "TowerSettleDetail对象", description = "合同结算详情")
|
||||
public class TowerSettleDetail implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "settle_detail_id", type = IdType.AUTO)
|
||||
private Integer settleDetailId;
|
||||
|
||||
@ApiModelProperty(value = "结算id")
|
||||
private Integer settleId;
|
||||
|
||||
@ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项")
|
||||
private Integer type;
|
||||
|
||||
@ApiModelProperty(value = "费用类型")
|
||||
private String settleCostType;
|
||||
|
||||
@ApiModelProperty(value = "设备")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiModelProperty(value = "型号")
|
||||
private String equipmentModel;
|
||||
|
||||
@ApiModelProperty(value = "出厂编号")
|
||||
private String factoryNo;
|
||||
|
||||
@ApiModelProperty(value = "结算开始日期")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty(value = "结算结束日期")
|
||||
private String endDate;
|
||||
|
||||
@ApiModelProperty(value = "月租金/月工资")
|
||||
private BigDecimal monthAmount;
|
||||
|
||||
@ApiModelProperty(value = "税率")
|
||||
private BigDecimal taxRate;
|
||||
|
||||
@ApiModelProperty(value = "进退场单价/单次费用")
|
||||
private BigDecimal singleAmount;
|
||||
|
||||
@ApiModelProperty(value = "进退场次数/次数")
|
||||
private Integer num;
|
||||
|
||||
@ApiModelProperty(value = "单位")
|
||||
private String unit;
|
||||
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty(value = "所有人")
|
||||
private Integer userId;
|
||||
|
||||
@ApiModelProperty(value = "是否删除, 0否, 1是")
|
||||
@TableLogic
|
||||
private Integer deleted;
|
||||
|
||||
@ApiModelProperty(value = "租户id")
|
||||
private Integer tenantId;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user