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 14782a5..090a940 100644 --- a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java +++ b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java @@ -1,6 +1,7 @@ package cn.palmte.work.controller.backend; import cn.palmte.work.bean.ResponseMsg; +import cn.palmte.work.model.Project; import cn.palmte.work.model.SysConfig; import cn.palmte.work.model.SysConfigRepository; import cn.palmte.work.pojo.SysConfigRequest; @@ -37,4 +38,15 @@ public class SysConfigController extends BaseController{ return sysConfigService.saveOrUpdate(json); } + @RequestMapping("/checkRate") + @ResponseBody + public ResponseMsg checkRate() { + String value = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE).getValue(); + double rate = Double.parseDouble(value); + if (rate <= 0) { + return ResponseMsg.buildFailedMsg("项目年利率未填写或小于等于0,请联系管理员配置"); + } + return ResponseMsg.buildSuccessMsg("成功"); + } + } diff --git a/src/main/java/cn/palmte/work/service/SysConfigService.java b/src/main/java/cn/palmte/work/service/SysConfigService.java index c905c81..85bfce1 100644 --- a/src/main/java/cn/palmte/work/service/SysConfigService.java +++ b/src/main/java/cn/palmte/work/service/SysConfigService.java @@ -22,6 +22,13 @@ public class SysConfigService { public ResponseMsg saveOrUpdate(String json) { JSONObject obj = JSON.parseObject(json); + + double rate = Double.parseDouble(obj.getString("underwrittenTaxRate")); + + if(rate <= 0){ + return ResponseMsg.buildFailedMsg("项目年利率应大于0"); + } + SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE); underwrittenTaxRate.setValue(obj.getString("underwrittenTaxRate")); underwrittenTaxRate.setUpdateTime(new Date()); 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 a31b679..36660f7 100644 --- a/src/main/resources/templates/admin/profit_marfin_config_input.ftl +++ b/src/main/resources/templates/admin/profit_marfin_config_input.ftl @@ -33,7 +33,7 @@ data-validate-async data-validation-message="请输入项目贡献利润率阀值" type="number" id="projectContributionProfitRateThreshold" value="${projectContributionProfitRateThreshold!}" minlength="1" step="0.01" - oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')" + <#--oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')"--> maxlength="10" placeholder="请输入项目贡献利润率阀值" required/> % 注:请注意保留小数点后两位
@@ -48,7 +48,7 @@ data-validate-async data-validation-message="请输入项目年利率" type="number" id="underwrittenTaxRate" value="${underwrittenTaxRate!}" minlength="1" step="0.01" - oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')" + <#--oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')"--> maxlength="10" placeholder="请输入项目年利率" required/> % 注:请注意保留小数点后两位
@@ -93,7 +93,7 @@ alert("配置成功"); window.location.href = window.location.href; } else if (data.status == 1) { - alert("配置失败"); + alert(data.msg); } } }); diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index fbbbfff..aa44bf7 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -440,6 +440,7 @@