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

huangjiayang

2025-05-12 f003459b33063abdcca11bb6aea1ed550ca5cc7d

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

@@ -9,6 +9,8 @@
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateProcessShopStat;
import com.aps.core.service.IApsPlateProcessShopStatService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,9 +24,9 @@
 * @date 2025-04-23
 */


@Tag(name = "钣金计划大表", description = "钣金计划大表接口")
@RestController
@RequestMapping("/ApsPlateProcessShopStat")
@RequestMapping("/plateProcessShopStat")
public class ApsPlateProcessShopStatController extends BaseController
{
    @Autowired
@@ -34,15 +36,13 @@
    /**
     * 导出钣金车间统计列表
     */

    @RequiresPermissions("ApsPlateProcessShopStat:ApsPlateProcessShopStat:export")
    @Operation(summary = "钣金计划大表", description = "导出功能")
    @Log(title = "钣金车间统计", businessType = BusinessType.EXPORT)
    @RequiresPermissions("plateProcessShopStat:export")
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsPlateProcessShopStat apsPlateProcessShopStat)
    {
        List<ApsPlateProcessShopStat> list = apsPlateProcessShopStatService.selectApsPlateProcessShopStatList(apsPlateProcessShopStat);
        ExcelUtil<ApsPlateProcessShopStat> util = new ExcelUtil<ApsPlateProcessShopStat>(ApsPlateProcessShopStat.class);
        util.exportExcel(response, list, "钣金车间统计数据");
        apsPlateProcessShopStatService.exportExcel(response);
    }


@@ -50,10 +50,11 @@
     * 修改钣金车间统计
     */


    @Operation(summary = "钣金计划大表", description = "更新统计数据")
    @Log(title = "钣金车间统计", businessType = BusinessType.UPDATE)
    @RequiresPermissions("plateProcessShopStat:update")
    @PostMapping("/update")
    public AjaxResult update(@RequestBody ApsPlateProcessShopStat apsPlateProcessShopStat)
    public AjaxResult update()
    {
        apsPlateProcessShopStatService.saveShopStat();
        return toAjax(true);
@@ -62,10 +63,10 @@
    /**
     * 查询钣金车间统计列表
     */


    @RequiresPermissions("plateProcessShopStat:list")
    @Operation(summary = "钣金计划大表", description = "获取统计数据")
    @GetMapping("/list")
    public AjaxResult list(ApsPlateProcessShopStat apsPlateProcessShopStat)
    public AjaxResult list()
    {
        return apsPlateProcessShopStatService.getShopPlanStat();