From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
index 2cbd032..6df106c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java
@@ -45,7 +45,7 @@
/**
* 鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
+// @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰寤鸿瑙勫垯鏂拌〃鍒楄〃")
public TableDataInfo list(TjProAdvicerules tjProAdvicerules) {
@@ -123,8 +123,15 @@
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
- public AjaxResult add(@RequestBody TjProAdvicerules tjProAdvicerules) {
- return toAjax(tjProAdvicerulesService.insertTjProAdvicerules(tjProAdvicerules));
+ public AjaxResult add(@RequestBody TjProAdvicerules advicerules) {
+ if(StringUtil.isNotBlank(advicerules.getFwz())){
+ if(advicerules.getFwz().contains("-")){
+ String[] split = advicerules.getFwz().split("-");
+ advicerules.setFwzdz(split[1]);
+ advicerules.setFwzxz(split[0]);
+ }
+ }
+ return toAjax(tjProAdvicerulesService.save(advicerules));
}
/**
@@ -134,8 +141,15 @@
@Log(title = "浣撴椤圭洰寤鸿瑙勫垯鏂拌〃", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃")
- public AjaxResult edit(@RequestBody TjProAdvicerules tjProAdvicerules) {
- return toAjax(tjProAdvicerulesService.updateTjProAdvicerules(tjProAdvicerules));
+ public AjaxResult edit(@RequestBody TjProAdvicerules advicerules) {
+ if(StringUtil.isNotBlank(advicerules.getFwz())){
+ if(advicerules.getFwz().contains("-")){
+ String[] split = advicerules.getFwz().split("-");
+ advicerules.setFwzdz(split[1]);
+ advicerules.setFwzxz(split[0]);
+ }
+ }
+ return toAjax(tjProAdvicerulesService.updateById(advicerules));
}
/**
@@ -148,4 +162,16 @@
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
}
+
+
+
+ @GetMapping("/getTjProAdvicerulesKsList")
+ @ApiOperation(value = "鑾峰彇浣撴璇婃柇寤鸿绉戝鍒楄〃鎺ュ彛")
+ public AjaxResult getTjProAdvicerulesKsList() {
+ List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
+ return AjaxResult.success(tjProAdvicerulesKsList);
+ }
+
+
+
}
--
Gitblit v1.8.0