From 439ad40675cda6175c5d027ec883f5c21b22eba2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 13:24:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
index 4328ebb..4b72592 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -170,7 +170,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage ) {
+ public Object add(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) {
int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1)
.eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
if (count > 0){
@@ -178,9 +178,8 @@
}
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
-// tServerCarmodel.setIsPackage(isPackage);
-// tServerCarmodel.setIsPrivateCar(isPrivateCar);
+ tServerCarmodel.setType(isPrivateCar);
+
tServerCarmodelService.insert(tServerCarmodel);
return SUCCESS_TIP;
}
@@ -190,12 +189,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar,@RequestParam Integer isPackage) {
+ public Object update(TServerCarmodel tServerCarmodel,@RequestParam Integer isPrivateCar) {
tServerCarmodel.setInsertTime(new Date());
tServerCarmodel.setState(1);
- tServerCarmodel.setType(1);
-// tServerCarmodel.setIsPackage(isPackage);
-// tServerCarmodel.setIsPrivateCar(isPrivateCar);
+ tServerCarmodel.setType(isPrivateCar);
tServerCarmodelService.updateById(tServerCarmodel);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1