From d3d89c227474e6b523adb9e57933cbcbe5d46e80 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 7 Dec 2022 10:24:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 14 +++++++------- .../work/model/ProjectBudgetIncomeDetail.java | 2 +- .../model/ProjectBudgetIncomePlanDetail.java | 2 +- .../ProjectBudgetIncomePlanDetailTemp.java | 2 +- src/main/resources/sql/fourcal-purge.sql | 4 ++-- src/main/resources/sql/fourcal.sql | 4 ++-- .../static/assets/js/project_budget.js | 8 ++++---- .../static/assets/js/project_budget_income.js | 2 +- .../templates/admin/project_approve.ftl | 18 +++++++++--------- .../templates/admin/project_budget_edit.ftl | 8 ++++---- .../templates/admin/project_estimate_add.ftl | 4 ++-- .../templates/admin/project_estimate_edit.ftl | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 323ada4..71bea20 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -168,7 +168,7 @@ public class ProjectController extends BaseController { String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"}; - exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）基本信息", outputStream); + exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); // String[] headers1 = {"项目负责人", "预计合同签订时间", "项目计划招标时间", "是否二次合作", "直签", "主合同收款条款", "主合同具体解决方案", "计收计划"}; // String[] columns1 = {"principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"}; // exportExcelUtils.exportProjectExcel(headers1, columns1, project, "yyyy-MM-dd", 0, "项目立项（概算）其他信息", outputStream); @@ -196,7 +196,7 @@ public class ProjectController extends BaseController { } String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; 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); //收入计划 List budgetIncomePlanDetail = projectBudgetService.getBudgetIncomePlanDetail(project); BigDecimal incomePlanTotalReceiveAmount = projectBudgetService.getBudgetIncomePlanReceiveAmount(project); @@ -1047,7 +1047,7 @@ public class ProjectController extends BaseController { public void incomeTemplate(HttpServletResponse response) throws Exception{ String[] headers = new String[]{"类别", "名称", "单位", "数量", "单价", "税率(%)"}; - downloadHeader(response , Utils.generateExcelName("收款明细表批量导入模板")); + downloadHeader(response , Utils.generateExcelName("收入明细表批量导入模板")); ExportUtils exportUtils = new ExportUtils(headers); exportUtils.write(response.getOutputStream()); } @@ -1114,7 +1114,7 @@ public class ProjectController extends BaseController { @RequestMapping("/estimateMainExport") public void estimateMainExport(HttpServletResponse response, @RequestParam int id) throws Exception{ Project project = projectService.findById(id); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-项目立项（概算）基本信息")).getBytes(), StandardCharsets.ISO_8859_1))); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-项目立项（概算）信息")).getBytes(), StandardCharsets.ISO_8859_1))); response.setHeader("Connection", "close"); response.setHeader("Content-Type", "application/vnd.ms-excel"); ServletOutputStream outputStream = response.getOutputStream(); @@ -1125,7 +1125,7 @@ public class ProjectController extends BaseController { String[] columns0 = {"deptName", "projectNo", "name", "typeDesc", "startDate", "endDate", "underwrittenModeStr", "collaborator", "advanceInterestAmountRound", "advancePeakAmountRound", "contractRound", "grossProfitRound", "grossProfitMarginRound", "huazhiRound", "huizhiRound", "huasanRound", "ziguangRound", "certaintyStr", "industryScenario", "resolvePlanStr", "customer", "terminalCustomer", "valueRisk", "principal", "contractTime", "bidsTime", "isSecondStr", "signTypeStr", "mainContractCollectionTerms", "mainContractResolvePlan", "calculationCollection"}; - exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）基本信息", outputStream); + exportExcelUtils.exportProjectExcel(headers0, columns0, project, "yyyy-MM-dd", 0, "项目立项（概算）信息", outputStream); exportExcelUtils.end(outputStream); } @@ -1155,7 +1155,7 @@ public class ProjectController extends BaseController { @RequestMapping("/incomeExport") public void incomeExport(HttpServletResponse response, @RequestParam int id) throws Exception{ Project project = projectService.findById(id); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收款明细表")).getBytes(), StandardCharsets.ISO_8859_1))); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收入明细表")).getBytes(), StandardCharsets.ISO_8859_1))); response.setHeader("Connection", "close"); response.setHeader("Content-Type", "application/vnd.ms-excel"); ServletOutputStream outputStream = response.getOutputStream(); @@ -1166,7 +1166,7 @@ public class ProjectController extends BaseController { BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project); String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; 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); exportExcelUtils.end(outputStream); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java index 131e1b1..6882f88 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetail.java @@ -3,7 +3,7 @@ package cn.palmte.work.model; import javax.persistence.*; /** - * 项目预算收款明细表 + * 项目预算收入明细表 */ @Entity @Table(name = "project_budget_income_detail") diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java index a373f45..8a23619 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetail.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 项目预算收款明细表 + * 项目预算收入明细表 */ @Entity @Table(name = "project_budget_income_plan_detail") diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java index cbbfbac..4b47ae9 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomePlanDetailTemp.java @@ -4,7 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * 项目预算收款明细表 + * 项目预算收入明细表 */ @Entity @Table(name = "project_budget_income_plan_detail_temp") diff --git a/src/main/resources/sql/fourcal-purge.sql b/src/main/resources/sql/fourcal-purge.sql index a45cdf3..f9fe31e 100644 --- a/src/main/resources/sql/fourcal-purge.sql +++ b/src/main/resources/sql/fourcal-purge.sql @@ -5753,7 +5753,7 @@ CREATE TABLE `project_budget_income_detail` ( `price` decimal(16,2) NOT NULL COMMENT '单价', `tax_rate` decimal(16,2) NOT NULL COMMENT '税率', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表'; -- ---------------------------- -- Records of project_budget_income_detail @@ -5773,7 +5773,7 @@ CREATE TABLE `project_budget_income_detail_temp` ( `price` decimal(16,2) NOT NULL COMMENT '单价', `tax_rate` decimal(16,2) NOT NULL COMMENT '税率', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表'; -- ---------------------------- -- Records of project_budget_income_detail_temp diff --git a/src/main/resources/sql/fourcal.sql b/src/main/resources/sql/fourcal.sql index a47de97..bb9e5bc 100644 --- a/src/main/resources/sql/fourcal.sql +++ b/src/main/resources/sql/fourcal.sql @@ -8268,7 +8268,7 @@ CREATE TABLE `project_budget_income_detail` ( `price` decimal(16,2) NOT NULL COMMENT '单价', `tax_rate` decimal(16,2) NOT NULL COMMENT '税率', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表'; +) ENGINE=InnoDB AUTO_INCREMENT=711 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表'; -- ---------------------------- -- Records of project_budget_income_detail @@ -8393,7 +8393,7 @@ CREATE TABLE `project_budget_income_detail_temp` ( `price` decimal(16,2) NOT NULL COMMENT '单价', `tax_rate` decimal(16,2) NOT NULL COMMENT '税率', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收款明细表'; +) ENGINE=InnoDB AUTO_INCREMENT=701 DEFAULT CHARSET=utf8mb4 COMMENT='收入明细表'; -- ---------------------------- -- Records of project_budget_income_detail_temp diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 152e3ec..38d7778 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -92,12 +92,12 @@ $(function () { var dataIncome = collectData("am-modal-prompt-input-income"); if (dataIncome.length <= 0) { - window.confirm('请填写收款明细表'); + window.confirm('请填写收入明细表'); $("#saveDraft").attr('disabled', false); return; } - var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收款明细表"); + var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL2, "收入明细表"); if (dataIncomeCheck == null) { $("#saveDraft").attr('disabled', false); return; @@ -205,12 +205,12 @@ $(function () { var dataIncome = collectData("am-modal-prompt-input-income"); if (dataIncome.length <= 5) { - window.confirm('请填写收款明细表'); + window.confirm('请填写收入明细表'); $("#saveApprove").attr('disabled', false); return; } - var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收款明细表"); + var dataIncomeCheck = convertDetailVerifyCheck(dataIncome, INCOME_DETAIL, "收入明细表"); if (dataIncomeCheck == null) { $("#saveApprove").attr('disabled', false); return; diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js index 0cf7863..b535633 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -71,7 +71,7 @@ $(function () { }); }); -//保存收款明细表 +//保存收入明细表 $(function () { $("#incomeTableSave").click(function () { var data = collectData("am-modal-prompt-input-income"); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index ad2ba20..e244453 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -154,7 +154,7 @@
- <#-- 项目立项（概算）基本信息 展示内容 --> + <#-- 项目立项（概算）信息 展示内容 -->
class="am-tab-panel am-fade am-in am-active" <#else> class="am-tab-panel am-fade am-in" id="tab1"> @@ -192,7 +192,7 @@ - + @@ -405,7 +405,7 @@
- <#--收款明细表--> + <#--收入明细表-->
@@ -523,7 +523,7 @@
- <#--收款明细表--> + <#--收入明细表-->
@@ -1032,7 +1032,7 @@
项目立项（概算）基本信息项目立项（概算）信息
- <#--收款明细表 + <#--收入明细表 采购成本明细表 项目管理成本表 资金计划表--> @@ -2137,11 +2137,11 @@
- <#--收款明细表弹窗--> + <#--收入明细表弹窗-->
-
销售收款明细表——${project.name}
+
销售收入明细表——${project.name}
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index ec6c609..ce597bc 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -93,9 +93,9 @@
- + @@ -804,7 +804,7 @@
收入 - <#-- 收款明细表--> + <#-- 收入明细表-->
项目立项（概算）基本信息项目立项（概算）信息
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 3f5db75..dc87a67 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -39,7 +39,7 @@
@@ -49,7 +49,7 @@
- + diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 630bfde..573ce9b 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -44,7 +44,7 @@
@@ -53,7 +53,7 @@
项目立项（概算）基本信息项目立项（概算）信息
- + From 51e861db1071918e04dd90b86eba58f126b6baa7 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 7 Dec 2022 11:10:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E9=97=B4=E7=AE=A1=E7=90=86=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 16 +++++++-------- .../model/ProjectBudgetIncomeDetailBase.java | 20 +++++++++++++++++++ .../model/ProjectBudgetIncomeDetailTemp.java | 2 ++ .../work/service/ProjectBudgetService.java | 14 +++++++++---- .../static/assets/js/project_budget_cost.js | 8 ++++---- .../static/assets/js/project_budget_income.js | 6 ++++++ .../static/assets/js/project_budget_plan.js | 4 ++-- .../templates/admin/project_approve.ftl | 14 +++++++++++-- .../templates/admin/project_budget_edit.ftl | 10 ++++++++-- .../templates/common/space_pager.ftl | 3 ++- 10 files changed, 74 insertions(+), 23 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 71bea20..d2f1901 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -194,8 +194,8 @@ public class ProjectController extends BaseController { } else { incomeTaxRates = incomeTaxSb.toString(); } - String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; - String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"}; + String[] headers2 = {"序号", "类别", "名称", "规格类型", "参数", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; + String[] columns2 = {"tempId", "type", "name", "spec", "param", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"}; exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream); //收入计划 List budgetIncomePlanDetail = projectBudgetService.getBudgetIncomePlanDetail(project); @@ -224,7 +224,7 @@ public class ProjectController extends BaseController { } else { costTaxRates = costTaxSb.toString(); } - String[] headers3 = {"序号", "大类", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; + String[] headers3 = {"序号", "费用项目", "采购类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; String[] columns3 = {"tempId", "type", "category", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax", "contractParty", "isUnderwritten", "underwrittenAmount", "payTime", "payAmount", "payWay", "remark"}; exportExcelUtils.exportCostDetailExcel(headers3, columns3, project, budgetBean, budgetCostDetail, costTotalAmount, costUnderwrittenAmountTotal, costPayAmountTotal, procurementMap, "yyyy-MM-dd", 0, "采购成本明细表", outputStream); //项目管理成本明细 @@ -1046,7 +1046,7 @@ public class ProjectController extends BaseController { @RequestMapping("/incomeTemplate") public void incomeTemplate(HttpServletResponse response) throws Exception{ - String[] headers = new String[]{"类别", "名称", "单位", "数量", "单价", "税率(%)"}; + String[] headers = new String[]{"类别", "名称", "规格类型", "参数", "单位", "数量", "单价", "税率(%)"}; downloadHeader(response , Utils.generateExcelName("收入明细表批量导入模板")); ExportUtils exportUtils = new ExportUtils(headers); exportUtils.write(response.getOutputStream()); @@ -1081,7 +1081,7 @@ public class ProjectController extends BaseController { @RequestMapping("/costTemplate") public void costTemplate(HttpServletResponse response) throws Exception{ - String[] headers = new String[]{"大类", "类别", "名称", "单位", "数量", "单价", "税率(%)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; + String[] headers = new String[]{"费用项目", "采购类别", "名称", "单位", "数量", "单价", "税率(%)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; downloadHeader(response , Utils.generateExcelName("采购成本明细表批量导入模板")); ExportUtils exportUtils = new ExportUtils(headers); exportUtils.write(response.getOutputStream()); @@ -1164,8 +1164,8 @@ public class ProjectController extends BaseController { //收入明细 List budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); BigDecimal incomeTotalAmount = projectBudgetService.getBudgetIncomeAmount(project); - String[] headers2 = {"序号", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; - String[] columns2 = {"tempId", "type", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"}; + String[] headers2 = {"序号", "类别", "名称", "规格类型", "参数", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)"}; + String[] columns2 = {"tempId", "type", "name", "spec", "param", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax"}; exportExcelUtils.exportIncomeDetailExcel(headers2, columns2, project, budgetBean, budgetIncomeDetail, incomeTotalAmount, "yyyy-MM-dd", 0, "收入明细表", outputStream); exportExcelUtils.end(outputStream); @@ -1212,7 +1212,7 @@ public class ProjectController extends BaseController { BigDecimal costPayAmountTotal = projectBudgetService.getBudgetCostPayAmountTotal(project); List procurementTypes = procurementTypeService.allProcurementTypeList(); Map procurementMap = procurementTypes.stream().collect(Collectors.toMap(ProcurementType::getId, ProcurementType::getName)); - String[] headers3 = {"序号", "大类", "类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; + String[] headers3 = {"序号", "费用项目", "采购类别", "名称", "单位", "数量", "单价", "税率(%)", "含税总金额(元)", "不含税金额(元)", "税金(元)", "签约方", "是否垫资", "预估垫资金额(元)", "支出时间", "支出金额(元)", "付款方式", "备注"}; String[] columns3 = {"tempId", "type", "category", "name", "unit", "amount", "price", "taxRate", "totalTaxInclude", "totalTaxExclude", "totalTax", "contractParty", "isUnderwritten", "underwrittenAmount", "payTime", "payAmount", "payWay", "remark"}; exportExcelUtils.exportCostDetailExcel(headers3, columns3, project, budgetBean, budgetCostDetail, costTotalAmount, costUnderwrittenAmountTotal, costPayAmountTotal, procurementMap, "yyyy-MM-dd", 0, "采购成本明细表", outputStream); diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java index b8890e8..5760faf 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailBase.java @@ -26,6 +26,10 @@ public class ProjectBudgetIncomeDetailBase { private String name; + private String spec; + + private String param; + private String unit; private BigDecimal amount; private BigDecimal price; @@ -65,6 +69,22 @@ public class ProjectBudgetIncomeDetailBase { this.name = name; } + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getParam() { + return param; + } + + public void setParam(String param) { + this.param = param; + } + public String getUnit() { return unit; } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java index a4f7f88..d03a47c 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailTemp.java @@ -14,6 +14,8 @@ public class ProjectBudgetIncomeDetailTemp extends ProjectBudgetIncomeDetailBase projectBudgetIncomeDetail.setProjectId(getProjectId()); projectBudgetIncomeDetail.setName(getName()); projectBudgetIncomeDetail.setType(getType()); + projectBudgetIncomeDetail.setSpec(getSpec()); + projectBudgetIncomeDetail.setParam(getParam()); projectBudgetIncomeDetail.setUnit(getUnit()); projectBudgetIncomeDetail.setAmount(getAmount()); projectBudgetIncomeDetail.setPrice(getPrice()); diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 8921c10..851bb39 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -1070,6 +1070,12 @@ public class ProjectBudgetService { key = "名称"; o1 = m.get(key); temp.setName((String) o1); + key = "规格类型"; + o1 = m.get(key); + temp.setName((String) o1); + key = "参数"; + o1 = m.get(key); + temp.setName((String) o1); key = "单位"; o1 = m.get(key); temp.setUnit((String) o1); @@ -1130,7 +1136,7 @@ public class ProjectBudgetService { String key; Object o1; temp.setProjectId(id); - key = "大类"; + key = "费用项目"; o1 = m.get(key); String type = (String) o1; if ("设备".equals(type)) { @@ -1142,16 +1148,16 @@ public class ProjectBudgetService { } else if ("其他".equals(type)) { temp.setType(4); } else { - throw new Exception("该大类不存在"); + throw new Exception("该费用项目不存在"); } - key = "类别"; + key = "采购类别"; o1 = m.get(key); String category = (String) o1; ProcurementType procurementType = procurementTypeRepository.findByName(category); if (procurementType != null && procurementType.getType() == temp.getType()) { temp.setCategory(procurementType.getId()); } else { - throw new Exception("该类别不存在或者与大类不匹配"); + throw new Exception("该采购类别不存在或者与费用项目不匹配"); } key = "名称"; o1 = m.get(key); diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index b505764..cfb6ad0 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -4,8 +4,8 @@ //COST_DETAIL_ARR=["type","category","name","unit","amount","price","taxRate","totalTaxInclude","totalTaxExclude"]; COST_DETAIL2={ "num":[false,"序号","string"], - "type":[false,"大类","string"], - "category":[false,"类别","string"], + "type":[false,"费用项目","string"], + "category":[false,"采购类别","string"], "name":[false,"名称","string"], "unit":[false,"单位","string"], "amount":[false,"数量","number"], @@ -25,8 +25,8 @@ COST_DETAIL2={ COST_DETAIL={ "num":[false,"序号","string"], - "type":[true,"大类","string"], - "category":[true,"类别","string"], + "type":[true,"费用项目","string"], + "category":[true,"采购类别","string"], "name":[true,"名称","string"], "unit":[true,"单位","string"], "amount":[true,"数量","number"], diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js index b535633..5c606fe 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -6,6 +6,8 @@ INCOME_DETAIL2={ "num":[false,"序号","string"], "type":[false,"类别","string"], "name":[false,"名称","string"], + "spec":[false,"规格类型","string"], + "param":[false,"参数","string"], "unit":[false,"单位","string"], "amount":[false,"数量","number"], "price":[false,"单价","price"], @@ -19,6 +21,8 @@ INCOME_DETAIL={ "num":[false,"序号","string"], "type":[true,"类别","string"], "name":[true,"名称","string"], + "spec":[true,"规格类型","string"], + "param":[true,"参数","string"], "unit":[true,"单位","string"], "amount":[true,"数量","number"], "price":[true,"单价","price"], @@ -176,6 +180,8 @@ function appendTrIncome() { ' \n' + ' \n' + ' \n' + + ' \n' + + ' \n' + ' \n' + ' \n' + ' \n' + diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js index 39a31e6..2663df1 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -352,12 +352,12 @@ function verifyBudgetPlan(){ //从采购成本明细中取“设备”大类下的总计---设备支出 if(costPurchaseDeviceTaxInclude != input_total_device_cost_budget_plan){ - return "采购成本明细中取“设备”大类下的总计["+costPurchaseDeviceTaxInclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等"; + return "采购成本明细中取“设备”费用项目下的总计["+costPurchaseDeviceTaxInclude+"]与设备支出["+input_total_device_cost_budget_plan+"]不等"; } //从采购成本明细中取“服务+施工+其他”大类的总计---工程支出 var t = f2(f2(costPurchaseBuildTaxInclude)+f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude)); if(t != f2(input_total_engineer_cost_budget_plan)){ - return "采购成本明细中取“服务+施工+其他”大类的总计["+t+"]与工程支出["+input_total_engineer_cost_budget_plan+"]不等"; + return "采购成本明细中取“服务+施工+其他”费用项目的总计["+t+"]与工程支出["+input_total_engineer_cost_budget_plan+"]不等"; } //从项目管理成本取总计金额--经营性开支 if(costProjectManageTaxInclude != input_total_project_manage_budget_plan){ diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index e244453..2c59358 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -435,6 +435,8 @@ + + @@ -471,6 +473,12 @@ + + @@ -508,6 +516,8 @@ + + @@ -596,8 +606,8 @@ - - + + diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index ce597bc..56815fa 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -341,6 +341,8 @@ + + @@ -364,6 +366,8 @@ + + @@ -380,6 +384,8 @@ + + @@ -471,8 +477,8 @@ - - + + diff --git a/src/main/resources/templates/common/space_pager.ftl b/src/main/resources/templates/common/space_pager.ftl index 984b304..11c70f2 100644 --- a/src/main/resources/templates/common/space_pager.ftl +++ b/src/main/resources/templates/common/space_pager.ftl @@ -48,7 +48,8 @@ }); } } - }); + }); + $('#pager').prepend('
  • 共${(pager.totalRow)!10}条<\/a><\/li>'); From c594169b9e916b0efe4eb0ee819f32277b0e28cd Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 7 Dec 2022 15:58:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 14 ++ .../java/cn/palmte/work/model/Project.java | 22 +++ .../palmte/work/service/ProjectService.java | 19 +++ .../templates/admin/project_approve.ftl | 37 +++++ .../templates/admin/project_list.ftl | 140 +++++++++++++++++- .../templates/admin/project_list_approve.ftl | 2 +- 6 files changed, 232 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index d2f1901..cbad382 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -844,6 +844,14 @@ public class ProjectController extends BaseController { return "admin/project_select_role_user"; } + @ResponseBody + @RequestMapping("/info/{projectId}") + public ResponseMsg info(@PathVariable int projectId,Map model) { + Project project = projectService.getProject(projectId); + model.put("info",project); + return ResponseMsg.buildSuccessData(project); + } + /** * 获取当前所有的角色和角色下的用户，根据项目决定是否check */ @@ -1386,4 +1394,10 @@ public class ProjectController extends BaseController { return "admin/project_final_list"; } + + @ResponseBody + @RequestMapping("/stageRefreshSave/{projectId}") + public ResponseMsg stageRefreshSave(@RequestBody String json, @PathVariable int projectId) { + return projectService.stageRefreshSave(json,projectId); + } } diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 6c32f3f..0ee22b2 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -257,6 +257,12 @@ public class Project { @Column(name = "calculation_collection") private String calculationCollection; + @Column(name = "stage") + private Integer stage; + + @Column(name = "stage_remark") + private String stageRemark; + @Transient private String contractRound; @@ -1003,4 +1009,20 @@ public class Project { public void setRemark(String remark) { this.remark = remark; } + + public Integer getStage() { + return stage; + } + + public void setStage(Integer stage) { + this.stage = stage; + } + + public String getStageRemark() { + return stageRemark; + } + + public void setStageRemark(String stageRemark) { + this.stageRemark = stageRemark; + } } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index af65da6..6fe1798 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -112,6 +112,9 @@ public class ProjectService { } if(StrUtil.isNotEmpty(searchInfo.get("extend")) && "0".equals(searchInfo.get("extend"))) { + if (StrUtil.isNotEmpty(searchInfo.get("stage")) && !"-1".equals(searchInfo.get("stage"))) { + queryHelper.addCondition("p.stage=?", Integer.parseInt(searchInfo.get("stage"))); + } if (StrUtil.isNotEmpty(searchInfo.get("isSecond")) && !"-1".equals(searchInfo.get("isSecond"))) { queryHelper.addCondition("p.is_second=?", Integer.parseInt(searchInfo.get("isSecond"))); } @@ -895,4 +898,20 @@ public class ProjectService { } } + + public ResponseMsg stageRefreshSave(String json,int projectId) { + JSONObject obj = JSON.parseObject(json); + int stage = obj.getIntValue("stage"); + String stageRemark = obj.getString("stageRemark"); + + Project project = projectRepository.getOne(projectId); + if(null == project){ + return ResponseMsg.buildFailedMsg("项目不存在"); + } + + project.setStage(stage); + project.setStageRemark(stageRemark); + projectRepository.saveAndFlush(project); + return ResponseMsg.buildSuccessMsg("保存成功"); + } } diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 2c59358..7b5760f 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -395,6 +395,43 @@ >${project.calculationCollection!}
    • + + + + + + + +
    项目立项（概算）基本信息项目立项（概算）信息
    序号 类别 名称规格类型参数 单位 数量 单价 >
    序号大类类别费用项目采购类别 名称 单位 数量序号 类别 名称规格类型参数 单位 数量 单价 > >
    序号大类类别费用项目采购类别 名称 单位 数量
    项目阶段: + <#if project.stage??> + <#if (project.stage) =0> + + <#elseif (project.stage) =1> + + <#elseif (project.stage) =2> + + <#elseif (project.stage) =3> + + <#elseif (project.stage) =4> + + <#elseif (project.stage) =5> + + <#elseif (project.stage) =6> + + <#elseif (project.stage) =7> + + <#elseif (project.stage) =8> + + <#elseif (project.stage) =9> + + + <#else> + + +
    当前进度描述: + +
    <#-- 项目预算信息 展示内容 --> diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index a25d274..2be4fe9 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -176,7 +176,7 @@
    -
    项目状态
    +
    项目当前状态
    + + + + + + + + + + + + +
    +
    +
    <#-- 按钮 -->
    @@ -1027,6 +1048,10 @@ +
    @@ -1188,6 +1213,55 @@ + + <#--项目阶段更新弹窗--> + @@ -1315,6 +1389,8 @@ keywordsObj.otherStart = $("#otherStart").val(); if ($("#otherEnd").val()) keywordsObj.otherEnd = $("#otherEnd").val(); + if ($("#qstage").val()) + keywordsObj.stage = $("#qstage").val(); } if ($("#customer").val()) keywordsObj.customer = $("#customer").val(); @@ -1556,6 +1632,44 @@ }); }; + /** + * 项目阶段更新保存 + */ + var stageRefreshSave = function () { + var stage = $("#stage").val(); + console.info("=============="+stage); + var stageRemark = $("#stageRemark").val(); + var projectId = $("#stageProjectId").val(); + if (stage == '') { + layer.alert("请选择项目阶段"); + return; + } + if (stageRemark == '') { + layer.alert("请填写当前进度描述"); + return; + } + + var params = { + stage: stage, + stageRemark: stageRemark + }; + $.ajax({ + url: '${base}/project/stageRefreshSave/' + projectId, + data: JSON.stringify(params), + dataType: "json", + contentType: "application/json", + type: 'post', + async: false, + success: function (data) { + if (data.status == 0) { + layer.alert(data.msg); + window.location.href=window.location.href; + } else if (data.status == 1) { + layer.alert(data.msg); + } + } + }); + }; //上传会签单 var generateFileupload = function (name) { @@ -1687,6 +1801,30 @@ }); }; + var stageRefreshModal = function(id) { + $.ajax({ + url: "${base}/project/info/" + id, + dataType: "json", + contentType: "application/json", + type: 'post', + async: false, + success: function (data) { + $("#stage").val(data.data.stage); + $("#stageRemark").val(data.data.stageRemark); + } + }); + $("#stageProjectId").val(id); + $('#myModal4').modal({ + relatedElement: this, + onConfirm: function() { + console.log("提交"); + }, + onCancel: function() { + console.log("取消"); + } + }); + }; + var projectNoCheck = function () { var newProjectNo = $("#newProjectNo").val(); var id = $("#modelId").val(); diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index 6b9d0a6..00fcf42 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -173,7 +173,7 @@
    -
    项目状态
    +
    项目当前状态