Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-15 b3ed5823f971c04e5f814711a49c9baf7cdf54b9

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanManagementController.java

文件名从 aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlanManagementController.java 修改
@@ -1,4 +1,4 @@
package com.aps.core.controller;
package com.aps.core.controller.mainPlan;

import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
@@ -50,7 +50,7 @@
     */
    @Operation(summary = "瀵煎嚭璁″垝绠＄悊鍒楄〃", description = "瀵煎嚭")
//    @RequiresPermissions("aps:management:export")
    @Log(title = "璁″垝绠＄悊", businessType = BusinessType.EXPORT)
    @Log(title = "瀵煎嚭璁″垝绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsPlanManagement apsPlanManagement)
    {
@@ -75,11 +75,12 @@
     */
    @Operation(summary = "鏂板璁″垝绠＄悊", description = "鍗曚釜鏂板")
//    @RequiresPermissions("aps:management:add")
    @Log(title = "璁″垝绠＄悊", businessType = BusinessType.INSERT)
    @Log(title = "鏂板璁″垝绠＄悊", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsPlanManagement apsPlanManagement)
    {
        return toAjax(apsPlanManagementService.insertApsPlanManagement(apsPlanManagement));
        apsPlanManagementService.insertApsPlanManagement(apsPlanManagement);
        return toAjax(true);
    }

    /**
@@ -100,11 +101,12 @@
     */
    @Operation(summary = "淇敼璁″垝绠＄悊", description = "鍗曚釜淇敼")
//    @RequiresPermissions("aps:management:edit")
    @Log(title = "璁″垝绠＄悊", businessType = BusinessType.UPDATE)
    @Log(title = "淇敼璁″垝绠＄悊", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsPlanManagement apsPlanManagement)
    {
        return toAjax(apsPlanManagementService.updateApsPlanManagement(apsPlanManagement));
        apsPlanManagementService.updateApsPlanManagement(apsPlanManagement);
        return toAjax(true);
    }

    /**
@@ -112,10 +114,11 @@
     */
    @Operation(summary = "鍒犻櫎璁″垝绠＄悊", description = "鎵归噺鍒犻櫎")
//    @RequiresPermissions("aps:management:remove")
    @Log(title = "璁″垝绠＄悊", businessType = BusinessType.DELETE)
    @Log(title = "鍒犻櫎璁″垝绠＄悊", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(apsPlanManagementService.deleteApsPlanManagementByIds(ids));
        apsPlanManagementService.deleteApsPlanManagementByIds(ids);
        return toAjax(true);
    }
}