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

zhanghl

2025-05-15 b3ed5823f971c04e5f814711a49c9baf7cdf54b9

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

 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);
    }
}

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java

@@ -27,6 +27,7 @@


    @Id
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long id;

    /** å‘¨æœŸç±»åž‹ æ—¥/月 */

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanManagement.java

@@ -2,6 +2,7 @@

import com.aps.common.core.web.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -21,6 +22,7 @@
    private static final long serialVersionUID = 1L;

    /** è®¡åˆ’ID */
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    @Schema(description = "计划ID")
    private Long id;


 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanManagementMapper.java

@@ -1,6 +1,5 @@
package com.aps.core.mapper;

import com.aps.core.controller.ApsPlanManagementController;
import com.aps.core.domain.ApsPlanManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;


 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java

@@ -1,8 +1,5 @@
package com.aps.core.service.impl;

import java.util.List;
import java.util.Objects;

import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.SecurityUtils;
@@ -12,12 +9,14 @@
import com.aps.core.mapper.ApsPlanManagementMapper;
import com.aps.core.service.IApsPlanManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.simpleframework.xml.core.Resolve;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Objects;

/**
 * è®¡åˆ’管理Service业务层处理
 *