Skip to content

M
manager
Commit af0d3bd1 by kangxiaoshan
Options

验收金额

parent 0201c49f
Showing with 802 additions and 787 deletions
src/main/java/common/model/Contract.java
...@@ -13,813 +13,823 @@ import java.util.List; ...@@ -13,813 +13,823 @@ import java.util.List;
*/ */
@Entity @Entity
public class Contract { public class Contract {
private Long id; private Long id;
private String product; private String product;
private String myBodyName; private String myBodyName;
private String myBodyCode; private String myBodyCode;
private String customerBody; private String customerBody;
private String email; //客户主账号 private String email; //客户主账号
private String contractCode; private String contractCode;
private int codeNum; private int codeNum;
//是否首次签约 //是否首次签约
private String contractType; // 0 首次签约 1 续签 2 合同变更 private String contractType; // 0 首次签约 1 续签 2 合同变更
private String startDate; private String startDate;
private String endDate; private String endDate;
//套餐 //套餐
private Long priceLevel; private Long priceLevel;
private String priceLevelName; private String priceLevelName;
private Double money; //合同金额 private Double money; //合同金额
private Double rebate; // private Double rebate; //
private Long sale; private Long sale;
//产品 trackingio or adi ... //产品 trackingio or adi ...
private String platform; private String platform;
private String status; // 作废 先回款待录入 private String status; // 作废 先回款待录入
private String saleName; private String saleName;
private Double payMoney; // 回款金额 private Double payMoney; // 回款金额
private Integer backStatus; // 1 未回款 2 部分回款 3 已回款 private Integer backStatus; // 1 未回款 2 部分回款 3 已回款
private Long invoice; // 开票次数 private Long invoice; // 开票次数
private BigDecimal invoiceMoney; // 发票金额 private BigDecimal invoiceMoney; // 发票金额
private String createName; // 创建人NAME private String createName; // 创建人NAME
//合同类型 主套餐 or 增值套餐 //合同类型 主套餐 or 增值套餐
private String type; private String type;
private Long priceName; private Long priceName;
private Boolean old; private Boolean old;
private Long extraFlow; // 优惠流量 private Long extraFlow; // 优惠流量
private Long modifyAccount; private Long modifyAccount;
private Long createAccount;// 创建人id private Long createAccount;// 创建人id
private Date modifyTime; private Date modifyTime;
private Date createTime; private Date createTime;
private String ds; private String ds;
private Boolean virtual; private Boolean virtual;
private Long firstBackId;//先回款记录的id private Long firstBackId;//先回款记录的id
private Long adjustmentFund;// 分摊收入调整金额 (*100的结果) private Long adjustmentFund;// 分摊收入调整金额 (*100的结果)
private String adjustmentFundForm; // 表单提交的值（分摊收入调整金额） private String adjustmentFundForm; // 表单提交的值（分摊收入调整金额）
private Integer intervalUseDays;//区间使用天数 private Integer intervalUseDays;//区间使用天数
private Long incomeExcludingTax; //不含税收入 (*100的结果) private Long incomeExcludingTax; //不含税收入 (*100的结果)
private Long intervaIncomeShare;//区间分摊收入(*100的结果) private Long intervaIncomeShare;//区间分摊收入(*100的结果)
private Long incomeShareAll;//分摊总收入(*100的结果) private Long incomeShareAll;//分摊总收入(*100的结果)
private Long incomeGross;//累计总收入(*100的结果)合同自开始至选择的结束日期(分摊收入+调整金额) private Long incomeGross;//累计总收入(*100的结果)合同自开始至选择的结束日期(分摊收入+调整金额)
private Integer shareSign;//标记是否计算分摊收入 1 计算 0 不计算 private Integer shareSign;//标记是否计算分摊收入 1 计算 0 不计算
private String searchName; private String searchName;
private List<String> customBodyNames; private List<String> customBodyNames;
/** /**
* 新增字段 20190427 * 新增字段 20190427
*/ */
private Long discountTimeLong; // 优惠时长 private Long discountTimeLong; // 优惠时长
private String customerShort;// 客户简称 private String customerShort;// 客户简称
private String customerThird;// 三方客户 private String customerThird;// 三方客户
private int tradeType; // 行业id private int tradeType; // 行业id
private Long relationContract;// 关联合同id private Long relationContract;// 关联合同id
private String relationCode;// 关联合同编号 private String relationCode;// 关联合同编号
private String hasDiscount;// 是否有优惠 private String hasDiscount;// 是否有优惠
private String typeId;// 合同类型 （保密协议、框架合同、结算单） private String typeId;// 合同类型 （保密协议、框架合同、结算单）
private String erroMessage; private String erroMessage;
private String tradeName; private String tradeName;
private Long barrioId;//行政区域id private Long barrioId;//行政区域id
private String barrioName;//行政区域名称 private String barrioName;//行政区域名称
private String belongGroup;//隶属集团 private String belongGroup;//隶属集团
private Double trackFlow;//流量，tkio的,万单位 private Double trackFlow;//流量，tkio的,万单位
private Double unitPrice;//单价，tkio private Double unitPrice;//单价，tkio
private Double clickFlow;//区间点击数，tkio private Double clickFlow;//区间点击数，tkio
private Boolean operate = true; private Boolean operate = true;
private String nextSignedDate;//绑定下一份合同的日期 private String nextSignedDate;//绑定下一份合同的日期
private String nextSignedContractCode;//绑定的下一份合同编号 private String nextSignedContractCode;//绑定的下一份合同编号
private String signedDate;//合同签订日：补充协议才有值 private String signedDate;//合同签订日：补充协议才有值
private double historyTkioFlow;//万单位，保留四位 private double historyTkioFlow;//万单位，保留四位
private BigDecimal unitPriceAccurate;//16位的单价 private BigDecimal unitPriceAccurate;//16位的单价
private String validStartDate;//有效开始日 private String validStartDate;//有效开始日
private String validEndDate;//有效结束日 private String validEndDate;//有效结束日
private Double oneTimeRecognizedRevenue;//一次性确认收入 private Double oneTimeRecognizedRevenue;//一次性确认收入
private Boolean oneTime;//是否计算一次性收入，0不计算 private Boolean oneTime;//是否计算一次性收入，0不计算
private int businessType; //业务类型 1 VIP 2 共管 private int businessType; //业务类型 1 VIP 2 共管
private int agreementType; //协议类型 1 普通协议 2 框架协议 private int agreementType; //协议类型 1 普通协议 2 框架协议
private String businessTypeName; //业务类型 1 VIP 2 共管 private String businessTypeName; //业务类型 1 VIP 2 共管
private String agreementTypeName; //协议类型 1 普通协议 2 框架协议 private String agreementTypeName; //协议类型 1 普通协议 2 框架协议
private String productType; //产品类型 private String productType; //产品类型
private String acceptanceAmount;//验收金额
@Id
@GeneratedValue @Id
public Long getId() { @GeneratedValue
return id; public Long getId() {
} return id;
}
public void setId(Long id) {
this.id = id; public void setId(Long id) {
} this.id = id;
}
public Boolean getVirtual() {
return virtual; public Boolean getVirtual() {
} return virtual;
}
public void setVirtual(Boolean virtual) {
this.virtual = virtual; public void setVirtual(Boolean virtual) {
} this.virtual = virtual;
}
public Long getFirstBackId() {
return firstBackId; public Long getFirstBackId() {
} return firstBackId;
}
public void setFirstBackId(Long firstBackId) {
this.firstBackId = firstBackId; public void setFirstBackId(Long firstBackId) {
} this.firstBackId = firstBackId;
}
public String getProduct() {
return product; public String getProduct() {
} return product;
}
public void setProduct(String product) {
this.product = product; public void setProduct(String product) {
} this.product = product;
}
public String getMyBodyName() {
return myBodyName; public String getMyBodyName() {
} return myBodyName;
}
public void setMyBodyName(String myBodyName) {
this.myBodyName = myBodyName; public void setMyBodyName(String myBodyName) {
} this.myBodyName = myBodyName;
}
public String getMyBodyCode() {
return myBodyCode; public String getMyBodyCode() {
} return myBodyCode;
}
public void setMyBodyCode(String myBodyCode) {
this.myBodyCode = myBodyCode; public void setMyBodyCode(String myBodyCode) {
} this.myBodyCode = myBodyCode;
}
public String getCustomerBody() {
return customerBody; public String getCustomerBody() {
} return customerBody;
}
public void setCustomerBody(String customerBody) {
this.customerBody = customerBody; public void setCustomerBody(String customerBody) {
} this.customerBody = customerBody;
}
public String getEmail() {
return email; public String getEmail() {
} return email;
}
public void setEmail(String email) {
this.email = email; public void setEmail(String email) {
} this.email = email;
}
public String getContractCode() {
return contractCode; public String getContractCode() {
} return contractCode;
}
public void setContractCode(String contractCode) {
this.contractCode = contractCode; public void setContractCode(String contractCode) {
} this.contractCode = contractCode;
}
public String getContractType() {
return contractType; public String getContractType() {
} return contractType;
}
public void setContractType(String contractType) {
this.contractType = contractType; public void setContractType(String contractType) {
} this.contractType = contractType;
}
public String getStartDate() { public String getStartDate() {
return startDate; return startDate;
} }
public void setStartDate(String stratDate) { public void setStartDate(String stratDate) {
this.startDate = stratDate; this.startDate = stratDate;
} }
public String getEndDate() { public String getEndDate() {
return endDate; return endDate;
} }
public void setEndDate(String endDate) { public void setEndDate(String endDate) {
this.endDate = endDate; this.endDate = endDate;
} }
public Long getPriceLevel() { public Long getPriceLevel() {
return priceLevel; return priceLevel;
} }
public void setPriceLevel(Long priceLevel) { public void setPriceLevel(Long priceLevel) {
this.priceLevel = priceLevel; this.priceLevel = priceLevel;
} }
public Double getMoney() { public Double getMoney() {
return money; return money;
} }
public void setMoney(Double money) { public void setMoney(Double money) {
this.money = money; this.money = money;
} }
public Double getRebate() { public Double getRebate() {
return rebate; return rebate;
} }
public void setRebate(Double rebate) { public void setRebate(Double rebate) {
this.rebate = rebate; this.rebate = rebate;
} }
public Long getSale() { public Long getSale() {
return sale; return sale;
} }
public void setSale(Long sale) { public void setSale(Long sale) {
this.sale = sale; this.sale = sale;
} }
public String getPlatform() { public String getPlatform() {
return platform; return platform;
} }
public void setPlatform(String platform) { public void setPlatform(String platform) {
this.platform = platform; this.platform = platform;
} }
public Long getModifyAccount() { public Long getModifyAccount() {
return modifyAccount; return modifyAccount;
} }
public void setModifyAccount(Long modifyAccount) { public void setModifyAccount(Long modifyAccount) {
this.modifyAccount = modifyAccount; this.modifyAccount = modifyAccount;
} }
public Long getCreateAccount() { public Long getCreateAccount() {
return createAccount; return createAccount;
} }
public void setCreateAccount(Long createAccount) { public void setCreateAccount(Long createAccount) {
this.createAccount = createAccount; this.createAccount = createAccount;
} }
public Date getModifyTime() { public Date getModifyTime() {
return modifyTime; return modifyTime;
} }
public void setModifyTime(Date modifyTime) { public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime; this.modifyTime = modifyTime;
} }
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
public String getDs() { public String getDs() {
return ds; return ds;
} }
public void setDs(String ds) { public void setDs(String ds) {
this.ds = ds; this.ds = ds;
} }
public String getStatus() { public String getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public Double getPayMoney() { public Double getPayMoney() {
return payMoney; return payMoney;
} }
public void setPayMoney(Double payMoney) { public void setPayMoney(Double payMoney) {
this.payMoney = payMoney; this.payMoney = payMoney;
} }
public Long getInvoice() { public Long getInvoice() {
return invoice; return invoice;
} }
public BigDecimal getInvoiceMoney() { public BigDecimal getInvoiceMoney() {
return invoiceMoney; return invoiceMoney;
} }
public void setInvoiceMoney(BigDecimal invoiceMoney) { public void setInvoiceMoney(BigDecimal invoiceMoney) {
this.invoiceMoney = invoiceMoney; this.invoiceMoney = invoiceMoney;
} }
public void setInvoice(Long invoice) { public void setInvoice(Long invoice) {
this.invoice = invoice; this.invoice = invoice;
} }
public String getType() { public String getType() {
return type; return type;
} }
public void setType(String type) { public void setType(String type) {
this.type = type; this.type = type;
} }
public Boolean getOld() { public Boolean getOld() {
return old; return old;
} }
public Long getExtraFlow() { public Long getExtraFlow() {
return extraFlow; return extraFlow;
} }
public void setExtraFlow(Long extraFlow) { public void setExtraFlow(Long extraFlow) {
this.extraFlow = extraFlow; this.extraFlow = extraFlow;
} }
public void setOld(Boolean old) { public void setOld(Boolean old) {
this.old = old; this.old = old;
} }
public int getCodeNum() { public int getCodeNum() {
return codeNum; return codeNum;
} }
public void setCodeNum(int codeNum) { public void setCodeNum(int codeNum) {
this.codeNum = codeNum; this.codeNum = codeNum;
} }
@Transient @Transient
public Long getPriceName() { public Long getPriceName() {
return priceName; return priceName;
} }
public void setPriceName(Long priceName) { public void setPriceName(Long priceName) {
this.priceName = priceName; this.priceName = priceName;
} }
@Transient @Transient
public String getSaleName() { public String getSaleName() {
return saleName; return saleName;
} }
public void setSaleName(String saleName) { public void setSaleName(String saleName) {
this.saleName = saleName; this.saleName = saleName;
} }
@Transient @Transient
public String getPriceLevelName() { public String getPriceLevelName() {
return priceLevelName; return priceLevelName;
} }
public String getRelationCode() { public String getRelationCode() {
return relationCode; return relationCode;
} }
public void setRelationCode(String relationCode) { public void setRelationCode(String relationCode) {
this.relationCode = relationCode; this.relationCode = relationCode;
} }
@Transient @Transient
public String getHasDiscount() { public String getHasDiscount() {
return hasDiscount; return hasDiscount;
} }
public void setHasDiscount(String hasDiscount) { public void setHasDiscount(String hasDiscount) {
this.hasDiscount = hasDiscount; this.hasDiscount = hasDiscount;
} }
@Transient @Transient
public String getErroMessage() { public String getErroMessage() {
return erroMessage; return erroMessage;
} }
public void setErroMessage(String erroMessage) { public void setErroMessage(String erroMessage) {
this.erroMessage = erroMessage; this.erroMessage = erroMessage;
} }
public void setPriceLevelName(String priceLevelName) { public void setPriceLevelName(String priceLevelName) {
this.priceLevelName = priceLevelName; this.priceLevelName = priceLevelName;
} }
public String getCreateName() { public String getCreateName() {
return createName; return createName;
} }
public void setCreateName(String createName) { public void setCreateName(String createName) {
this.createName = createName; this.createName = createName;
} }
public Long getDiscountTimeLong() { public Long getDiscountTimeLong() {
return discountTimeLong; return discountTimeLong;
} }
public void setDiscountTimeLong(Long discountTimeLong) { public void setDiscountTimeLong(Long discountTimeLong) {
this.discountTimeLong = discountTimeLong; this.discountTimeLong = discountTimeLong;
} }
public String getCustomerShort() { public String getCustomerShort() {
return customerShort; return customerShort;
} }
public void setCustomerShort(String customerShort) { public void setCustomerShort(String customerShort) {
this.customerShort = customerShort; this.customerShort = customerShort;
} }
public String getCustomerThird() { public String getCustomerThird() {
return customerThird; return customerThird;
} }
public void setCustomerThird(String customerThird) { public void setCustomerThird(String customerThird) {
this.customerThird = customerThird; this.customerThird = customerThird;
} }
public int getTradeType() { public int getTradeType() {
return tradeType; return tradeType;
} }
public void setTradeType(int tradeType) { public void setTradeType(int tradeType) {
this.tradeType = tradeType; this.tradeType = tradeType;
} }
public Long getRelationContract() { public Long getRelationContract() {
return relationContract; return relationContract;
} }
public void setRelationContract(Long relationContract) { public void setRelationContract(Long relationContract) {
this.relationContract = relationContract; this.relationContract = relationContract;
} }
public String getTypeId() { public String getTypeId() {
return typeId; return typeId;
} }
public void setTypeId(String typeId) { public void setTypeId(String typeId) {
this.typeId = typeId; this.typeId = typeId;
} }
@Transient @Transient
public String getTradeName() { public String getTradeName() {
return tradeName; return tradeName;
} }
public void setTradeName(String tradeName) { public void setTradeName(String tradeName) {
this.tradeName = tradeName; this.tradeName = tradeName;
} }
public Long getAdjustmentFund() { public Long getAdjustmentFund() {
return adjustmentFund; return adjustmentFund;
} }
public void setAdjustmentFund(Long adjustmentFund) { public void setAdjustmentFund(Long adjustmentFund) {
this.adjustmentFund = adjustmentFund; this.adjustmentFund = adjustmentFund;
} }
@Transient @Transient
public Integer getIntervalUseDays() { public Integer getIntervalUseDays() {
return intervalUseDays; return intervalUseDays;
} }
public void setIntervalUseDays(Integer intervalUseDays) { public void setIntervalUseDays(Integer intervalUseDays) {
this.intervalUseDays = intervalUseDays; this.intervalUseDays = intervalUseDays;
} }
@Transient @Transient
public Long getIncomeExcludingTax() { public Long getIncomeExcludingTax() {
return incomeExcludingTax; return incomeExcludingTax;
} }
@Transient @Transient
public void setIncomeExcludingTax(Long incomeExcludingTax) { public void setIncomeExcludingTax(Long incomeExcludingTax) {
this.incomeExcludingTax = incomeExcludingTax; this.incomeExcludingTax = incomeExcludingTax;
} }
public Long getIntervaIncomeShare() { public Long getIntervaIncomeShare() {
return intervaIncomeShare; return intervaIncomeShare;
} }
@Transient @Transient
public void setIntervaIncomeShare(Long intervaIncomeShare) { public void setIntervaIncomeShare(Long intervaIncomeShare) {
this.intervaIncomeShare = intervaIncomeShare; this.intervaIncomeShare = intervaIncomeShare;
} }
@Transient @Transient
public Long getIncomeShareAll() { public Long getIncomeShareAll() {
return incomeShareAll; return incomeShareAll;
} }
public void setIncomeShareAll(Long incomeShareAll) { public void setIncomeShareAll(Long incomeShareAll) {
this.incomeShareAll = incomeShareAll; this.incomeShareAll = incomeShareAll;
} }
@Transient @Transient
public String getAdjustmentFundForm() { public String getAdjustmentFundForm() {
return adjustmentFundForm; return adjustmentFundForm;
} }
public void setAdjustmentFundForm(String adjustmentFundForm) { public void setAdjustmentFundForm(String adjustmentFundForm) {
this.adjustmentFundForm = adjustmentFundForm; this.adjustmentFundForm = adjustmentFundForm;
} }
public Long getBarrioId() { public Long getBarrioId() {
return barrioId; return barrioId;
} }
public void setBarrioId(Long barrioId) { public void setBarrioId(Long barrioId) {
this.barrioId = barrioId; this.barrioId = barrioId;
} }
public String getBelongGroup() { public String getBelongGroup() {
return belongGroup; return belongGroup;
} }
public void setBelongGroup(String belongGroup) { public void setBelongGroup(String belongGroup) {
this.belongGroup = belongGroup; this.belongGroup = belongGroup;
} }
public Integer getBackStatus() { public Integer getBackStatus() {
return backStatus; return backStatus;
} }
public void setBackStatus(Integer backStatus) { public void setBackStatus(Integer backStatus) {
this.backStatus = backStatus; this.backStatus = backStatus;
} }
@Transient @Transient
public String getSearchName() { public String getSearchName() {
return searchName; return searchName;
} }
public void setSearchName(String searchName) { public void setSearchName(String searchName) {
this.searchName = searchName; this.searchName = searchName;
} }
@Transient @Transient
public List<String> getCustomBodyNames() { public List<String> getCustomBodyNames() {
return customBodyNames; return customBodyNames;
} }
public void setCustomBodyNames(List<String> customBodyNames) { public void setCustomBodyNames(List<String> customBodyNames) {
this.customBodyNames = customBodyNames; this.customBodyNames = customBodyNames;
} }
public Integer getShareSign() { public Integer getShareSign() {
return shareSign; return shareSign;
} }
public void setShareSign(Integer shareSign) { public void setShareSign(Integer shareSign) {
this.shareSign = shareSign; this.shareSign = shareSign;
} }
@Transient @Transient
public String getBarrioName() { public String getBarrioName() {
return barrioName; return barrioName;
} }
public void setBarrioName(String barrioName) { public void setBarrioName(String barrioName) {
this.barrioName = barrioName; this.barrioName = barrioName;
} }
public Double getTrackFlow() { public Double getTrackFlow() {
return trackFlow; return trackFlow;
} }
public void setTrackFlow(Double trackFlow) { public void setTrackFlow(Double trackFlow) {
this.trackFlow = trackFlow; this.trackFlow = trackFlow;
} }
@Transient @Transient
public Double getUnitPrice() { public Double getUnitPrice() {
return unitPrice; return unitPrice;
} }
public void setUnitPrice(Double unitPrice) { public void setUnitPrice(Double unitPrice) {
this.unitPrice = unitPrice; this.unitPrice = unitPrice;
} }
@Transient @Transient
public Double getClickFlow() { public Double getClickFlow() {
return clickFlow; return clickFlow;
} }
public void setClickFlow(Double clickFlow) { public void setClickFlow(Double clickFlow) {
this.clickFlow = clickFlow; this.clickFlow = clickFlow;
} }
@Transient @Transient
public Long getIncomeGross() { public Long getIncomeGross() {
return incomeGross; return incomeGross;
} }
public void setIncomeGross(Long incomeGross) { public void setIncomeGross(Long incomeGross) {
this.incomeGross = incomeGross; this.incomeGross = incomeGross;
} }
@Transient @Transient
public Boolean getOperate() { public Boolean getOperate() {
return operate; return operate;
} }
public void setOperate(Boolean operate) { public void setOperate(Boolean operate) {
this.operate = operate; this.operate = operate;
} }
public String getNextSignedDate() { public String getNextSignedDate() {
return nextSignedDate; return nextSignedDate;
} }
public void setNextSignedDate(String nextSignedDate) { public void setNextSignedDate(String nextSignedDate) {
this.nextSignedDate = nextSignedDate; this.nextSignedDate = nextSignedDate;
} }
public String getNextSignedContractCode() { public String getNextSignedContractCode() {
return nextSignedContractCode; return nextSignedContractCode;
} }
public void setNextSignedContractCode(String nextSignedContractCode) { public void setNextSignedContractCode(String nextSignedContractCode) {
this.nextSignedContractCode = nextSignedContractCode; this.nextSignedContractCode = nextSignedContractCode;
} }
public String getSignedDate() { public String getSignedDate() {
return signedDate; return signedDate;
} }
public void setSignedDate(String signedDate) { public void setSignedDate(String signedDate) {
this.signedDate = signedDate; this.signedDate = signedDate;
} }
@Transient @Transient
public double getHistoryTkioFlow() { public double getHistoryTkioFlow() {
return historyTkioFlow; return historyTkioFlow;
} }
public void setHistoryTkioFlow(double historyTkioFlow) { public void setHistoryTkioFlow(double historyTkioFlow) {
this.historyTkioFlow = historyTkioFlow; this.historyTkioFlow = historyTkioFlow;
} }
@Transient @Transient
public BigDecimal getUnitPriceAccurate() { public BigDecimal getUnitPriceAccurate() {
return unitPriceAccurate; return unitPriceAccurate;
} }
public void setUnitPriceAccurate(BigDecimal unitPriceAccurate) { public void setUnitPriceAccurate(BigDecimal unitPriceAccurate) {
this.unitPriceAccurate = unitPriceAccurate; this.unitPriceAccurate = unitPriceAccurate;
} }
public String getValidStartDate() { public String getValidStartDate() {
return validStartDate; return validStartDate;
} }
public void setValidStartDate(String validStartDate) { public void setValidStartDate(String validStartDate) {
this.validStartDate = validStartDate; this.validStartDate = validStartDate;
} }
public String getValidEndDate() { public String getValidEndDate() {
return validEndDate; return validEndDate;
} }
public void setValidEndDate(String validEndDate) { public void setValidEndDate(String validEndDate) {
this.validEndDate = validEndDate; this.validEndDate = validEndDate;
} }
@Transient @Transient
public Double getOneTimeRecognizedRevenue() { public Double getOneTimeRecognizedRevenue() {
return oneTimeRecognizedRevenue; return oneTimeRecognizedRevenue;
} }
public void setOneTimeRecognizedRevenue(Double oneTimeRecognizedRevenue) { public void setOneTimeRecognizedRevenue(Double oneTimeRecognizedRevenue) {
this.oneTimeRecognizedRevenue = oneTimeRecognizedRevenue; this.oneTimeRecognizedRevenue = oneTimeRecognizedRevenue;
} }
public Boolean getOneTime() { public Boolean getOneTime() {
return oneTime; return oneTime;
} }
public void setOneTime(Boolean oneTime) { public void setOneTime(Boolean oneTime) {
this.oneTime = oneTime; this.oneTime = oneTime;
} }
@Override @Override
public String toString() { public String toString() {
return "Contract{" + return "Contract{" +
"id=" + id + "id=" + id +
", product='" + product + '\'' + ", product='" + product + '\'' +
", myBodyName='" + myBodyName + '\'' + ", myBodyName='" + myBodyName + '\'' +
", myBodyCode='" + myBodyCode + '\'' + ", myBodyCode='" + myBodyCode + '\'' +
", customerBody='" + customerBody + '\'' + ", customerBody='" + customerBody + '\'' +
", email='" + email + '\'' + ", email='" + email + '\'' +
", contractCode='" + contractCode + '\'' + ", contractCode='" + contractCode + '\'' +
", codeNum=" + codeNum + ", codeNum=" + codeNum +
", contractType='" + contractType + '\'' + ", contractType='" + contractType + '\'' +
", startDate='" + startDate + '\'' + ", startDate='" + startDate + '\'' +
", endDate='" + endDate + '\'' + ", endDate='" + endDate + '\'' +
", priceLevel=" + priceLevel + ", priceLevel=" + priceLevel +
", priceLevelName='" + priceLevelName + '\'' + ", priceLevelName='" + priceLevelName + '\'' +
", money=" + money + ", money=" + money +
", rebate=" + rebate + ", rebate=" + rebate +
", sale=" + sale + ", sale=" + sale +
", platform='" + platform + '\'' + ", platform='" + platform + '\'' +
", status='" + status + '\'' + ", status='" + status + '\'' +
", saleName='" + saleName + '\'' + ", saleName='" + saleName + '\'' +
", payMoney=" + payMoney + ", payMoney=" + payMoney +
", backStatus=" + backStatus + ", backStatus=" + backStatus +
", invoice=" + invoice + ", invoice=" + invoice +
", invoiceMoney=" + invoiceMoney + ", invoiceMoney=" + invoiceMoney +
", createName='" + createName + '\'' + ", createName='" + createName + '\'' +
", type='" + type + '\'' + ", type='" + type + '\'' +
", priceName=" + priceName + ", priceName=" + priceName +
", old=" + old + ", old=" + old +
", extraFlow=" + extraFlow + ", extraFlow=" + extraFlow +
", modifyAccount=" + modifyAccount + ", modifyAccount=" + modifyAccount +
", createAccount=" + createAccount + ", createAccount=" + createAccount +
", modifyTime=" + modifyTime + ", modifyTime=" + modifyTime +
", createTime=" + createTime + ", createTime=" + createTime +
", ds='" + ds + '\'' + ", ds='" + ds + '\'' +
", virtual=" + virtual + ", virtual=" + virtual +
", firstBackId=" + firstBackId + ", firstBackId=" + firstBackId +
", adjustmentFund=" + adjustmentFund + ", adjustmentFund=" + adjustmentFund +
", adjustmentFundForm='" + adjustmentFundForm + '\'' + ", adjustmentFundForm='" + adjustmentFundForm + '\'' +
", intervalUseDays=" + intervalUseDays + ", intervalUseDays=" + intervalUseDays +
", incomeExcludingTax=" + incomeExcludingTax + ", incomeExcludingTax=" + incomeExcludingTax +
", intervaIncomeShare=" + intervaIncomeShare + ", intervaIncomeShare=" + intervaIncomeShare +
", incomeShareAll=" + incomeShareAll + ", incomeShareAll=" + incomeShareAll +
", incomeGross=" + incomeGross + ", incomeGross=" + incomeGross +
", shareSign=" + shareSign + ", shareSign=" + shareSign +
", searchName='" + searchName + '\'' + ", searchName='" + searchName + '\'' +
", customBodyNames=" + customBodyNames + ", customBodyNames=" + customBodyNames +
", discountTimeLong=" + discountTimeLong + ", discountTimeLong=" + discountTimeLong +
", customerShort='" + customerShort + '\'' + ", customerShort='" + customerShort + '\'' +
", customerThird='" + customerThird + '\'' + ", customerThird='" + customerThird + '\'' +
", tradeType=" + tradeType + ", tradeType=" + tradeType +
", relationContract=" + relationContract + ", relationContract=" + relationContract +
", relationCode='" + relationCode + '\'' + ", relationCode='" + relationCode + '\'' +
", hasDiscount='" + hasDiscount + '\'' + ", hasDiscount='" + hasDiscount + '\'' +
", typeId='" + typeId + '\'' + ", typeId='" + typeId + '\'' +
", erroMessage='" + erroMessage + '\'' + ", erroMessage='" + erroMessage + '\'' +
", tradeName='" + tradeName + '\'' + ", tradeName='" + tradeName + '\'' +
", barrioId=" + barrioId + ", barrioId=" + barrioId +
", barrioName='" + barrioName + '\'' + ", barrioName='" + barrioName + '\'' +
", belongGroup='" + belongGroup + '\'' + ", belongGroup='" + belongGroup + '\'' +
", trackFlow=" + trackFlow + ", trackFlow=" + trackFlow +
", unitPrice=" + unitPrice + ", unitPrice=" + unitPrice +
", clickFlow=" + clickFlow + ", clickFlow=" + clickFlow +
", operate=" + operate + ", operate=" + operate +
", nextSignedDate='" + nextSignedDate + '\'' + ", nextSignedDate='" + nextSignedDate + '\'' +
", nextSignedContractCode='" + nextSignedContractCode + '\'' + ", nextSignedContractCode='" + nextSignedContractCode + '\'' +
", signedDate='" + signedDate + '\'' + ", signedDate='" + signedDate + '\'' +
", historyTkioFlow=" + historyTkioFlow + ", historyTkioFlow=" + historyTkioFlow +
", unitPriceAccurate=" + unitPriceAccurate + ", unitPriceAccurate=" + unitPriceAccurate +
", validStartDate='" + validStartDate + '\'' + ", validStartDate='" + validStartDate + '\'' +
", validEndDate='" + validEndDate + '\'' + ", validEndDate='" + validEndDate + '\'' +
'}'; '}';
} }
public int getBusinessType() { public int getBusinessType() {
return businessType; return businessType;
} }
public void setBusinessType(int businessType) { public void setBusinessType(int businessType) {
this.businessType = businessType; this.businessType = businessType;
} }
public int getAgreementType() { public int getAgreementType() {
return agreementType; return agreementType;
} }
public void setAgreementType(int agreementType) { public void setAgreementType(int agreementType) {
this.agreementType = agreementType; this.agreementType = agreementType;
} }
@Transient @Transient
public String getBusinessTypeName() { public String getBusinessTypeName() {
return businessTypeName; return businessTypeName;
} }
public void setBusinessTypeName(String businessTypeName) { public void setBusinessTypeName(String businessTypeName) {
this.businessTypeName = businessTypeName; this.businessTypeName = businessTypeName;
} }
@Transient @Transient
public String getAgreementTypeName() { public String getAgreementTypeName() {
return agreementTypeName; return agreementTypeName;
} }
public void setAgreementTypeName(String agreementTypeName) { public void setAgreementTypeName(String agreementTypeName) {
this.agreementTypeName = agreementTypeName; this.agreementTypeName = agreementTypeName;
} }
public String getProductType() { public String getProductType() {
return productType; return productType;
} }
public void setProductType(String productType) { public void setProductType(String productType) {
this.productType = productType; this.productType = productType;
} }
@Transient
public String getAcceptanceAmount() {
return acceptanceAmount;
}
public void setAcceptanceAmount(String acceptanceAmount) {
this.acceptanceAmount = acceptanceAmount;
}
} }
src/main/java/common/repository/DmpIncomeRepository.java
...@@ -16,4 +16,6 @@ public interface DmpIncomeRepository extends JpaRepository<DmpIncome, Long> { ...@@ -16,4 +16,6 @@ public interface DmpIncomeRepository extends JpaRepository<DmpIncome, Long> {
@Query(value = "select * from dmp_income where contract_code = ?1 and income_month =?2 limit 1 ", nativeQuery = true) @Query(value = "select * from dmp_income where contract_code = ?1 and income_month =?2 limit 1 ", nativeQuery = true)
DmpIncome findByCodeMonth(String contractCode, String incomeMonth); DmpIncome findByCodeMonth(String contractCode, String incomeMonth);
} }
src/main/java/common/repository/PdIncomeRepository.java
...@@ -8,10 +8,13 @@ import java.util.List; ...@@ -8,10 +8,13 @@ import java.util.List;
public interface PdIncomeRepository extends JpaRepository<PdIncome, Long> { public interface PdIncomeRepository extends JpaRepository<PdIncome, Long> {
@Query(value = "select * from pd_income where contract_code = ? order by input_date desc ", nativeQuery = true) @Query(value = "select * from pd_income where contract_code = ? order by input_date desc ", nativeQuery = true)
List<PdIncome> findByContractCode(String code); List<PdIncome> findByContractCode(String code);
@Query(value = "select * from pd_income where settlement_date > ?1 and settlement_date < ?2", nativeQuery = true) @Query(value = "select * from pd_income where settlement_date > ?1 and settlement_date < ?2", nativeQuery = true)
List<PdIncome> findByDs(String startDate, String endDate); List<PdIncome> findByDs(String startDate, String endDate);
@Query(value = "select contract_code, sum(acceptance_amount) from pd_income where contract_code in ?1 group by contract_code", nativeQuery = true)
List<Object[]> findGroupWithCode(List codes);
} }
src/main/java/common/service/impl/ContractServiceImpl.java
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment