新增转租管理;

结构调整

src/main/java/com/gxwebsoft/tower/entity/TowerContractEquipment.java

@@ -29,6 +29,9 @@ public class TowerContractEquipment implements Serializable {
     @ApiModelProperty(value = "合同ID")
     private Integer contractId;
 
+    @ApiModelProperty(value = "设备ID")
+    private Integer equipmentId;
+
     @ApiModelProperty(value = "设备")
     private String equipmentName;
 

src/main/java/com/gxwebsoft/tower/entity/TowerContractSettleEquipment.java

@@ -28,6 +28,9 @@ public class TowerContractSettleEquipment implements Serializable {
 
     private Integer contractId;
 
+    @ApiModelProperty(value = "设备ID")
+    private Integer equipmentId;
+
     @ApiModelProperty(value = "设备")
     private String equipmentName;
 

src/main/java/com/gxwebsoft/tower/entity/TowerCustomer.java

@@ -1,6 +1,7 @@
 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;
@@ -28,6 +29,10 @@ public class TowerCustomer implements Serializable {
     @ApiModelProperty(value = "客户名称")
     private String name;
 
+    @ApiModelProperty(value = "客户名称")
+    @TableField(exist = false)
+    private String customerName;
+
     @ApiModelProperty(value = "全称")
     private String fullName;
 

src/main/java/com/gxwebsoft/tower/entity/TowerLending.java

@@ -0,0 +1,84 @@
+package com.gxwebsoft.tower.entity;
+
+import java.math.BigDecimal;
+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-15 10:29:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TowerLending对象", description = "拆借管理")
+public class TowerLending implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "lending_id", type = IdType.AUTO)
+    private Integer lendingId;
+
+    @ApiModelProperty(value = "合同ID")
+    private Integer contractId;
+
+    @ApiModelProperty(value = "产权单位")
+    private String propertyCompany;
+
+    @ApiModelProperty(value = "结算日期")
+    private String settleDate;
+
+    @ApiModelProperty(value = "本期结算金额")
+    private BigDecimal settleAmount;
+
+    @ApiModelProperty(value = "附件")
+    private String fileList;
+
+    @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;
+
+    @ApiModelProperty(value = "合同编号")
+    @TableField(exist = false)
+    private String contactNumber;
+
+    @ApiModelProperty(value = "签订时间")
+    @TableField(exist = false)
+    private LocalDateTime signDate;
+
+    @ApiModelProperty(value = "项目名称")
+    @TableField(exist = false)
+    private String projectName;
+
+    @ApiModelProperty(value = "承租方")
+    @TableField(exist = false)
+    private String customerName;
+
+    @ApiModelProperty(value = "租赁方")
+    @TableField(exist = false)
+    private String companyName;
+
+}

src/main/java/com/gxwebsoft/tower/entity/TowerLendingSettleList.java

@@ -0,0 +1,124 @@
+package com.gxwebsoft.tower.entity;
+
+import java.math.BigDecimal;
+
+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-15 10:29:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TowerLendingSettleList对象", description = "拆借结算清单")
+public class TowerLendingSettleList implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "lending_settle_list_id", type = IdType.AUTO)
+    private Integer lendingSettleListId;
+
+    @ApiModelProperty(value = "拆借主单id")
+    private Integer lendingId;
+
+    @ApiModelProperty(value = "设备")
+    private Integer equipmentId;
+
+    @ApiModelProperty(value = "拆借路线")
+    private String lendingPath;
+
+    @ApiModelProperty(value = "合作方式")
+    private String coopWay;
+
+    @ApiModelProperty(value = "结算开始日期")
+    private String startDate;
+
+    @ApiModelProperty(value = "结算截止日期")
+    private String stopDate;
+
+    @ApiModelProperty(value = "计费天数")
+    private Integer calDay;
+
+    @ApiModelProperty(value = "整月")
+    private Boolean isFullMonth;
+
+    @ApiModelProperty(value = "月计费天数")
+    private Integer daysInMonth;
+
+    @ApiModelProperty(value = "月租金")
+    private BigDecimal monthRentAmount;
+
+    @ApiModelProperty(value = "应付租金")
+    private BigDecimal shouldPayRentAmount;
+
+    @ApiModelProperty(value = "日租金")
+    private BigDecimal dailyRentAmount;
+
+    @ApiModelProperty(value = "应补租金")
+    private BigDecimal shouldSupplementAmount;
+
+    @ApiModelProperty(value = "应扣租金")
+    private BigDecimal shouldDeductionAmount;
+
+    @ApiModelProperty(value = "实付金额")
+    private BigDecimal paidAmount;
+
+    @ApiModelProperty(value = "税率")
+    private BigDecimal taxRate;
+
+    @ApiModelProperty(value = "税金")
+    private BigDecimal taxAmount;
+
+    @ApiModelProperty(value = "税价合计")
+    private BigDecimal totalAmountWithTax;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "用户ID")
+    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 equipmentName;
+
+    @ApiModelProperty(value = "出厂编号")
+    @TableField(exist = false)
+    private String factoryNo;
+
+    @ApiModelProperty(value = "备案编号")
+    @TableField(exist = false)
+    private String filingNo;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField(exist = false)
+    private String equipmentNo;
+
+}