diff --git a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java index ec26bfe..14782a5 100644 --- a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java +++ b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java @@ -1,12 +1,15 @@ package cn.palmte.work.controller.backend; +import cn.palmte.work.bean.ResponseMsg; import cn.palmte.work.model.SysConfig; import cn.palmte.work.model.SysConfigRepository; import cn.palmte.work.pojo.SysConfigRequest; import cn.palmte.work.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import java.util.Map; @@ -28,10 +31,10 @@ public class SysConfigController extends BaseController{ return "admin/profit_marfin_config_input"; } + @ResponseBody @RequestMapping("/save") - public String save(SysConfigRequest sysConfigRequest, Map model) { - sysConfigService.saveOrUpdate(sysConfigRequest); - return "redirect:/sys/config/edit"; + public ResponseMsg save(@RequestBody String json) { + return sysConfigService.saveOrUpdate(json); } } diff --git a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java index efa84c5..69fd860 100644 --- a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java +++ b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java @@ -52,27 +52,32 @@ public class ProjectFinalSevice { @Autowired private ProjectInstanceService projectInstanceService; + @Autowired + private ProjectSettleService projectSettleService; + @Transactional public void save(Project project, FinalBean finalBean) { //预算表数据 EstimateBean estimate = projectEstimateService.getEstimate(project); //概算表数据 BudgetBean budget = projectBudgetService.getBudget(project); + + FormerBean settle = projectSettleService.getCurrentSettle(project, null); //现金流量表数据 List projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project); CashFlowBean cashFlowBean = projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails); //保存项目决算收入信息 - saveProjectFinalIncome(project,finalBean,estimate,budget); + saveProjectFinalIncome(project,finalBean,estimate,budget,settle); //保存项目决算成本信息 - saveProjectFinalCost(project,finalBean,estimate,budget); + saveProjectFinalCost(project,finalBean,estimate,budget,settle); //保存项目结算管理成本信息 - saveProjectFinalCostManage(project,finalBean,estimate,budget); + saveProjectFinalCostManage(project,finalBean,estimate,budget,settle); //保存项目结算现金流量信息 - saveProjectFinalCashFlux(project,finalBean,cashFlowBean); + saveProjectFinalCashFlux(project,finalBean,cashFlowBean,settle); projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT); @@ -80,6 +85,7 @@ public class ProjectFinalSevice { @Transactional public void saveAndApprove(Project project, FinalBean finalBean) throws Exception { + FormerBean settle = projectSettleService.getCurrentSettle(project, null); //预算表数据 EstimateBean estimate = projectEstimateService.getEstimate(project); //概算表数据 @@ -89,16 +95,16 @@ public class ProjectFinalSevice { CashFlowBean cashFlowBean = projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails); //保存项目决算收入信息 - saveProjectFinalIncome(project,finalBean,estimate,budget); + saveProjectFinalIncome(project,finalBean,estimate,budget,settle); //保存项目决算成本信息 - saveProjectFinalCost(project,finalBean,estimate,budget); + saveProjectFinalCost(project,finalBean,estimate,budget,settle); //保存项目结算管理成本信息 - saveProjectFinalCostManage(project,finalBean,estimate,budget); + saveProjectFinalCostManage(project,finalBean,estimate,budget,settle); //保存项目结算现金流量信息 - saveProjectFinalCashFlux(project,finalBean,cashFlowBean); + saveProjectFinalCashFlux(project,finalBean,cashFlowBean,settle); //更新项目和审批状态 projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING); @@ -107,13 +113,13 @@ public class ProjectFinalSevice { } - public void saveProjectFinalCostManage(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget){ + public void saveProjectFinalCostManage(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle){ ProjectFinalCostManage expropriationManage = new ProjectFinalCostManage(); expropriationManage.setProjectId(project.getId()); expropriationManage.setType(ProjectFinalCostManage.TYPE_EXPROPRIATION); expropriationManage.setEstimateTotalManageCost(estimate.getCostExpropriationTaxExclude()); expropriationManage.setBudgetTotalManageCost(budget.getCostExpropriationTaxExclude()); - expropriationManage.setSettleTotalManageCost(new BigDecimal(0)); + expropriationManage.setSettleTotalManageCost(settle.getCostExpropriationTaxExclude()); expropriationManage.setFinalTotalManageCost(finalBean.getCostExpropriationFinalTotal()); projectFinalCostManageRepository.saveAndFlush(expropriationManage); @@ -122,7 +128,7 @@ public class ProjectFinalSevice { companyManage.setType(ProjectFinalCostManage.TYPE_COMPANY_MANAGE); companyManage.setEstimateTotalManageCost(estimate.getCostCompanyManageTaxExclude()); companyManage.setBudgetTotalManageCost(budget.getCostCompanyManageTaxExclude()); - companyManage.setSettleTotalManageCost(new BigDecimal(0)); + companyManage.setSettleTotalManageCost(settle.getCostCompanyManageTaxExclude()); companyManage.setFinalTotalManageCost(finalBean.getCostCompanyManageFinalTotal()); projectFinalCostManageRepository.saveAndFlush(companyManage); @@ -135,13 +141,13 @@ public class ProjectFinalSevice { } - private void saveProjectFinalIncome(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget) { + private void saveProjectFinalIncome(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle) { ProjectFinalIncome projectFinalIncomeDevice = new ProjectFinalIncome(); projectFinalIncomeDevice.setProjectId(project.getId()); projectFinalIncomeDevice.setType(ProjectFinalIncome.TYPE_DEVICE); projectFinalIncomeDevice.setEstimateTotalIncome(estimate.getIncomeDeviceTaxExclude()); projectFinalIncomeDevice.setBudgetTotalIncome(budget.getIncomeDeviceTaxExclude()); - projectFinalIncomeDevice.setSettleTotalIncome(new BigDecimal(0)); + projectFinalIncomeDevice.setSettleTotalIncome(settle.getIncomeDeviceTaxExclude()); projectFinalIncomeDevice.setFinalTotalIncome(finalBean.getIncomeDeviceFinalTotal()); projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeDevice); @@ -150,7 +156,7 @@ public class ProjectFinalSevice { projectFinalIncomeEngineer.setType(ProjectFinalIncome.TYPE_ENGINEER); projectFinalIncomeEngineer.setEstimateTotalIncome(estimate.getIncomeEngineerTaxExclude()); projectFinalIncomeEngineer.setBudgetTotalIncome(budget.getIncomeEngineerTaxExclude()); - projectFinalIncomeEngineer.setSettleTotalIncome(new BigDecimal(0)); + projectFinalIncomeEngineer.setSettleTotalIncome(settle.getIncomeEngineerTaxExclude()); projectFinalIncomeEngineer.setFinalTotalIncome(finalBean.getIncomeEngineerFinalTotal()); projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeEngineer); @@ -159,19 +165,19 @@ public class ProjectFinalSevice { projectFinalIncomeService.setType(ProjectFinalIncome.TYPE_SERVICE); projectFinalIncomeService.setEstimateTotalIncome(estimate.getIncomeServiceTaxExclude()); projectFinalIncomeService.setBudgetTotalIncome(budget.getIncomeServiceTaxExclude()); - projectFinalIncomeService.setSettleTotalIncome(new BigDecimal(0)); + projectFinalIncomeService.setSettleTotalIncome(settle.getIncomeServiceTaxExclude()); projectFinalIncomeService.setFinalTotalIncome(finalBean.getIncomeServiceFinalTotal()); projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeService); } - public void saveProjectFinalCost(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget){ + public void saveProjectFinalCost(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle){ ProjectFinalCost projectFinalCostDevice = new ProjectFinalCost(); projectFinalCostDevice.setProjectId(project.getId()); projectFinalCostDevice.setFee(ProjectFinalCost.FEE_PURCHASE); projectFinalCostDevice.setType(ProjectFinalCost.TYPE_DEVICE); projectFinalCostDevice.setEstimateTotalCost(estimate.getCostPurchaseDeviceTaxExclude()); projectFinalCostDevice.setBudgetTotalCost(budget.getCostPurchaseDeviceTaxExclude()); - projectFinalCostDevice.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostDevice.setSettleTotalCost(settle.getCostPurchaseDeviceTaxExclude()); projectFinalCostDevice.setFinalTotalCost(finalBean.getCostPurchaseDeviceFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostDevice); @@ -182,7 +188,7 @@ public class ProjectFinalSevice { projectFinalCostBuild.setType(ProjectFinalCost.TYPE_BUILDING); projectFinalCostBuild.setEstimateTotalCost(estimate.getCostPurchaseBuildTaxExclude()); projectFinalCostBuild.setBudgetTotalCost(budget.getCostPurchaseBuildTaxExclude()); - projectFinalCostBuild.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostBuild.setSettleTotalCost(settle.getCostPurchaseBuildTaxExclude()); projectFinalCostBuild.setFinalTotalCost(finalBean.getCostPurchaseBuildFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostBuild); @@ -192,7 +198,7 @@ public class ProjectFinalSevice { projectFinalCostService.setType(ProjectFinalCost.TYPE_SERVICE); projectFinalCostService.setEstimateTotalCost(estimate.getCostPurchaseServiceTaxExclude()); projectFinalCostService.setBudgetTotalCost(budget.getCostPurchaseServiceTaxExclude()); - projectFinalCostService.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostService.setSettleTotalCost(settle.getCostPurchaseServiceTaxExclude()); projectFinalCostService.setFinalTotalCost(finalBean.getCostPurchaseServiceFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostService); @@ -202,7 +208,7 @@ public class ProjectFinalSevice { projectFinalCostOther.setType(ProjectFinalCost.TYPE_OTHER); projectFinalCostOther.setEstimateTotalCost(estimate.getCostPurchaseOtherTaxExclude()); projectFinalCostOther.setBudgetTotalCost(budget.getCostPurchaseOtherTaxExclude()); - projectFinalCostOther.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostOther.setSettleTotalCost(settle.getCostPurchaseOtherTaxExclude()); projectFinalCostOther.setFinalTotalCost(finalBean.getCostPurchaseOtherFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostOther); @@ -212,7 +218,7 @@ public class ProjectFinalSevice { projectFinalCostProject.setType(ProjectFinalCost.TYPE_PROJECT_MANAGE); projectFinalCostProject.setEstimateTotalCost(estimate.getCostProjectManageTaxExclude()); projectFinalCostProject.setBudgetTotalCost(budget.getCostProjectManageTaxExclude()); - projectFinalCostProject.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostProject.setSettleTotalCost(settle.getCostProjectManageTaxExclude()); projectFinalCostProject.setFinalTotalCost(finalBean.getCostProjectManageFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostProject); @@ -222,19 +228,19 @@ public class ProjectFinalSevice { projectFinalCostOtherOther.setType(ProjectFinalCost.TYPE_OTHER_OTHER); projectFinalCostOtherOther.setEstimateTotalCost(estimate.getCostOtherOtherTaxExclude()); projectFinalCostOtherOther.setBudgetTotalCost(budget.getCostOtherOtherTaxExclude()); - projectFinalCostOtherOther.setSettleTotalCost(new BigDecimal(0)); + projectFinalCostOtherOther.setSettleTotalCost(settle.getCostOtherOtherTaxExclude()); projectFinalCostOtherOther.setFinalTotalCost(finalBean.getCostOtherFinalTotal()); projectFinalCostRepository.saveAndFlush(projectFinalCostOtherOther); } - public void saveProjectFinalCashFlux(Project project, FinalBean finalBean, CashFlowBean cashFlowBean) { + public void saveProjectFinalCashFlux(Project project, FinalBean finalBean, CashFlowBean cashFlowBean,FormerBean settle) { List list = new ArrayList<>(); ProjectFinalCashFlux projectFinalCashFlux1 = new ProjectFinalCashFlux(); projectFinalCashFlux1.setProjectId(project.getId()); projectFinalCashFlux1.setType(ProjectFinalCashFlux.TYPE1); projectFinalCashFlux1.setBudgetTotalCashFlux(cashFlowBean.getSaleIncomeCash()); - projectFinalCashFlux1.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux1.setSettleTotalCashFlux(settle.getSaleIncomeCash()); projectFinalCashFlux1.setFinalTotalCashFlux(finalBean.getSaleIncomeCash()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux1); @@ -242,7 +248,7 @@ public class ProjectFinalSevice { projectFinalCashFlux2.setProjectId(project.getId()); projectFinalCashFlux2.setType(ProjectFinalCashFlux.TYPE2); projectFinalCashFlux2.setBudgetTotalCashFlux(cashFlowBean.getTaxReturn()); - projectFinalCashFlux2.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux2.setSettleTotalCashFlux(settle.getTaxReturn()); projectFinalCashFlux2.setFinalTotalCashFlux(finalBean.getTaxReturn()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux2); @@ -250,7 +256,7 @@ public class ProjectFinalSevice { projectFinalCashFlux3.setProjectId(project.getId()); projectFinalCashFlux3.setType(ProjectFinalCashFlux.TYPE3); projectFinalCashFlux3.setBudgetTotalCashFlux(cashFlowBean.getEarnestMoneyIncome()); - projectFinalCashFlux3.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux3.setSettleTotalCashFlux(settle.getEarnestMoneyIncome()); projectFinalCashFlux3.setFinalTotalCashFlux(finalBean.getEarnestMoneyIncome()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux3); @@ -258,7 +264,7 @@ public class ProjectFinalSevice { projectFinalCashFlux4.setProjectId(project.getId()); projectFinalCashFlux4.setType(ProjectFinalCashFlux.TYPE4); projectFinalCashFlux4.setBudgetTotalCashFlux(cashFlowBean.getPurchaseCost()); - projectFinalCashFlux4.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux4.setSettleTotalCashFlux(settle.getPurchaseCost()); projectFinalCashFlux4.setFinalTotalCashFlux(finalBean.getPurchaseCost()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux4); @@ -266,7 +272,7 @@ public class ProjectFinalSevice { projectFinalCashFlux5.setProjectId(project.getId()); projectFinalCashFlux5.setType(ProjectFinalCashFlux.TYPE5); projectFinalCashFlux5.setBudgetTotalCashFlux(cashFlowBean.getTaxCost()); - projectFinalCashFlux5.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux5.setSettleTotalCashFlux(settle.getTaxCost()); projectFinalCashFlux5.setFinalTotalCashFlux(finalBean.getTaxCost()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux5); @@ -274,7 +280,7 @@ public class ProjectFinalSevice { projectFinalCashFlux6.setProjectId(project.getId()); projectFinalCashFlux6.setType(ProjectFinalCashFlux.TYPE6); projectFinalCashFlux6.setBudgetTotalCashFlux(cashFlowBean.getEarnestMoneyCost()); - projectFinalCashFlux6.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux6.setSettleTotalCashFlux(settle.getEarnestMoneyCost()); projectFinalCashFlux6.setFinalTotalCashFlux(finalBean.getEarnestMoneyCost()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux6); @@ -282,7 +288,7 @@ public class ProjectFinalSevice { projectFinalCashFlux7.setProjectId(project.getId()); projectFinalCashFlux7.setType(ProjectFinalCashFlux.TYPE7); projectFinalCashFlux7.setBudgetTotalCashFlux(cashFlowBean.getNetCashFlow()); - projectFinalCashFlux7.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux7.setSettleTotalCashFlux(settle.getNetCashFlow()); projectFinalCashFlux7.setFinalTotalCashFlux(finalBean.getNetCashFlow()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux7); @@ -290,7 +296,7 @@ public class ProjectFinalSevice { projectFinalCashFlux8.setProjectId(project.getId()); projectFinalCashFlux8.setType(ProjectFinalCashFlux.TYPE8); projectFinalCashFlux8.setBudgetTotalCashFlux(cashFlowBean.getCashInflowFromInvestingActivities()); - projectFinalCashFlux8.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux8.setSettleTotalCashFlux(settle.getCashInflowFromInvestingActivities()); projectFinalCashFlux8.setFinalTotalCashFlux(finalBean.getCashInflowFromInvestingActivities()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux8); @@ -298,7 +304,7 @@ public class ProjectFinalSevice { projectFinalCashFlux9.setProjectId(project.getId()); projectFinalCashFlux9.setType(ProjectFinalCashFlux.TYPE9); projectFinalCashFlux9.setBudgetTotalCashFlux(cashFlowBean.getCashOutflowFromInvestingActivities()); - projectFinalCashFlux9.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux9.setSettleTotalCashFlux(settle.getCashOutflowFromInvestingActivities()); projectFinalCashFlux9.setFinalTotalCashFlux(finalBean.getCashOutflowFromInvestingActivities()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux9); @@ -306,7 +312,7 @@ public class ProjectFinalSevice { projectFinalCashFlux10.setProjectId(project.getId()); projectFinalCashFlux10.setType(ProjectFinalCashFlux.TYPE10); projectFinalCashFlux10.setBudgetTotalCashFlux(cashFlowBean.getNetCashFromInvestingActivities()); - projectFinalCashFlux10.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux10.setSettleTotalCashFlux(settle.getNetCashFromInvestingActivities()); projectFinalCashFlux10.setFinalTotalCashFlux(finalBean.getNetCashFromInvestingActivities()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux10); @@ -314,7 +320,7 @@ public class ProjectFinalSevice { projectFinalCashFlux11.setProjectId(project.getId()); projectFinalCashFlux11.setType(ProjectFinalCashFlux.TYPE11); projectFinalCashFlux11.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalInflow()); - projectFinalCashFlux11.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux11.setSettleTotalCashFlux(settle.getFinancingCapitalInflow()); projectFinalCashFlux11.setFinalTotalCashFlux(finalBean.getFinancingCapitalInflow()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux11); @@ -322,7 +328,7 @@ public class ProjectFinalSevice { projectFinalCashFlux12.setProjectId(project.getId()); projectFinalCashFlux12.setType(ProjectFinalCashFlux.TYPE12); projectFinalCashFlux12.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalOutflow()); - projectFinalCashFlux12.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux12.setSettleTotalCashFlux(settle.getFinancingCapitalOutflow()); projectFinalCashFlux12.setFinalTotalCashFlux(finalBean.getFinancingCapitalOutflow()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux12); @@ -330,7 +336,7 @@ public class ProjectFinalSevice { projectFinalCashFlux13.setProjectId(project.getId()); projectFinalCashFlux13.setType(ProjectFinalCashFlux.TYPE13); projectFinalCashFlux13.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalCashflow()); - projectFinalCashFlux13.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux13.setSettleTotalCashFlux(settle.getFinancingCapitalCashflow()); projectFinalCashFlux13.setFinalTotalCashFlux(finalBean.getFinancingCapitalCashflow()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux13); @@ -338,7 +344,7 @@ public class ProjectFinalSevice { projectFinalCashFlux14.setProjectId(project.getId()); projectFinalCashFlux14.setType(ProjectFinalCashFlux.TYPE14); projectFinalCashFlux14.setBudgetTotalCashFlux(cashFlowBean.getNetIncreaseMonetaryFunds()); - projectFinalCashFlux14.setFinalTotalCashFlux(new BigDecimal(0)); + projectFinalCashFlux14.setSettleTotalCashFlux(settle.getNetIncreaseMonetaryFunds()); projectFinalCashFlux14.setFinalTotalCashFlux(finalBean.getNetIncreaseMonetaryFunds()); projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux14); diff --git a/src/main/java/cn/palmte/work/service/SysConfigService.java b/src/main/java/cn/palmte/work/service/SysConfigService.java index 4e54c84..c905c81 100644 --- a/src/main/java/cn/palmte/work/service/SysConfigService.java +++ b/src/main/java/cn/palmte/work/service/SysConfigService.java @@ -1,9 +1,12 @@ package cn.palmte.work.service; import cn.palmte.work.bean.ProjectConfigBean; +import cn.palmte.work.bean.ResponseMsg; import cn.palmte.work.model.SysConfig; import cn.palmte.work.model.SysConfigRepository; import cn.palmte.work.pojo.SysConfigRequest; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,16 +20,18 @@ public class SysConfigService { private SysConfigRepository sysConfigRepository; - public void saveOrUpdate(SysConfigRequest sysConfigRequest) { + public ResponseMsg saveOrUpdate(String json) { + JSONObject obj = JSON.parseObject(json); SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE); - underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate()); + underwrittenTaxRate.setValue(obj.getString("underwrittenTaxRate")); underwrittenTaxRate.setUpdateTime(new Date()); sysConfigRepository.saveAndFlush(underwrittenTaxRate); SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD); - projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold()); + projectContributionProfitRateThreshold.setValue(obj.getString("projectContributionProfitRateThreshold")); projectContributionProfitRateThreshold.setUpdateTime(new Date()); sysConfigRepository.saveAndFlush(projectContributionProfitRateThreshold); + return ResponseMsg.buildSuccessMsg("配置成功"); } public BigDecimal getUnderwrittenTaxRate(){ diff --git a/src/main/resources/templates/admin/profit_marfin_config_input.ftl b/src/main/resources/templates/admin/profit_marfin_config_input.ftl index b81f1ad..a31b679 100644 --- a/src/main/resources/templates/admin/profit_marfin_config_input.ftl +++ b/src/main/resources/templates/admin/profit_marfin_config_input.ftl @@ -59,7 +59,7 @@
- + <#----> @@ -74,6 +74,31 @@ var urlBase = "${base}"; var url; + var submit_function = function () { + var projectContributionProfitRateThreshold = $("#projectContributionProfitRateThreshold").val(); + var underwrittenTaxRate = $("#underwrittenTaxRate").val(); + var params = { + projectContributionProfitRateThreshold: projectContributionProfitRateThreshold, + underwrittenTaxRate: underwrittenTaxRate + }; + $.ajax({ + url: '${base}/sys/config/save', + data: JSON.stringify(params), + dataType: "json", + contentType: "application/json", + type: 'post', + async: false, + success: function (data) { + if (data.status == 0) { + alert("配置成功"); + window.location.href = window.location.href; + } else if (data.status == 1) { + alert("配置失败"); + } + } + }); + } + $(function () { /*表单验证：begin*/ //自定义规则，用法：验证元素上加class="js-pattern-sort" diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl index 5bceb38..69fd1d7 100644 --- a/src/main/resources/templates/admin/project_final_add.ftl +++ b/src/main/resources/templates/admin/project_final_add.ftl @@ -25,7 +25,7 @@
项目决算表 / ${project.name}
-
+
    @@ -51,7 +51,7 @@ - + 收入 @@ -59,7 +59,7 @@ - + 收入 @@ -67,7 +67,7 @@ - + 合计 @@ -98,7 +98,7 @@ - + 成本 @@ -107,7 +107,7 @@ - + 成本 @@ -116,7 +116,7 @@ - + 成本 @@ -125,7 +125,7 @@ - + 成本 @@ -134,7 +134,7 @@ - + 成本 @@ -143,7 +143,7 @@ - + 合计 @@ -173,7 +173,7 @@ - + 公司管理费用 @@ -181,7 +181,7 @@ - + 所得税费用 @@ -189,7 +189,7 @@ / / - + 合计 @@ -253,37 +253,37 @@ 销售商品、提供劳务收到的现金 - + 收到的税费返还 / - + 收到其他与经营活动有关的现金 - + 购买商品、接受劳务支付的现金 - + 支付的各项税费 / - + 支付其他与经营活动有关的现金 - + 经营活动产生的现金流量净额 @@ -295,13 +295,13 @@ 投资活动现金流入 / - + 投资活动现金流出 / - + 投资活动产生的现金流量净额 @@ -313,13 +313,13 @@ 融资资金流入 - + 还款资金流出 - + 筹资活动产生的现金流量净额 diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl index 823972c..f743a9d 100644 --- a/src/main/resources/templates/admin/project_final_edit.ftl +++ b/src/main/resources/templates/admin/project_final_edit.ftl @@ -25,7 +25,7 @@
    项目决算表 / ${project.name}
- +
    @@ -51,7 +51,7 @@ - + 收入 @@ -59,7 +59,7 @@ - + 收入 @@ -67,7 +67,7 @@ - + 合计 @@ -98,7 +98,7 @@ - + 成本 @@ -107,7 +107,7 @@ - + 成本 @@ -116,7 +116,7 @@ - + 成本 @@ -125,7 +125,7 @@ - + 成本 @@ -134,7 +134,7 @@ - + 成本 @@ -143,7 +143,7 @@ - + 合计 @@ -173,7 +173,7 @@ - + 公司管理费用 @@ -181,7 +181,7 @@ - + 所得税费用 @@ -189,7 +189,7 @@ / / - + 合计 @@ -253,37 +253,37 @@ 销售商品、提供劳务收到的现金 - + 收到的税费返还 / - + 收到其他与经营活动有关的现金 - + 购买商品、接受劳务支付的现金 - + 支付的各项税费 / - + 支付其他与经营活动有关的现金 - + 经营活动产生的现金流量净额 @@ -295,13 +295,13 @@ 投资活动现金流入 / - + 投资活动现金流出 / - + 投资活动产生的现金流量净额 @@ -313,13 +313,13 @@ 融资资金流入 - + 还款资金流出 - + 筹资活动产生的现金流量净额 diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl index d313c1b..6659bcd 100644 --- a/src/main/resources/templates/admin/project_list_approve.ftl +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -195,7 +195,7 @@