新增历史结算;

新增租单管理
2023-06-13 01:44:45 +08:00
parent 65f21b7d0a
commit ff87369bab
14 changed files with 1105 additions and 0 deletions
--- a/src/main/java/com/gxwebsoft/tower/param/TowerHistorySettleParam.java
+++ b/src/main/java/com/gxwebsoft/tower/param/TowerHistorySettleParam.java
@@ -0,0 +1,87 @@
+package com.gxwebsoft.tower.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询参数
+ *
+ * @author 科技小王子
+ * @since 2023-06-12 16:40:25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "TowerHistorySettleParam对象", description = "查询参数")
+public class TowerHistorySettleParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @QueryField(type = QueryType.EQ)
+    private Integer historySettleId;
+
+    @ApiModelProperty(value = "项目ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer projectId;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+
+    @ApiModelProperty(value = "设备")
+    @QueryField(type = QueryType.EQ)
+    private Integer equipmentId;
+
+    @ApiModelProperty(value = "设备结算租金含税金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal amountWithTax;
+
+    @ApiModelProperty(value = "设备结算租金税率")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal taxAmount;
+
+    @ApiModelProperty(value = "进出场费含税金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal inOutWithTax;
+
+    @ApiModelProperty(value = "进出场费税率")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal inOutTax;
+
+    @ApiModelProperty(value = "劳务费含税金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal workerAmountWithTax;
+
+    @ApiModelProperty(value = "劳务费税率")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal workerTax;
+
+    @ApiModelProperty(value = "其他费用含税金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal otherAmountWithTax;
+
+    @ApiModelProperty(value = "其他费用税率")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal otherTax;
+
+    @ApiModelProperty(value = "开始日期")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束日期")
+    private String endDate;
+
+    @ApiModelProperty(value = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+}
--- a/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java
+++ b/src/main/java/com/gxwebsoft/tower/param/TowerRentRecordParam.java
@@ -0,0 +1,77 @@
+package com.gxwebsoft.tower.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 租单记录查询参数
+ *
+ * @author 科技小王子
+ * @since 2023-06-13 00:42:42
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "TowerRentRecordParam对象", description = "租单记录查询参数")
+public class TowerRentRecordParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "租单记录id")
+    @QueryField(type = QueryType.EQ)
+    private Integer rentRecordId;
+
+    @ApiModelProperty(value = "项目ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer projectId;
+
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+
+    @ApiModelProperty(value = "设备ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer equipmentId;
+
+    @ApiModelProperty(value = "起租日期")
+    private String startDate;
+
+    @ApiModelProperty(value = "停租日期")
+    private String stopDate;
+
+    @ApiModelProperty(value = "检测日期")
+    private String checkDate;
+
+    @ApiModelProperty(value = "报停日期")
+    private String reportStopDate;
+
+    @ApiModelProperty(value = "报停类型")
+    private String reportStopType;
+
+    @ApiModelProperty(value = "复工日期")
+    private String restoreDate;
+
+    @ApiModelProperty(value = "报监编号")
+    private String reportMonitorNo;
+
+    @ApiModelProperty(value = "承租单位")
+    @QueryField(type = QueryType.EQ)
+    private Integer companyId;
+
+    @ApiModelProperty(value = "状态(0未起租1起租2中途报停3报停复工4拆卸停租)")
+    @QueryField(type = QueryType.EQ)
+    private Boolean status;
+
+    @ApiModelProperty(value = "所有人")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+}