b2894lxlx/tuanwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善合同管理;

Browse Source 
新增结算管理
This commit is contained in:
b2894lxlx
2023-06-12 01:32:34 +08:00
parent 385bfb96b8
commit 8307a16689
35 changed files with 1964 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gxwebsoft/tower/param/TowerContractParam.java
View File

@@ -70,6 +70,14 @@ public class TowerContractParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Boolean autoSettle;
@ApiModelProperty(value = "结算方式")
@QueryField(type = QueryType.EQ)
private Integer settleMethod;
@ApiModelProperty(value = "跨月结算日期")
@QueryField(type = QueryType.EQ)
private Integer extendMonthDate;
@ApiModelProperty(value = "已生成结算次数")
@QueryField(type = QueryType.EQ)
private Integer settleNum;

75
src/main/java/com/gxwebsoft/tower/param/TowerContractSettleEquipmentParam.java Normal file
View File

@@ -0,0 +1,75 @@
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-10 16:52:12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
@ApiModel(value = "TowerContractSettleEquipmentParam对象", description = "合同结算设备查询参数")
public class TowerContractSettleEquipmentParam extends BaseParam {
private static final long serialVersionUID = 1L;
@QueryField(type = QueryType.EQ)
private Integer contractSettleId;
@QueryField(type = QueryType.EQ)
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 = "计划租期(月)")
@QueryField(type = QueryType.EQ)
private Integer rentMonth;
@ApiModelProperty(value = "租金(元)")
@QueryField(type = QueryType.EQ)
private BigDecimal rentAmount;
@ApiModelProperty(value = "进退场费")
@QueryField(type = QueryType.EQ)
private BigDecimal inOutAmount;
@ApiModelProperty(value = "劳务费")
@QueryField(type = QueryType.EQ)
private BigDecimal workerAmount;
@ApiModelProperty(value = "其他费用")
@QueryField(type = QueryType.EQ)
private BigDecimal otherAmount;
private String remark;
@ApiModelProperty(value = "所有人")
@QueryField(type = QueryType.EQ)
private Integer userId;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
}

46
src/main/java/com/gxwebsoft/tower/param/TowerContractSettleRuleParam.java Normal file
View File

@@ -0,0 +1,46 @@
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-11 13:48:41
*/
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
@ApiModel(value = "TowerContractSettleRuleParam对象", description = "合同结算规则查询参数")
public class TowerContractSettleRuleParam extends BaseParam {
private static final long serialVersionUID = 1L;
@QueryField(type = QueryType.EQ)
private Integer contractSettleRuleId;
@ApiModelProperty(value = "合同ID")
@QueryField(type = QueryType.EQ)
private Integer contractId;
@ApiModelProperty(value = "结算开始日期")
private String startDate;
@ApiModelProperty(value = "结算结束日期")
private String endDate;
@ApiModelProperty(value = "所有人")
@QueryField(type = QueryType.EQ)
private Integer userId;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
}

86
src/main/java/com/gxwebsoft/tower/param/TowerSettleDetailParam.java Normal file
View File

@@ -0,0 +1,86 @@
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-11 19:13:12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
@ApiModel(value = "TowerSettleDetailParam对象", description = "合同结算详情查询参数")
public class TowerSettleDetailParam extends BaseParam {
private static final long serialVersionUID = 1L;
@QueryField(type = QueryType.EQ)
private Integer settleDetailId;
@ApiModelProperty(value = "结算id")
@QueryField(type = QueryType.EQ)
private Integer settleId;
@ApiModelProperty(value = "结算类型:0租金结算;1进退场费结算;2操作人员工资结算;3其他费用;4扣除项")
@QueryField(type = QueryType.EQ)
private Boolean 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 = "月租金/月工资")
@QueryField(type = QueryType.EQ)
private BigDecimal monthAmount;
@ApiModelProperty(value = "税率")
@QueryField(type = QueryType.EQ)
private Integer taxRate;
@ApiModelProperty(value = "进退场单价/单次费用")
@QueryField(type = QueryType.EQ)
private BigDecimal singleAmount;
@ApiModelProperty(value = "进退场次数/次数")
@QueryField(type = QueryType.EQ)
private Integer num;
@ApiModelProperty(value = "单位")
private String unit;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "所有人")
@QueryField(type = QueryType.EQ)
private Integer userId;
@ApiModelProperty(value = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
}

61
src/main/java/com/gxwebsoft/tower/param/TowerSettleParam.java Normal file
View File

@@ -0,0 +1,61 @@
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-11 19:19:10
*/
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
@ApiModel(value = "TowerSettleParam对象", description = "结算管理查询参数")
public class TowerSettleParam extends BaseParam {
private static final long serialVersionUID = 1L;
@QueryField(type = QueryType.EQ)
private Integer settleId;
@ApiModelProperty(value = "结算单号")
private String settleNo;
@ApiModelProperty(value = "合同id")
@QueryField(type = QueryType.EQ)
private Integer contractId;
@ApiModelProperty(value = "本期开始日期")
private String startDate;
@ApiModelProperty(value = "本期结束日期")
private String endDate;
@ApiModelProperty(value = "结算方式(0跨月;1自然月;2按日;3系数结算-跨月;4系数结算-自然月")
@QueryField(type = QueryType.EQ)
private Boolean settleMethod;
@ApiModelProperty(value = "跨月结算日期")
@QueryField(type = QueryType.EQ)
private Integer extendMonthDate;
@ApiModelProperty(value = "结算状态(0未认证;1已认证;2已失效;)")
@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;
}