bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码中金额、数量类型修改

This commit is contained in:
liang.chao 2024-09-06 17:31:54 +08:00
parent 9c39f36d8e
commit a917964c96
9 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseInfo.java
View File

@ -4,6 +4,8 @@ import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.annotation.Excels;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2024/2/21
@ -42,7 +44,7 @@ public class LeaseInfo {
/**
*原值
*/
private String buyPrice;
private BigDecimal buyPrice;
/**
*
*/
@ -84,12 +86,12 @@ public class LeaseInfo {
*租赁单价
*/
@Excel(name = "台班费单价（元/天）")
private String leasePrice;
private BigDecimal leasePrice;
/**
*领料数量
*/
@Excel(name = "数量")
private String num;
private Integer num;
/**
*领料时间
*/
@ -114,12 +116,12 @@ public class LeaseInfo {
* 应结算金额
*/
@Excel(name = "应结算金额（元）")
private String costs;
private BigDecimal costs;
/**
* 实际结算金额
*/
@Excel(name = "实际结算金额（元）")
private String realCosts;
private BigDecimal realCosts;
/**
* 实际结算金额
*/

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseRecord.java
View File

@ -70,7 +70,7 @@ public class LeaseRecord{
*/
@ApiModelProperty(value = "预领料数")
@Excel(name = "领料数量",cellType = Excel.ColumnType.NUMERIC)
private Double preNum;
private Integer preNum;
/**
* 领料人
@ -177,6 +177,6 @@ public class LeaseRecord{
* 实时库存
*/
@ApiModelProperty(value = "实时库存")
private Double num;
private Integer num;
}

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LoseInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2024/2/21
@ -42,7 +44,7 @@ public class LoseInfo {
*原值
*/
@Excel(name = "赔偿单价")
private String buyPrice;
private BigDecimal buyPrice;
/**
*
*/
@ -78,12 +80,12 @@ public class LoseInfo {
/**
*租赁单价
*/
private String leasePrice;
private BigDecimal leasePrice;
/**
*领料数量
*/
@Excel(name = "未还数量")
private String num;
private Integer num;
/**
*领料时间
*/
@ -100,7 +102,7 @@ public class LoseInfo {
* 租赁费用
*/
@Excel(name = "赔偿金额")
private String costs;
private BigDecimal costs;
/**
* 类型（0不收费，1收费）
*/

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MonthRepairInfo.java
View File

@ -17,13 +17,13 @@ public class MonthRepairInfo {
*/
// @Excel(name = "数量",sort = 4)
@ExcelProperty(index = 4, value = "数量")
private String num;
private Integer num;
public String getNum() {
public Integer getNum() {
return num;
}
public void setNum(String num) {
public void setNum(Integer num) {
this.num = num;
}
@ -43,11 +43,11 @@ public class MonthRepairInfo {
this.endTime = endTime;
}
public String getLeasePrice() {
public BigDecimal getLeasePrice() {
return leasePrice;
}
public void setLeasePrice(String leasePrice) {
public void setLeasePrice(BigDecimal leasePrice) {
this.leasePrice = leasePrice;
}
@ -99,19 +99,19 @@ public class MonthRepairInfo {
this.leaseDays = leaseDays;
}
public String getCosts() {
public BigDecimal getCosts() {
return costs;
}
public void setCosts(String costs) {
public void setCosts(BigDecimal costs) {
this.costs = costs;
}
public String getRealCosts() {
public BigDecimal getRealCosts() {
return realCosts;
}
public void setRealCosts(String realCosts) {
public void setRealCosts(BigDecimal realCosts) {
this.realCosts = realCosts;
}
@ -148,7 +148,7 @@ public class MonthRepairInfo {
*/
// @Excel(name = "台班费单价（元/天）",sort = 5)
@ExcelProperty(index = 5, value = "台班费单价（元/天）")
private String leasePrice;
private BigDecimal leasePrice;
/**
* 项目名称
@ -191,14 +191,14 @@ public class MonthRepairInfo {
*/
// @Excel(name = "结算金额",sort = 9)
@ExcelProperty(index = 9, value = "结算金额")
private String costs;
private BigDecimal costs;
/**
* 真实租赁费用
*/
// @Excel(name = "本月暂计金额",sort = 10)
@ExcelProperty(index = 10, value = "本月暂计金额")
private String realCosts;
private BigDecimal realCosts;
/**
* 费用承担方

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
View File

@ -84,11 +84,11 @@ public class PurchaseMacodeInfo extends BaseEntity
/** 采购数量 */
@ApiModelProperty(value = "采购数量")
private Long purchaseNum;
private Integer purchaseNum;
/** 验收数量 */
@ApiModelProperty(value = "验收数量")
private BigDecimal checkNum;
private Integer checkNum;
/** 验收数量 */
@ApiModelProperty(value = "绑定数量")
@ -276,19 +276,19 @@ public class PurchaseMacodeInfo extends BaseEntity
this.maId = maId;
}
public Long getPurchaseNum() {
public Integer getPurchaseNum() {
return purchaseNum;
}
public void setPurchaseNum(Long purchaseNum) {
public void setPurchaseNum(Integer purchaseNum) {
this.purchaseNum = purchaseNum;
}
public BigDecimal getCheckNum() {
public Integer getCheckNum() {
return checkNum;
}
public void setCheckNum(BigDecimal checkNum) {
public void setCheckNum(Integer checkNum) {
this.checkNum = checkNum;
}

22
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2024/2/21
@ -41,7 +43,7 @@ public class RepairInfo {
/**
*原值
*/
private String buyPrice;
private BigDecimal buyPrice;
/**
*
*/
@ -82,16 +84,16 @@ public class RepairInfo {
/**
*租赁单价
*/
private String leasePrice;
private BigDecimal leasePrice;
/**
*领料数量
*/
private String num;
private Integer num;
/**
*领料数量
*/
@Excel(name = "配件数量",sort = 6)
private String partNum;
private Integer partNum;
/**
*领料时间
*/
@ -111,30 +113,30 @@ public class RepairInfo {
/**
* 应结算金额
*/
private String costs;
private BigDecimal costs;
@Excel(name = "配件单价",sort = 7)
private String partPrice;
private BigDecimal partPrice;
/**
* 实际结算金额
*/
// @Excel(name = "实际结算金额（元）")
private String realCosts;
private BigDecimal realCosts;
/**
* 配件总价
*/
@Excel(name = "配件总价（元）",sort = 8)
private String partAllCosts;
private BigDecimal partAllCosts;
/**
* 费用总价
*/
// @Excel(name = "费用总价")
private String allCosts;
private BigDecimal allCosts;
/**
* 委外维修费用
*/
// @Excel(name = "委外维修费用")
private String outSourceCosts;
private BigDecimal outSourceCosts;
/**
* 实际结算金额
*/

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairPart.java
View File

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2023/12/11
@ -50,12 +52,12 @@ public class RepairPart {
* 配件费用
*/
@ApiModelProperty(value = "配件费用")
private String partCost;
private BigDecimal partCost;
/**
* 配件单价
*/
@ApiModelProperty(value = "配件单价")
private String partPrice;
private BigDecimal partPrice;
/**
* 类型（0不收费，1收费）
*/

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2024/2/21
@ -47,7 +49,7 @@ public class ScrapInfo {
*原值
*/
@Excel(name = "赔偿单价",sort = 6)
private String buyPrice;
private BigDecimal buyPrice;
/**
*
*/
@ -78,12 +80,12 @@ public class ScrapInfo {
/**
*租赁单价
*/
private String leasePrice;
private BigDecimal leasePrice;
/**
*领料数量
*/
@Excel(name = "报废数量",sort = 5)
private String num;
private Integer num;
/**
*领料时间
*/
@ -104,7 +106,7 @@ public class ScrapInfo {
* 租赁费用
*/
@Excel(name = "赔偿金额",sort = 7)
private String costs;
private BigDecimal costs;
/**
* 类型（0不收费，1收费）
*/

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/preScrapInfo.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author c liu
* @date 2024/2/21
@ -47,7 +49,7 @@ public class preScrapInfo {
/**
*原值
*/
private String buyPrice;
private BigDecimal buyPrice;
/**
*
*/
@ -78,14 +80,14 @@ public class preScrapInfo {
/**
*租赁单价
*/
private String leasePrice;
private BigDecimal leasePrice;
/**
*领料数量
*/
@Excel(name = "报废数量",sort = 5)
private String num;
private Integer num;
/**
*领料时间
*/
@ -105,7 +107,7 @@ public class preScrapInfo {
/**
* 租赁费用
*/
private String costs;
private BigDecimal costs;
/**
* 类型（0不收费，1收费）
*/