update 全所收入统计-合同金额为0时返回0.00
This commit is contained in:
+1
-1
@@ -693,7 +693,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
|
||||
for (int i=1; i <= 12; i++) {
|
||||
if (!collect.contains(i)) {
|
||||
StringBuilder stringBuilder=new StringBuilder().append(paymentYear);
|
||||
AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00", "0.00", "0.00", stringBuilder.append("-" + i).toString());
|
||||
AllProjectStatistics allProjectStatistics=new AllProjectStatistics("0.00", "0.00", "0.00", "0.00", stringBuilder.append("-" + i).toString());
|
||||
list.add(allProjectStatistics);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-3
@@ -7,8 +7,6 @@ import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author zql
|
||||
* @date 2021/9/17 18:04
|
||||
@@ -72,7 +70,8 @@ public class AllProjectStatistics {
|
||||
@ApiModelProperty(value = "到账时间")
|
||||
private String paymentDate;
|
||||
|
||||
public AllProjectStatistics(String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) {
|
||||
public AllProjectStatistics(String allMoney, String confirmAmount, String billMoney, String comeAllMoney, String paymentDate) {
|
||||
this.allMoney=allMoney;
|
||||
this.confirmAmount=confirmAmount;
|
||||
this.billMoney=billMoney;
|
||||
this.comeAllMoney=comeAllMoney;
|
||||
|
||||
Reference in New Issue
Block a user