diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java index bc223a1..c6eb4f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/ZcRentCarRuleController.java @@ -121,7 +121,7 @@ public class ZcRentCarRuleController extends BaseController .toArray(String[]::new); List batteyRuleList = zcRentBatteyRuleService.selectZcRentBatteyRuleByIds(stringArray); for (ZcRentBatteyRule batteyRule : batteyRuleList) { - if(!String.valueOf(batteyRule.getDuration()).equals(String.valueOf(zcRentCarRule.getRentalDays()))){ + if(!String.valueOf(batteyRule.getDuration()*30).equals(String.valueOf(zcRentCarRule.getRentalDays()))){ return error("选择租电套餐的租赁天数与租车套餐的租赁天数不一致。"); } } diff --git a/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/add.html b/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/add.html index 785e115..ac615fb 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/rentCarRule/add.html @@ -167,8 +167,12 @@ $.modal.alert("未找到与租赁类型相同的租电套餐"); } data.forEach(function(rule) { - html += `
`; - }); + if(newRentalType === '3'){ + html += `
`; + }else{ + html += `
`; + } + }); $('#batteryRuleList').html(html); }); }