mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数量支持小数

master
OathK1per 2022-11-04 15:48:33 +08:00
parent bdad08ba7d
commit 3fb00e7fed
9 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -180,7 +180,7 @@ public class ProjectController extends BaseController {
} }
//收入明细 //收入明细
List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project);
Integer incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project); BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project);
Set<String> rates = new HashSet<>(); Set<String> rates = new HashSet<>();
StringBuilder incomeTaxSb = new StringBuilder(); StringBuilder incomeTaxSb = new StringBuilder();
String incomeTaxRates; String incomeTaxRates;
@ -206,7 +206,7 @@ public class ProjectController extends BaseController {
exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收款计划表", outputStream); exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收款计划表", outputStream);
//成本明细 //成本明细
List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project);
Integer costTotalAmount = projectBudgetService.getBudgetCostAmount(project); BigDecimal costTotalAmount = projectBudgetService.getBudgetCostAmount(project);
BigDecimal costUnderwrittenAmountTotal = projectBudgetService.getBudgetCostUnderwrittenAmountTotal(project); BigDecimal costUnderwrittenAmountTotal = projectBudgetService.getBudgetCostUnderwrittenAmountTotal(project);
BigDecimal costPayAmountTotal = projectBudgetService.getBudgetCostPayAmountTotal(project); BigDecimal costPayAmountTotal = projectBudgetService.getBudgetCostPayAmountTotal(project);
List<ProcurementType> procurementTypes = procurementTypeService.allProcurementTypeList(); List<ProcurementType> procurementTypes = procurementTypeService.allProcurementTypeList();
@ -230,7 +230,7 @@ public class ProjectController extends BaseController {
exportExcelUtils.exportCostDetailExcel(headers3, columns3, project, budgetBean, budgetCostDetail, costTotalAmount, costUnderwrittenAmountTotal, costPayAmountTotal, procurementMap, "yyyy-MM-dd", 0, "采购成本明细表", outputStream); exportExcelUtils.exportCostDetailExcel(headers3, columns3, project, budgetBean, budgetCostDetail, costTotalAmount, costUnderwrittenAmountTotal, costPayAmountTotal, procurementMap, "yyyy-MM-dd", 0, "采购成本明细表", outputStream);
//项目管理成本明细 //项目管理成本明细
List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project); List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project);
Integer costProjectManageTotalAmount = projectBudgetService.getBudgetCostProjectManageAmount(project); BigDecimal costProjectManageTotalAmount = projectBudgetService.getBudgetCostProjectManageAmount(project);
BigDecimal managePayAmountTotal = projectBudgetService.getBudgetCostProjectManagePayAmount(project); BigDecimal managePayAmountTotal = projectBudgetService.getBudgetCostProjectManagePayAmount(project);
String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "支出时间", "支出金额(元)", "预估计算方法", "预估依据", "备注"}; String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "支出时间", "支出金额(元)", "预估计算方法", "预估依据", "备注"};
String[] columns4 = {"tempId", "type", "name", "detail", "unit", "amount", "price", "total", "payTime", "payAmount", "predictMethod", "predictWhy", "remark"}; String[] columns4 = {"tempId", "type", "name", "detail", "unit", "amount", "price", "total", "payTime", "payAmount", "predictMethod", "predictWhy", "remark"};
@ -1164,7 +1164,7 @@ public class ProjectController extends BaseController {
BudgetBean budgetBean = projectBudgetService.getBudget(project); BudgetBean budgetBean = projectBudgetService.getBudget(project);
//收入明细 //收入明细
List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project);
Integer incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project); BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project);
String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"};
String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"}; String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"};
exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream); exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream);
@ -1208,7 +1208,7 @@ public class ProjectController extends BaseController {
BudgetBean budgetBean = projectBudgetService.getBudget(project); BudgetBean budgetBean = projectBudgetService.getBudget(project);
//成本明细 //成本明细
List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project);
Integer costTotalAmount = projectBudgetService.getBudgetCostAmount(project); BigDecimal costTotalAmount = projectBudgetService.getBudgetCostAmount(project);
BigDecimal costUnderwrittenAmountTotal = projectBudgetService.getBudgetCostUnderwrittenAmountTotal(project); BigDecimal costUnderwrittenAmountTotal = projectBudgetService.getBudgetCostUnderwrittenAmountTotal(project);
BigDecimal costPayAmountTotal = projectBudgetService.getBudgetCostPayAmountTotal(project); BigDecimal costPayAmountTotal = projectBudgetService.getBudgetCostPayAmountTotal(project);
List<ProcurementType> procurementTypes = procurementTypeService.allProcurementTypeList(); List<ProcurementType> procurementTypes = procurementTypeService.allProcurementTypeList();
@ -1234,7 +1234,7 @@ public class ProjectController extends BaseController {
BudgetBean budgetBean = projectBudgetService.getBudget(project); BudgetBean budgetBean = projectBudgetService.getBudget(project);
//项目管理成本明细 //项目管理成本明细
List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project); List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project);
Integer costProjectManageTotalAmount = projectBudgetService.getBudgetCostProjectManageAmount(project); BigDecimal costProjectManageTotalAmount = projectBudgetService.getBudgetCostProjectManageAmount(project);
BigDecimal managePayAmountTotal = projectBudgetService.getBudgetCostProjectManagePayAmount(project); BigDecimal managePayAmountTotal = projectBudgetService.getBudgetCostProjectManagePayAmount(project);
String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "支出时间", "支出金额(元)", "预估计算方法", "预估依据", "备注"}; String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "支出时间", "支出金额(元)", "预估计算方法", "预估依据", "备注"};
String[] columns4 = {"tempId", "type", "name", "detail", "unit", "amount", "price", "total", "payTime", "payAmount", "predictMethod", "predictWhy", "remark"}; String[] columns4 = {"tempId", "type", "name", "detail", "unit", "amount", "price", "total", "payTime", "payAmount", "predictMethod", "predictWhy", "remark"};

