From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

---
 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java
index 5bca024..c4e3d52 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCharteredServiceController.java
@@ -153,6 +153,21 @@
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(TCharteredService charteredService) {
+        String priceRule = charteredService.getPriceRule();
+        priceRule = priceRule.replaceAll("& lt;", "<");
+        priceRule = priceRule.replaceAll("& gt;", ">");
+        priceRule = priceRule.replaceAll("& #40;", "(");
+        priceRule = priceRule.replaceAll("& #41;", ")");
+        charteredService.setPriceRule(priceRule);
+
+        String cancelRule = charteredService.getCancelRule();
+        cancelRule = cancelRule.replaceAll("& lt;", "<");
+        cancelRule = cancelRule.replaceAll("& gt;", ">");
+        cancelRule = cancelRule.replaceAll("& #40;", "(");
+        cancelRule = cancelRule.replaceAll("& #41;", ")");
+        charteredService.setCancelRule(cancelRule);
+
+
         charteredService.setInsertTime(new Date());
         charteredService.setStatus(1);
         charteredServiceService.insert(charteredService);
@@ -203,6 +218,20 @@
     @RequestMapping(value = "/update")
     @ResponseBody
     public Object update(TCharteredService charteredService) {
+        String priceRule = charteredService.getPriceRule();
+        priceRule = priceRule.replaceAll("& lt;", "<");
+        priceRule = priceRule.replaceAll("& gt;", ">");
+        priceRule = priceRule.replaceAll("& #40;", "(");
+        priceRule = priceRule.replaceAll("& #41;", ")");
+        charteredService.setPriceRule(priceRule);
+
+        String cancelRule = charteredService.getCancelRule();
+        cancelRule = cancelRule.replaceAll("& lt;", "<");
+        cancelRule = cancelRule.replaceAll("& gt;", ">");
+        cancelRule = cancelRule.replaceAll("& #40;", "(");
+        cancelRule = cancelRule.replaceAll("& #41;", ")");
+        charteredService.setCancelRule(cancelRule);
+
         charteredServiceService.updateById(charteredService);
         return SUCCESS_TIP;
     }

--
Gitblit v1.7.1