From 22f2171b2f5a5cd594ea027860207bf3646f1f9d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 05 二月 2024 14:08:14 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
index 00af4ce..ae7aaa2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -20,7 +20,7 @@
/**
* 鏀跺叆璐圭敤绉戠洰Controller
- *
+ *
* @author ruoyi
* @date 2022-01-11
*/
@@ -28,8 +28,7 @@
@Api("鏀跺叆璐圭敤绉戠洰")
@RestController
@RequestMapping("/project/financesubject")
-public class BaseFinancesubjectController extends BaseController
-{
+public class BaseFinancesubjectController extends BaseController {
@Autowired
private IBaseFinancesubjectService baseFinancesubjectService;
@@ -39,9 +38,8 @@
@ApiOperation("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project::list')")
@GetMapping("/list")
- public TableDataInfo list(BaseFinancesubject baseFinancesubject)
- {
- log.info("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
+ public TableDataInfo list(BaseFinancesubject baseFinancesubject) {
+ log.info("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�", baseFinancesubject);
startPage();
//List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);銆�
List<BaseFinancesubject> list = baseFinancesubjectService.selectBaseFinancesubjectList(baseFinancesubject);
@@ -55,9 +53,8 @@
//@PreAuthorize("@ss.hasPermi('project:financesubject:export')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseFinancesubject baseFinancesubject)
- {
- log.info("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
+ public AjaxResult export(BaseFinancesubject baseFinancesubject) {
+ log.info("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�", baseFinancesubject);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
return util.exportExcel(list, "鏀跺叆璐圭敤绉戠洰鏁版嵁");
@@ -69,9 +66,8 @@
@ApiOperation("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:financesubject:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- log.info("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�" , id);
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseFinancesubjectService.getById(id));
}
@@ -81,12 +77,13 @@
@ApiOperation("鏂板鏀跺叆璐圭敤绉戠洰")
//@PreAuthorize("@ss.hasPermi('project:financesubject:add')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
- {
- log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
- return toAjax(baseFinancesubjectService.save(baseFinancesubject));
+ public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject) {
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�", baseFinancesubject);
+ boolean save = baseFinancesubjectService.save(baseFinancesubject);
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰baseFinancesubject鐨処D涓猴細{}", baseFinancesubject.getId());
+ return AjaxResult.success(baseFinancesubject);
}
/**
@@ -96,10 +93,9 @@
//@PreAuthorize("@ss.hasPermi('project:financesubject:edit')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
- {
- log.info("淇敼鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject) {
+ log.info("淇敼鏀跺叆璐圭敤绉戠洰{}锛�", baseFinancesubject);
return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
}
@@ -110,23 +106,22 @@
//@PreAuthorize("@ss.hasPermi('project:financesubject:remove')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- log.info("鍒犻櫎鏀跺叆璐圭敤绉戠洰{}锛�" , ids);
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鏀跺叆璐圭敤绉戠洰{}锛�", ids);
return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
}
@GetMapping(value = "/getItemName/{ItemType}")
- public AjaxResult getItemName(@PathVariable("ItemType") String ItemType){
- log.info("/getItemName鐨勫叆鍙� {}锛�" , ItemType);
+ public AjaxResult getItemName(@PathVariable("ItemType") String ItemType) {
+ log.info("/getItemName鐨勫叆鍙� {}锛�", ItemType);
return AjaxResult.success(baseFinancesubjectService.getItemName(ItemType));
}
@ApiOperation("鑾峰彇鎹愮尞鎴愭湰")
@Log(title = "鑾峰彇鎹愮尞鎴愭湰", businessType = BusinessType.OTHER)
@GetMapping(value = "/getDonationCost/{DonorNo}")
- public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo){
- log.info("鑾峰彇鎹愮尞鎴愭湰{}锛�" , DonorNo);
+ public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo) {
+ log.info("鑾峰彇鎹愮尞鎴愭湰{}锛�", DonorNo);
return AjaxResult.success(baseFinancesubjectService.getDonationCost(DonorNo));
}
@@ -137,9 +132,8 @@
@ApiOperation("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷")
@Log(title = "鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷", businessType = BusinessType.OTHER)
@GetMapping("/getbyexpensetype/{ExpenseType}")
- public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
- {
- log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷{}锛�" , ExpenseType);
+ public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType) {
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷{}锛�", ExpenseType);
/*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
baseFinancesubject.setExpensetype(ExpenseType);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
@@ -155,9 +149,8 @@
@ApiOperation("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏")
@Log(title = "鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏", businessType = BusinessType.OTHER)
@GetMapping("/getDetails/{ExpenseType}")
- public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
- {
- log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏{}锛�" , ExpenseType);
+ public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType) {
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏{}锛�", ExpenseType);
return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
}
--
Gitblit v1.9.3