8
src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailBase.java
View File

@ -30,7 +30,7 @@ public class ProjectBudgetCostDetailBase {
private String name; private String name;
private String unit; private String unit;
private int amount; private BigDecimal amount;
private BigDecimal price; private BigDecimal price;
@Column(name = "tax_rate") @Column(name = "tax_rate")
@ -106,11 +106,11 @@ public class ProjectBudgetCostDetailBase {
this.unit = unit; this.unit = unit;
} }
public int getAmount() { public BigDecimal getAmount() {
return amount; return amount;
} }
public void setAmount(int amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
@ -190,7 +190,7 @@ public class ProjectBudgetCostDetailBase {
if(null == price){ if(null == price){
return null; return null;
} }
return price.multiply(new BigDecimal(amount)); return price.multiply(amount);
} }
public BigDecimal getTotalTaxExclude(){ public BigDecimal getTotalTaxExclude(){
BigDecimal totalTaxInclude = getTotalTaxInclude(); BigDecimal totalTaxInclude = getTotalTaxInclude();

2
src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailRepository.java
View File

@ -10,7 +10,7 @@ public interface ProjectBudgetCostDetailRepository extends JpaRepository<Project
List<ProjectBudgetCostDetail> findAllByProjectIdEquals(int id); List<ProjectBudgetCostDetail> findAllByProjectIdEquals(int id);
@Query(value = "select sum(amount) from project_budget_cost_detail where project_id = ?1", nativeQuery = true) @Query(value = "select sum(amount) from project_budget_cost_detail where project_id = ?1", nativeQuery = true)
Integer findAmountByProject(int projectId); BigDecimal findAmountByProject(int projectId);
@Query(value = "select sum(pay_amount) from project_budget_cost_detail where project_id = ?1", nativeQuery = true) @Query(value = "select sum(pay_amount) from project_budget_cost_detail where project_id = ?1", nativeQuery = true)
BigDecimal findPayAmountByProject(int id); BigDecimal findPayAmountByProject(int id);

8
src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java
View File

@ -29,7 +29,7 @@ public class ProjectBudgetCostProjectManageDetailBase {
private String detail; private String detail;
private String unit; private String unit;
private int amount; private BigDecimal amount;
private BigDecimal price; private BigDecimal price;
@Column(name = "pay_time") @Column(name = "pay_time")
@ -96,11 +96,11 @@ public class ProjectBudgetCostProjectManageDetailBase {
this.unit = unit; this.unit = unit;
} }
public int getAmount() { public BigDecimal getAmount() {
return amount; return amount;
} }
public void setAmount(int amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
@ -164,7 +164,7 @@ public class ProjectBudgetCostProjectManageDetailBase {
if(null == price){ if(null == price){
return null; return null;
} }
return price.multiply(new BigDecimal(amount)); return price.multiply(amount);
} }
public int getDeletable() { public int getDeletable() {

2
src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailRepository.java
View File

@ -10,7 +10,7 @@ public interface ProjectBudgetCostProjectManageDetailRepository extends JpaRepos
List<ProjectBudgetCostProjectManageDetail> findAllByProjectIdEquals(int id); List<ProjectBudgetCostProjectManageDetail> findAllByProjectIdEquals(int id);
@Query(value = "select sum(amount) from project_budget_cost_project_manage_detail where project_id = ?1", nativeQuery = true) @Query(value = "select sum(amount) from project_budget_cost_project_manage_detail where project_id = ?1", nativeQuery = true)
Integer findAmountByProject(int id); BigDecimal findAmountByProject(int id);
@Query(value = "select sum(pay_amount) from project_budget_cost_project_manage_detail where project_id = ?1", nativeQuery = true) @Query(value = "select sum(pay_amount) from project_budget_cost_project_manage_detail where project_id = ?1", nativeQuery = true)
BigDecimal findPayAmountByProject(int id); BigDecimal findPayAmountByProject(int id);

8
src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java
View File

@ -27,7 +27,7 @@ public class ProjectBudgetIncomeDetailBase {
private String name; private String name;
private String unit; private String unit;
private int amount; private BigDecimal amount;
private BigDecimal price; private BigDecimal price;
@Column(name = "tax_rate") @Column(name = "tax_rate")
@ -73,11 +73,11 @@ public class ProjectBudgetIncomeDetailBase {
this.unit = unit; this.unit = unit;
} }
public int getAmount() { public BigDecimal getAmount() {
return amount; return amount;
} }
public void setAmount(int amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
@ -101,7 +101,7 @@ public class ProjectBudgetIncomeDetailBase {
if(null == price){ if(null == price){
return null; return null;
} }
return price.multiply(new BigDecimal(amount)); return price.multiply(amount);
} }
public BigDecimal getTotalTaxExclude(){ public BigDecimal getTotalTaxExclude(){
BigDecimal totalTaxInclude = getTotalTaxInclude(); BigDecimal totalTaxInclude = getTotalTaxInclude();

3
src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailRepository.java
View File

@ -3,11 +3,12 @@ package cn.palmte.work.model;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
public interface ProjectBudgetIncomeDetailRepository extends JpaRepository<ProjectBudgetIncomeDetail,Integer> { public interface ProjectBudgetIncomeDetailRepository extends JpaRepository<ProjectBudgetIncomeDetail,Integer> {
List<ProjectBudgetIncomeDetail> findAllByProjectIdEquals(int id); List<ProjectBudgetIncomeDetail> findAllByProjectIdEquals(int id);
@Query(value = "select sum(amount) from project_budget_income_detail where project_id = ?1", nativeQuery = true) @Query(value = "select sum(amount) from project_budget_income_detail where project_id = ?1", nativeQuery = true)
Integer findAmountByProject(int projectId); BigDecimal findAmountByProject(int projectId);
} }

12
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -391,7 +391,7 @@ public class ProjectBudgetService {
/** /**
* 获取项目的收入总数量 * 获取项目的收入总数量
*/ */
public Integer getBudgetIncomeAmount(Project project){ public BigDecimal getBudgetIncomeAmount(Project project){
return projectBudgetIncomeDetailRepository.findAmountByProject(project.getId()); return projectBudgetIncomeDetailRepository.findAmountByProject(project.getId());
} }
@ -500,7 +500,7 @@ public class ProjectBudgetService {
/** /**
* 获取项目的成本总数量 * 获取项目的成本总数量
*/ */
public Integer getBudgetCostAmount(Project project){ public BigDecimal getBudgetCostAmount(Project project){
return projectBudgetCostDetailRepository.findAmountByProject(project.getId()); return projectBudgetCostDetailRepository.findAmountByProject(project.getId());
} }
/** /**
@ -571,7 +571,7 @@ public class ProjectBudgetService {
/** /**
* 获取项目的项目管理总数量 * 获取项目的项目管理总数量
*/ */
public Integer getBudgetCostProjectManageAmount(Project project){ public BigDecimal getBudgetCostProjectManageAmount(Project project){
return projectBudgetCostProjectManageDetailRepository.findAmountByProject(project.getId()); return projectBudgetCostProjectManageDetailRepository.findAmountByProject(project.getId());
} }
/** /**
@ -588,7 +588,7 @@ public class ProjectBudgetService {
detail.setType(Integer.parseInt(split[0])); detail.setType(Integer.parseInt(split[0]));
detail.setName(split[1]); detail.setName(split[1]);
detail.setPrice(new BigDecimal(0)); detail.setPrice(new BigDecimal(0));
detail.setAmount(0); detail.setAmount(new BigDecimal(0));
detail.setDeletable(0); detail.setDeletable(0);
projectManageDetails.add(detail); projectManageDetails.add(detail);
} }
@ -1027,7 +1027,7 @@ public class ProjectBudgetService {
key = "数量"; key = "数量";
o1 = m.get(key); o1 = m.get(key);
if (o1 != null) { if (o1 != null) {
temp.setAmount(Integer.parseInt((String) o1)); temp.setAmount(new BigDecimal((String) o1));
} }
key = "单价"; key = "单价";
o1 = m.get(key); o1 = m.get(key);
@ -1126,7 +1126,7 @@ public class ProjectBudgetService {
key = "数量"; key = "数量";
o1 = m.get(key); o1 = m.get(key);
if (o1 != null) { if (o1 != null) {
temp.setAmount(Integer.parseInt((String) o1)); temp.setAmount(new BigDecimal((String) o1));
} }
key = "单价"; key = "单价";
o1 = m.get(key); o1 = m.get(key);

12
src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java
View File

@ -974,7 +974,7 @@ public class ExportExcelUtils {
out.close(); out.close();
} }
public void exportIncomeDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetIncomeDetail> budgetIncomeDetail, Integer incomeTotalAmount, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) { public void exportIncomeDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetIncomeDetail> budgetIncomeDetail, BigDecimal incomeTotalAmount, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) {
// 遍历集合数据，产生数据行 // 遍历集合数据，产生数据行
int index = rowIndex; int index = rowIndex;
XSSFSheet sheet = workbook.createSheet(sheetName); XSSFSheet sheet = workbook.createSheet(sheetName);
@ -1042,7 +1042,7 @@ public class ExportExcelUtils {
totalCell.setCellValue("总计"); totalCell.setCellValue("总计");
} else if (i == 4) { } else if (i == 4) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue((incomeTotalAmount == null) ? 0 : incomeTotalAmount); totalCell.setCellValue(Utils.format(incomeTotalAmount));
} else if (i == 7) { } else if (i == 7) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue(Utils.format(budgetBean.getIncomeTotalTaxInclude())); totalCell.setCellValue(Utils.format(budgetBean.getIncomeTotalTaxInclude()));
@ -1128,7 +1128,7 @@ public class ExportExcelUtils {
} }
} }
public void exportCostDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetCostDetail> budgetCostDetail, Integer costTotalAmount, BigDecimal costUnderwrittenAmountTotal, BigDecimal costPayAmountTotal, Map<Integer, String> procurementMap, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) { public void exportCostDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetCostDetail> budgetCostDetail, BigDecimal costTotalAmount, BigDecimal costUnderwrittenAmountTotal, BigDecimal costPayAmountTotal, Map<Integer, String> procurementMap, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) {
// 遍历集合数据，产生数据行 // 遍历集合数据，产生数据行
int index = rowIndex; int index = rowIndex;
XSSFSheet sheet = workbook.createSheet(sheetName); XSSFSheet sheet = workbook.createSheet(sheetName);
@ -1208,7 +1208,7 @@ public class ExportExcelUtils {
totalCell.setCellValue("总计"); totalCell.setCellValue("总计");
} else if (i == 5) { } else if (i == 5) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue((costTotalAmount == null) ? 0 : costTotalAmount); totalCell.setCellValue(Utils.format(costTotalAmount));
} else if (i == 8) { } else if (i == 8) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue(Utils.format(budgetBean.getCostPurchaseTotalTaxInclude())); totalCell.setCellValue(Utils.format(budgetBean.getCostPurchaseTotalTaxInclude()));
@ -1231,7 +1231,7 @@ public class ExportExcelUtils {
} }
} }
public void exportCostManageDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail, Integer costProjectManageTotalAmount, BigDecimal managePayAmountTotal, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) { public void exportCostManageDetailExcel(String[] headers, String[] columns, Project project, BudgetBean budgetBean, List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail, BigDecimal costProjectManageTotalAmount, BigDecimal managePayAmountTotal, String pattern, int rowIndex, String sheetName, ServletOutputStream outputStream) {
// 遍历集合数据，产生数据行 // 遍历集合数据，产生数据行
int index = rowIndex; int index = rowIndex;
XSSFSheet sheet = workbook.createSheet(sheetName); XSSFSheet sheet = workbook.createSheet(sheetName);
@ -1301,7 +1301,7 @@ public class ExportExcelUtils {
totalCell.setCellValue("总计"); totalCell.setCellValue("总计");
} else if (i == 5) { } else if (i == 5) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue((costProjectManageTotalAmount == null) ? 0 : costProjectManageTotalAmount); totalCell.setCellValue(Utils.format(costProjectManageTotalAmount));
} else if (i == 7) { } else if (i == 7) {
totalCell.setCellType(CellType.NUMERIC); totalCell.setCellType(CellType.NUMERIC);
totalCell.setCellValue(Utils.format(budgetBean.getCostProjectManageTaxExclude())); totalCell.setCellValue(Utils.format(budgetBean.getCostProjectManageTaxExclude()));