From ded03f0315e02c13f17b8bf7777c89a5cc73130e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 12:16:38 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
index 09c5115..f49a29b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
@@ -28,7 +28,7 @@
@Slf4j
@Api("浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
@RestController
-@RequestMapping("/organcharge")
+@RequestMapping("/project/organcharge")
public class BaseOrganchargeController extends BaseController {
@Autowired
private IBaseOrganchargeService baseOrganchargeService;
@@ -37,10 +37,10 @@
* 鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃
*/
@ApiOperation("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:organcharge:list')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
- log.info("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�" , baseOrgancharge);
+ log.info("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�", baseOrgancharge);
startPage();
List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
return getDataTable(list);
@@ -50,11 +50,11 @@
* 瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃
*/
@ApiOperation("瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:organcharge:export')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:export')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrgancharge baseOrgancharge) {
- log.info("瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�" , baseOrgancharge);
+ log.info("瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�", baseOrgancharge);
List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
ExcelUtil<BaseOrgancharge> util = new ExcelUtil<BaseOrgancharge>(BaseOrgancharge.class);
return util.exportExcel(list, "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鏁版嵁");
@@ -64,10 +64,10 @@
* 鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:organcharge:query')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- log.info("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅{}锛�" , id);
+ log.info("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseOrganchargeService.getById(id));
}
@@ -75,25 +75,27 @@
* 鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:add')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:add')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
- log.info("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , baseOrgancharge);
- return toAjax(baseOrganchargeService.save(baseOrgancharge));
+ log.info("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�", baseOrgancharge);
+ boolean save = baseOrganchargeService.save(baseOrgancharge);
+ log.info("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤baseOrgancharge鐨処D锛歿}", baseOrgancharge.getId());
+ return AjaxResult.success(baseOrgancharge);
}
/**
* 淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:edit')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:edit')")
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
- log.info("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , baseOrgancharge);
+ log.info("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�", baseOrgancharge);
return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
}
@@ -101,10 +103,10 @@
* 鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤
*/
@ApiOperation("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
- @PreAuthorize("@ss.hasPermi('system:organcharge:remove')")
+ @PreAuthorize("@ss.hasPermi('project:organcharge:remove')")
@GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- log.info("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , ids);
+ log.info("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�", ids);
return toAjax(baseOrganchargeService.removeByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.9.3