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/BaseAnnextypeController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 19 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java | 33 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java | 31 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java | 31 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java | 28 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java | 16 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java | 32 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java | 32 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java | 61 +++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java | 30 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java | 5
45 files changed, 236 insertions(+), 240 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
index cdcf9b2..e91e5fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
@@ -82,14 +82,15 @@
@PreAuthorize("@ss.hasPermi('system:annextype:add')")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @RepeatSubmit
+ @RepeatSubmit
public AjaxResult add(@RequestBody BaseAnnextype baseAnnextype) {
log.info("鏂板鎹愮尞闄勪欢{}锛�", baseAnnextype);
if (ObjectUtils.isEmpty(baseAnnextype) || StringUtils.isEmpty(baseAnnextype.getDonationcategory()) || StringUtils.isEmpty(baseAnnextype.getAnnextype())) {
throw new BaseException("璇锋鏌ユ崘鐚被鍒拰闄勪欢绫诲瀷锛屼负绌轰簡");
}
- return toAjax(baseAnnextypeService.save(baseAnnextype));
+ boolean save = baseAnnextypeService.save(baseAnnextype);
+ return AjaxResult.success(baseAnnextype);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
index a3541df..90f3cd5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
@@ -80,11 +80,13 @@
*/
@ApiOperation("鏂板涓撳璐圭敤")
@Log(title = "涓撳璐圭敤", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype) {
log.info("鏂板涓撳璐圭敤{}锛�", baseExpertfeetype);
- return toAjax(baseExpertfeetypeService.save(baseExpertfeetype));
+ boolean save = baseExpertfeetypeService.save(baseExpertfeetype);
+ log.info("杩斿洖鐨刡aseExpertfeetype鐨刬d:{}锛�", baseExpertfeetype.getId());
+ return AjaxResult.success(baseExpertfeetype);
}
/**
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));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
index 1b33ba9..e9a6220 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
@@ -80,11 +80,13 @@
*/
@ApiOperation("鏂板鏀跺叆璐圭敤绉戠洰")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense) {
log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�" , baseItemexpense);
- return toAjax(baseItemexpenseService.save(baseItemexpense));
+
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰baseItemexpense鐨処D锛歿}" , baseItemexpense.getId());
+ return AjaxResult.success(baseItemexpense);
}
/**
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 14258dd..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
@@ -40,7 +40,7 @@
@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);
@@ -54,7 +54,7 @@
@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, "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鏁版嵁");
@@ -67,7 +67,7 @@
@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));
}
@@ -80,8 +80,10 @@
@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);
}
/**
@@ -93,7 +95,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
- log.info("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , baseOrgancharge);
+ log.info("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�", baseOrgancharge);
return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
}
@@ -104,7 +106,7 @@
@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)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index a7cdde5..9266c9a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -44,7 +44,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrganization baseOrganization) {
- log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�" , baseOrganization);
+ log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�", baseOrganization);
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -58,7 +58,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrganization baseOrganization) {
- log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�", baseOrganization);
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -71,7 +71,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
- log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�" , id);
+ log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -81,14 +81,17 @@
@ApiOperation("鏂板鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:add')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
- log.info("鏂板鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("鏂板鏈烘瀯淇℃伅{}锛�", baseOrganization);
String organization = onlyValueCommon.addOnlyValue("organization");
//"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
- return toAjax(baseOrganizationService.save(baseOrganization));
+
+ boolean save = baseOrganizationService.save(baseOrganization);
+ log.info("鏂板鏈烘瀯淇℃伅baseOrganization鐨処D{}锛�", baseOrganization.getId());
+ return AjaxResult.success(baseOrganization);
}
/**
@@ -100,7 +103,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
- log.info("淇敼鏈烘瀯淇℃伅{}锛�" , baseOrganization);
+ log.info("淇敼鏈烘瀯淇℃伅{}锛�", baseOrganization);
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -112,7 +115,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�" , ids);
+ log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�", ids);
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
index 9151cfb..3b0aba3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -77,11 +78,13 @@
@ApiOperation("鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
@PreAuthorize("@ss.hasPermi('project:travelcity:add')")
@Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity) {
log.info("鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑唟}锛�", baseTravelcity);
- return toAjax(baseTravelcityService.save(baseTravelcity));
+ boolean save = baseTravelcityService.save(baseTravelcity);
+ log.info("鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑哹aseTravelcity鐨刬d{}锛�", baseTravelcity.getId());
+ return AjaxResult.success(baseTravelcity);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
index 800cf68..bbaf6fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
@@ -80,11 +80,13 @@
*/
@ApiOperation("鏂板涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail) {
log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗭細{}", serviceDistributedetail);
- return toAjax(serviceDistributedetailService.save(serviceDistributedetail));
+ boolean save = serviceDistributedetailService.save(serviceDistributedetail);
+ log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�绘槑缁唖erviceDistributedetail鐨刬d锛歿}", serviceDistributedetail.getId());
+ return AjaxResult.success(serviceDistributedetail);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
index 050e656..fe1abca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
@@ -80,11 +80,13 @@
*/
@ApiOperation("鏂板涓撳璐圭敤鍒嗗彂姹囨�讳富")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�讳富", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary) {
log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�讳富锛歿}", serviceDistributesummary);
- return toAjax(serviceDistributesummaryService.save(serviceDistributesummary));
+ boolean save = serviceDistributesummaryService.save(serviceDistributesummary);
+ log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�讳富serviceDistributesummary鐨処D锛歿}", serviceDistributesummary.getId());
+ return AjaxResult.success(serviceDistributesummary);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
index 4cb2e5b..349b078 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
@@ -81,11 +81,13 @@
*/
@ApiOperation("鏂板鎹愮尞闄勪欢")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
log.info("鏂板鎹愮尞闄勪欢锛歿}", serviceDocumentfiles);
- return toAjax(serviceDocumentfilesService.save(serviceDocumentfiles));
+ boolean save = serviceDocumentfilesService.save(serviceDocumentfiles);
+ log.info("鏂板鎹愮尞闄勪欢serviceDocumentfiles鐨刬d锛歿}", serviceDocumentfiles.getId());
+ return AjaxResult.success(serviceDocumentfiles);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
index 8657d9f..d1a0c52 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -98,9 +98,9 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ public TableDataInfo add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
log.info("鏂板鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannexs.size());
- return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
+ return getDataTable(serviceDonateannexService.saveData(serviceDonateannexs));
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
index bc5f1e9..ffdc2a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
@@ -84,11 +84,13 @@
@ApiOperation("鏂板鎹愮尞瑕佹眰闄勪欢淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:add')")
@Log(title = "鎹愮尞闄勪欢瑕佹眰", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
log.info("鏂板鎹愮尞瑕佹眰闄勪欢淇℃伅锛歿}", serviceDonateannexrequirement);
- return toAjax(serviceDonateannexrequirementService.save(serviceDonateannexrequirement));
+ boolean save = serviceDonateannexrequirementService.save(serviceDonateannexrequirement);
+ log.info("鏂板鎹愮尞瑕佹眰闄勪欢淇℃伅serviceDonateannexrequirement鐨処D涓猴細{}", serviceDonateannexrequirement);
+ return AjaxResult.success(serviceDonateannexrequirement);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 269094d..fc55bec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -121,7 +121,7 @@
@ApiOperation("鏂板娼滃湪鎹愮尞淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 702620b..0c1532c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -113,12 +113,14 @@
@ApiOperation("鏂板鎹愮尞瀹屾垚")
//@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit(interval = 5000)
public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
- return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
+ boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
+ log.info("鏂板鎹愮尞瀹屾垚serviceDonatecompletioninfo鐨処D锛歿}", serviceDonatecompletioninfo.getId());
+ return AjaxResult.success(serviceDonatecompletioninfo);
}
// /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 646c7c0..4b69de8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -80,7 +80,8 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatecomporgan serviceDonatecomporgan) {
- return toAjax(serviceDonatecomporganService.save(serviceDonatecomporgan));
+ boolean save = serviceDonatecomporganService.save(serviceDonatecomporgan);
+ return AjaxResult.success(serviceDonatecomporgan);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java
index c370190..651625e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,15 +27,14 @@
/**
* 璧勯噾鐢宠涓昏〃Controller
- *
+ *
* @author ruoyi
* @date 2022-01-18
*/
@Api("璧勯噾鐢宠涓昏〃")
@RestController
@RequestMapping("/project/donateconsolationfund")
-public class ServiceDonateconsolationfundController extends BaseController
-{
+public class ServiceDonateconsolationfundController extends BaseController {
@Autowired
private IServiceDonateconsolationfundService serviceDonateconsolationfundService;
@@ -43,8 +43,7 @@
*/
@ApiOperation("鏌ヨ璧勯噾鐢宠涓昏〃鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonateconsolationfund serviceDonateconsolationfund)
- {
+ public TableDataInfo list(ServiceDonateconsolationfund serviceDonateconsolationfund) {
startPage();
List<ServiceDonateconsolationfund> list = serviceDonateconsolationfundService.queryList(serviceDonateconsolationfund);
return getDataTable(list);
@@ -56,8 +55,7 @@
@ApiOperation("瀵煎嚭璧勯噾鐢宠涓昏〃鍒楄〃")
@Log(title = "璧勯噾鐢宠涓昏〃", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonateconsolationfund serviceDonateconsolationfund)
- {
+ public AjaxResult export(ServiceDonateconsolationfund serviceDonateconsolationfund) {
List<ServiceDonateconsolationfund> list = serviceDonateconsolationfundService.queryList(serviceDonateconsolationfund);
ExcelUtil<ServiceDonateconsolationfund> util = new ExcelUtil<ServiceDonateconsolationfund>(ServiceDonateconsolationfund.class);
return util.exportExcel(list, "璧勯噾鐢宠涓昏〃鏁版嵁");
@@ -68,8 +66,7 @@
*/
@ApiOperation("鑾峰彇璧勯噾鐢宠涓昏〃璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonateconsolationfundService.getById(id));
}
@@ -78,11 +75,11 @@
*/
@ApiOperation("鏂板璧勯噾鐢宠涓昏〃")
@Log(title = "璧勯噾鐢宠涓昏〃", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund)
- {
- return toAjax(serviceDonateconsolationfundService.save(serviceDonateconsolationfund));
+ public AjaxResult add(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund) {
+ boolean save = serviceDonateconsolationfundService.save(serviceDonateconsolationfund);
+ return AjaxResult.success(serviceDonateconsolationfund);
}
/**
@@ -91,9 +88,8 @@
@ApiOperation("淇敼璧勯噾鐢宠涓昏〃")
@Log(title = "璧勯噾鐢宠涓昏〃", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund) {
return toAjax(serviceDonateconsolationfundService.updateById(serviceDonateconsolationfund));
}
@@ -103,8 +99,7 @@
@ApiOperation("鍒犻櫎璧勯噾鐢宠涓昏〃")
@Log(title = "璧勯噾鐢宠涓昏〃", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonateconsolationfundService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java
index e86696a..0ededfa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java
@@ -81,10 +81,11 @@
@ApiOperation("鏂板鎹愮尞娴佺▼")
//@PreAuthorize("@ss.hasPermi('system:donateflowchart:add')")
@Log(title = "鎹愮尞娴佺▼", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateflowchart serviceDonateflowchart) {
- return toAjax(serviceDonateflowchartService.save(serviceDonateflowchart));
+ boolean save = serviceDonateflowchartService.save(serviceDonateflowchart);
+ return AjaxResult.success(serviceDonateflowchart);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java
index be25db9..0754568 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java
@@ -28,15 +28,14 @@
/**
* 鎹愮尞闅忚Controller
- *
+ *
* @author ruoyi
* @date 2021-12-10
*/
@Api("鎹愮尞闅忚")
@RestController
@RequestMapping("/project/donatefollowup")
-public class ServiceDonatefollowupController extends BaseController
-{
+public class ServiceDonatefollowupController extends BaseController {
@Autowired
private IServiceDonatefollowupService serviceDonatefollowupService;
@@ -46,8 +45,7 @@
@ApiOperation("鏌ヨ鎹愮尞闅忚鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup)
- {
+ public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup) {
startPage();
//List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
List<ServiceDonatefollowup> list = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
@@ -55,7 +53,7 @@
}
@GetMapping("/listnew")
- public TableDataInfo listnew (DonateFollowupVO donateFollowupVO){
+ public TableDataInfo listnew(DonateFollowupVO donateFollowupVO) {
startPage();
List<DonateFollowupVO> list = serviceDonatefollowupService.selectVOList(donateFollowupVO);
return getDataTable(list);
@@ -70,8 +68,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:export')")
@Log(title = "鎹愮尞闅忚", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup)
- {
+ public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup) {
List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
ExcelUtil<ServiceDonatefollowup> util = new ExcelUtil<ServiceDonatefollowup>(ServiceDonatefollowup.class);
return util.exportExcel(list, "鎹愮尞闅忚鏁版嵁");
@@ -83,8 +80,7 @@
@ApiOperation("鑾峰彇鎹愮尞闅忚璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
//return AjaxResult.success(serviceDonatefollowupService.getById(id));
return AjaxResult.success(serviceDonatefollowupService.selectFollowUpById(id));
}
@@ -95,11 +91,11 @@
@ApiOperation("鏂板鎹愮尞闅忚")
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:add')")
@Log(title = "鎹愮尞闅忚", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
- {
- return toAjax(serviceDonatefollowupService.save(serviceDonatefollowup));
+ public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
+ boolean save = serviceDonatefollowupService.save(serviceDonatefollowup);
+ return AjaxResult.success(serviceDonatefollowup);
}
/**
@@ -109,9 +105,8 @@
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:edit')")
@Log(title = "鎹愮尞闅忚", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
return toAjax(serviceDonatefollowupService.updateById(serviceDonatefollowup));
}
@@ -123,8 +118,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatefollowup:remove')")
@Log(title = "鎹愮尞闅忚", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonatefollowupService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 4b621a4..2ac03a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -106,7 +106,7 @@
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan) {
String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
@@ -121,7 +121,8 @@
}
}
serviceDonateorgan.setOrgannumber(organNumber);
- return toAjax(serviceDonateorganService.save(serviceDonateorgan));
+ boolean save = serviceDonateorganService.save(serviceDonateorgan);
+ return AjaxResult.success(serviceDonateorgan);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
index afcabbe..88e0f72 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
@@ -20,15 +20,14 @@
/**
* 鎹愮尞妗堜緥鍣ㄥ畼鍒桟ontroller
- *
+ *
* @author ruoyi
* @date 2023-12-27
*/
@Api("鎹愮尞妗堜緥鍣ㄥ畼鍒�")
@RestController
@RequestMapping("/project/donateorganstatics")
-public class ServiceDonateorganstaticsController extends BaseController
-{
+public class ServiceDonateorganstaticsController extends BaseController {
@Autowired
private IServiceDonateorganstaticsService serviceDonateorganstaticsService;
@@ -38,8 +37,7 @@
@ApiOperation("鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonateorganstatics serviceDonateorganstatics)
- {
+ public TableDataInfo list(ServiceDonateorganstatics serviceDonateorganstatics) {
startPage();
List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
return getDataTable(list);
@@ -52,8 +50,7 @@
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:export')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonateorganstatics serviceDonateorganstatics)
- {
+ public AjaxResult export(ServiceDonateorganstatics serviceDonateorganstatics) {
List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
ExcelUtil<ServiceDonateorganstatics> util = new ExcelUtil<ServiceDonateorganstatics>(ServiceDonateorganstatics.class);
return util.exportExcel(list, "鎹愮尞妗堜緥鍣ㄥ畼鍒楁暟鎹�");
@@ -65,8 +62,7 @@
@ApiOperation("鑾峰彇鎹愮尞妗堜緥鍣ㄥ畼鍒楄缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:query')")
@GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonateorganstaticsService.getById(id));
}
@@ -78,9 +74,9 @@
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
- {
- return toAjax(serviceDonateorganstaticsService.save(serviceDonateorganstatics));
+ public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics) {
+ boolean save = serviceDonateorganstaticsService.save(serviceDonateorganstatics);
+ return AjaxResult.success(serviceDonateorganstatics);
}
/**
@@ -90,9 +86,8 @@
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:edit')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics) {
return toAjax(serviceDonateorganstaticsService.updateById(serviceDonateorganstatics));
}
@@ -103,8 +98,7 @@
@PreAuthorize("@ss.hasPermi('project:donateorganstatics:remove')")
@Log(title = "鎹愮尞妗堜緥鍣ㄥ畼鍒�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonateorganstaticsService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index 39c7e8d..f69cdb2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -124,11 +124,11 @@
@ApiOperation("鏂板鎹愮尞瑙佽瘉")
//@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
-
- return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
+ boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
+ return AjaxResult.success(serviceDonationwitness);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index dc23d22..80695f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -80,7 +80,8 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
- return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
+ boolean save = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
+ return AjaxResult.success(serviceDonationwitnessorgan);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index 9b81e3c..f14aba7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -79,7 +79,8 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
- return toAjax(serviceDonorchargeorganService.save(serviceDonorchargeorgan));
+ boolean save = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
+ return AjaxResult.success(serviceDonorchargeorgan);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
index af6b309..4b3a805 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -27,14 +27,13 @@
/**
* 浼︾悊瀹℃煡涓撳鎰忚Controller
- *
+ *
* @author ruoyi
* @date 2021-11-23
*/
@RestController
@RequestMapping("/project/ethicalreviewopinions")
-public class ServiceEthicalreviewopinionsController extends BaseController
-{
+public class ServiceEthicalreviewopinionsController extends BaseController {
@Autowired
private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
@@ -43,16 +42,14 @@
*/
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceEthicalreviewopinions serviceEthicalreviewopinions)
- {
+ public TableDataInfo list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
startPage();
List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
return getDataTable(list);
}
@GetMapping("/listnew")
- public TableDataInfo listnew (EthicalReviewVO ethicalReviewVO)
- {
+ public TableDataInfo listnew(EthicalReviewVO ethicalReviewVO) {
startPage();
List<EthicalReviewVO> list = serviceEthicalreviewopinionsService.selectVOList(ethicalReviewVO);
return getDataTable(list);
@@ -65,8 +62,7 @@
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:export')")
@Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions)
- {
+ public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
ExcelUtil<ServiceEthicalreviewopinions> util = new ExcelUtil<ServiceEthicalreviewopinions>(ServiceEthicalreviewopinions.class);
return util.exportExcel(list, "浼︾悊瀹℃煡涓撳鎰忚鏁版嵁");
@@ -77,8 +73,7 @@
*/
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceEthicalreviewopinionsService.getById(id));
}
@@ -87,11 +82,11 @@
*/
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
@Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
- public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions)
- {
- return toAjax(serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions));
+ public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
+ boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
+ return AjaxResult.success(serviceEthicalreviewopinions);
}
/**
@@ -100,9 +95,8 @@
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:edit')")
@Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
return toAjax(serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions));
}
@@ -112,8 +106,7 @@
//@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:remove')")
@Log(title = "浼︾悊瀹℃煡涓撳鎰忚", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceEthicalreviewopinionsService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java
index 04321d8..6eb6b14 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java
@@ -80,11 +80,12 @@
*/
@ApiOperation("鏂板璐圭敤鐢宠涓�")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceExpertexpense serviceExpertexpense)
{
- return toAjax(serviceExpertexpenseService.save(serviceExpertexpense));
+ boolean save = serviceExpertexpenseService.save(serviceExpertexpense);
+ return AjaxResult.success(serviceExpertexpense);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
index bf682ac..8b3a747 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -84,7 +84,7 @@
*/
//@PreAuthorize("@ss.hasPermi('project:externalperson:add')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson) {
if (StringUtils.isEmpty(serviceExternalperson.getUserno())) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
index b8e68f0..fd61ed4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
@@ -86,10 +86,11 @@
@ApiOperation("鏂板浜哄憳鍜屽垎缁勭粍鍒叧鑱�")
@PreAuthorize("@ss.hasPermi('system:group:add')")
@Log(title = "浜哄憳鍜屽垎缁勭粍鍒叧鑱�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceExternalpersonGroup serviceExternalpersonGroup) {
- return toAjax(serviceExternalpersonGroupService.save(serviceExternalpersonGroup));
+ boolean save = serviceExternalpersonGroupService.save(serviceExternalpersonGroup);
+ return AjaxResult.success(serviceExternalpersonGroup);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index bea9174..e1a99fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -241,7 +241,7 @@
@ApiOperation("鏂板璐圭敤鐢宠涓�")
//@PreAuthorize("@ss.hasPermi('project:fund:add')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
public AjaxResult add(@RequestBody ServiceFund serviceFund) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
index 4b17341..9c86e5e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
@@ -20,15 +20,14 @@
/**
* 璐圭敤鐢宠涓籆ontroller
- *
+ *
* @author ruoyi
* @date 2023-03-27
*/
@Api("璐圭敤鐢宠涓�")
@RestController
@RequestMapping("/system/shared")
-public class ServiceFundSharedController extends BaseController
-{
+public class ServiceFundSharedController extends BaseController {
@Autowired
private IServiceFundSharedService serviceFundSharedService;
@@ -38,8 +37,7 @@
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
@PreAuthorize("@ss.hasPermi('system:shared:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceFundShared serviceFundShared)
- {
+ public TableDataInfo list(ServiceFundShared serviceFundShared) {
startPage();
List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
return getDataTable(list);
@@ -52,8 +50,7 @@
@PreAuthorize("@ss.hasPermi('system:shared:export')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFundShared serviceFundShared)
- {
+ public AjaxResult export(ServiceFundShared serviceFundShared) {
List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
ExcelUtil<ServiceFundShared> util = new ExcelUtil<ServiceFundShared>(ServiceFundShared.class);
return util.exportExcel(list, "璐圭敤鐢宠涓绘暟鎹�");
@@ -65,8 +62,7 @@
@ApiOperation("鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('system:shared:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundSharedService.getById(id));
}
@@ -76,11 +72,11 @@
@ApiOperation("鏂板璐圭敤鐢宠涓�")
@PreAuthorize("@ss.hasPermi('system:shared:add')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared)
- {
- return toAjax(serviceFundSharedService.save(serviceFundShared));
+ public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared) {
+ boolean save = serviceFundSharedService.save(serviceFundShared);
+ return AjaxResult.success(serviceFundShared);
}
/**
@@ -90,9 +86,8 @@
@PreAuthorize("@ss.hasPermi('system:shared:edit')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared) {
return toAjax(serviceFundSharedService.updateById(serviceFundShared));
}
@@ -103,8 +98,7 @@
@PreAuthorize("@ss.hasPermi('system:shared:remove')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFundSharedService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index dccd9ee..f0265e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -78,10 +78,11 @@
@ApiOperation("鏂板璐圭敤鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:funddetail:add')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
- return toAjax(serviceFunddetailService.save(serviceFunddetail));
+ boolean save = serviceFunddetailService.save(serviceFunddetail);
+ return AjaxResult.success(serviceFunddetail);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
index d1e4943..95a4bce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
@@ -82,11 +82,12 @@
@ApiOperation("鏂板璐圭敤鐢宠鏄庣粏")
@PreAuthorize("@ss.hasPermi('project:funddetailshared:add')")
@Log(title = "璐圭敤鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceFunddetailShared serviceFunddetailShared)
{
- return toAjax(serviceFunddetailSharedService.save(serviceFunddetailShared));
+ boolean save = serviceFunddetailSharedService.save(serviceFunddetailShared);
+ return AjaxResult.success(serviceFunddetailShared);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java
index 6254869..8e266b5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,14 @@
/**
* 璧勯噾瀹℃壒娴佺▼Controller
- *
+ *
* @author ruoyi
* @date 2022-04-27
*/
@Api("璧勯噾瀹℃壒娴佺▼")
@RestController
@RequestMapping("/project/fundflow")
-public class ServiceFundflowController extends BaseController
-{
+public class ServiceFundflowController extends BaseController {
@Autowired
private IServiceFundflowService serviceFundflowService;
@@ -43,8 +44,7 @@
*/
@ApiOperation("鏌ヨ璧勯噾瀹℃壒娴佺▼鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceFundflow serviceFundflow)
- {
+ public TableDataInfo list(ServiceFundflow serviceFundflow) {
startPage();
List<ServiceFundflow> list = serviceFundflowService.queryList(serviceFundflow);
return getDataTable(list);
@@ -56,8 +56,7 @@
@ApiOperation("瀵煎嚭璧勯噾瀹℃壒娴佺▼鍒楄〃")
@Log(title = "璧勯噾瀹℃壒娴佺▼", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFundflow serviceFundflow)
- {
+ public AjaxResult export(ServiceFundflow serviceFundflow) {
List<ServiceFundflow> list = serviceFundflowService.queryList(serviceFundflow);
ExcelUtil<ServiceFundflow> util = new ExcelUtil<ServiceFundflow>(ServiceFundflow.class);
return util.exportExcel(list, "璧勯噾瀹℃壒娴佺▼鏁版嵁");
@@ -68,8 +67,7 @@
*/
@ApiOperation("鑾峰彇璧勯噾瀹℃壒娴佺▼璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundflowService.getById(id));
}
@@ -78,11 +76,11 @@
*/
@ApiOperation("鏂板璧勯噾瀹℃壒娴佺▼")
@Log(title = "璧勯噾瀹℃壒娴佺▼", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceFundflow serviceFundflow)
- {
- return toAjax(serviceFundflowService.save(serviceFundflow));
+ public AjaxResult add(@RequestBody ServiceFundflow serviceFundflow) {
+ boolean save = serviceFundflowService.save(serviceFundflow);
+ return AjaxResult.success(serviceFundflow);
}
/**
@@ -91,9 +89,8 @@
@ApiOperation("淇敼璧勯噾瀹℃壒娴佺▼")
@Log(title = "璧勯噾瀹℃壒娴佺▼", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFundflow serviceFundflow)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFundflow serviceFundflow) {
return toAjax(serviceFundflowService.updateById(serviceFundflow));
}
@@ -103,8 +100,7 @@
@ApiOperation("鍒犻櫎璧勯噾瀹℃壒娴佺▼")
@Log(title = "璧勯噾瀹℃壒娴佺▼", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFundflowService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java
index 4cd7b4b..2b72e93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,15 +27,14 @@
/**
* 璧勯噾瀹℃壒瑙勫垯Controller
- *
+ *
* @author ruoyi
* @date 2022-04-27
*/
@Api("璧勯噾瀹℃壒瑙勫垯")
@RestController
@RequestMapping("/project/fundflowrule")
-public class ServiceFundflowruleController extends BaseController
-{
+public class ServiceFundflowruleController extends BaseController {
@Autowired
private IServiceFundflowruleService serviceFundflowruleService;
@@ -43,8 +43,7 @@
*/
@ApiOperation("鏌ヨ璧勯噾瀹℃壒瑙勫垯鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceFundflowrule serviceFundflowrule)
- {
+ public TableDataInfo list(ServiceFundflowrule serviceFundflowrule) {
startPage();
List<ServiceFundflowrule> list = serviceFundflowruleService.queryList(serviceFundflowrule);
return getDataTable(list);
@@ -56,8 +55,7 @@
@ApiOperation("瀵煎嚭璧勯噾瀹℃壒瑙勫垯鍒楄〃")
@Log(title = "璧勯噾瀹℃壒瑙勫垯", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFundflowrule serviceFundflowrule)
- {
+ public AjaxResult export(ServiceFundflowrule serviceFundflowrule) {
List<ServiceFundflowrule> list = serviceFundflowruleService.queryList(serviceFundflowrule);
ExcelUtil<ServiceFundflowrule> util = new ExcelUtil<ServiceFundflowrule>(ServiceFundflowrule.class);
return util.exportExcel(list, "璧勯噾瀹℃壒瑙勫垯鏁版嵁");
@@ -68,8 +66,7 @@
*/
@ApiOperation("鑾峰彇璧勯噾瀹℃壒瑙勫垯璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundflowruleService.getById(id));
}
@@ -78,11 +75,11 @@
*/
@ApiOperation("鏂板璧勯噾瀹℃壒瑙勫垯")
@Log(title = "璧勯噾瀹℃壒瑙勫垯", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceFundflowrule serviceFundflowrule)
- {
- return toAjax(serviceFundflowruleService.save(serviceFundflowrule));
+ public AjaxResult add(@RequestBody ServiceFundflowrule serviceFundflowrule) {
+ boolean save = serviceFundflowruleService.save(serviceFundflowrule);
+ return AjaxResult.success(serviceFundflowrule);
}
/**
@@ -91,9 +88,8 @@
@ApiOperation("淇敼璧勯噾瀹℃壒瑙勫垯")
@Log(title = "璧勯噾瀹℃壒瑙勫垯", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFundflowrule serviceFundflowrule)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFundflowrule serviceFundflowrule) {
return toAjax(serviceFundflowruleService.updateById(serviceFundflowrule));
}
@@ -103,8 +99,7 @@
@ApiOperation("鍒犻櫎璧勯噾瀹℃壒瑙勫垯")
@Log(title = "璧勯噾瀹℃壒瑙勫垯", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFundflowruleService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 9f8b375..827a1f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -90,10 +90,11 @@
@ApiOperation("鏂板鍖诲璇勪及")
//@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
- return toAjax(serviceMedicalevaluationService.save(serviceMedicalevaluation));
+ boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
+ return AjaxResult.success(serviceMedicalevaluation);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 357605a..a2e7c0e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -220,7 +220,7 @@
@ApiOperation("鏂板鎶ラ攢鐢宠")
//@PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
@Log(title = "鎶ラ攢鐢宠", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index 3f052e6..f966dea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -99,7 +99,7 @@
@ApiOperation("鏂板鎶ラ攢鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:add')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
@@ -110,7 +110,8 @@
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
}
- return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
+ boolean save = serviceReimbursementdetailService.save(serviceReimbursementdetail);
+ return AjaxResult.success(serviceReimbursementdetail);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
index 4fc03d4..d5434c0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
@@ -82,11 +82,12 @@
@ApiOperation("鏂板鎶ラ攢鐢宠鏄庣粏")
@PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:add')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
{
- return toAjax(serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared));
+ boolean save = serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared);
+ return AjaxResult.success(serviceReimbursementdetailShared);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 1689352..7f3bae3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -75,11 +75,12 @@
@ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
{
- return toAjax(serviceReimbursementpayeeService.save(serviceReimbursementpayee));
+ boolean save = serviceReimbursementpayeeService.save(serviceReimbursementpayee);
+ return AjaxResult.success(serviceReimbursementpayee);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
index 0b6c394..f3b5ef7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
@@ -82,11 +82,12 @@
@ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
@PreAuthorize("@ss.hasPermi('project:reimbursementpayeeshared:add')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementpayeeShared serviceReimbursementpayeeShared)
{
- return toAjax(serviceReimbursementpayeeSharedService.save(serviceReimbursementpayeeShared));
+ boolean save = serviceReimbursementpayeeSharedService.save(serviceReimbursementpayeeShared);
+ return AjaxResult.success(serviceReimbursementpayeeShared);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index 29a9ded..ea22706 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -116,10 +116,11 @@
@ApiOperation("鏂板浜插睘纭")
//@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')")
@Log(title = "鎹愮尞浜插睘纭", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
- return toAjax(serviceRelativesconfirmationService.save(serviceRelativesconfirmation));
+ boolean save = serviceRelativesconfirmationService.save(serviceRelativesconfirmation);
+ return AjaxResult.success(serviceRelativesconfirmation);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
index e4bf652..e2307d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -97,10 +97,11 @@
@ApiOperation("鏂板绯荤粺娑堟伅")
@PreAuthorize("@ss.hasPermi('project:systemmessage:add')")
@Log(title = "绯荤粺娑堟伅", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage) {
- return toAjax(serviceSystemmessageService.save(serviceSystemmessage));
+ boolean save = serviceSystemmessageService.save(serviceSystemmessage);
+ return AjaxResult.success(serviceSystemmessage);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java
index cef888d..ce015a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java
@@ -81,11 +81,12 @@
*/
@ApiOperation("鏂板浣忓璐归檺棰濇爣鍑�")
@Log(title = "浣忓璐归檺棰濇爣鍑�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceTravelexpensestandard serviceTravelexpensestandard)
{
- return toAjax(serviceTravelexpensestandardService.save(serviceTravelexpensestandard));
+ boolean save = serviceTravelexpensestandardService.save(serviceTravelexpensestandard);
+ return AjaxResult.success(serviceTravelexpensestandard);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java
index 1b8d967..b048917 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java
@@ -83,11 +83,12 @@
@ApiOperation("鏂板鍣ㄥ畼鐧昏")
//@PreAuthorize("@ss.hasPermi('project:register:add')")
@Log(title = "鍣ㄥ畼淇℃伅鐧昏鏂�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody VServiceDonateorganRegister vServiceDonateorganRegister)
{
- return toAjax(vServiceDonateorganRegisterService.save(vServiceDonateorganRegister));
+ boolean save = vServiceDonateorganRegisterService.save(vServiceDonateorganRegister);
+ return AjaxResult.success(vServiceDonateorganRegister);
}
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java
index 56061a7..10b9824 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonateannex;
@@ -26,5 +27,5 @@
List<DonateAnnexVO> selectVOList(DonateAnnexVO donateAnnexVO);
- Boolean saveData(List<ServiceDonateannex> serviceDonateannexs);
+ List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
index c475520..d5ecd8f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
@@ -99,7 +99,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean saveData(List<ServiceDonateannex> serviceDonateannexs) {
+ public List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs) {
for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
log.info("serviceDonateannex鐨勪俊鎭細{}", serviceDonateannex);
if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
@@ -107,7 +107,7 @@
}
this.save(serviceDonateannex);
}
- return true;
+ return serviceDonateannexs;
}
}
--
Gitblit v1.9.3