From b3ed5823f971c04e5f814711a49c9baf7cdf54b9 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 14:59:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanManagement.java | 2 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanManagementController.java | 19 +++++++++++--------
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanManagementMapper.java | 1 -
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java | 7 +++----
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlanManagementController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanManagementController.java
similarity index 85%
rename from aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlanManagementController.java
rename to aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlanManagementController.java
index f8ec4e4..9f9439e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlanManagementController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/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);
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java
index 4d588af..d2ddd82 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanCycle.java
+++ b/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;
/** 鍛ㄦ湡绫诲瀷 鏃�/鏈� */
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanManagement.java
index 33d8c0c..ac351b9 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlanManagement.java
+++ b/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;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanManagementMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanManagementMapper.java
index 3a05541..6388544 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlanManagementMapper.java
+++ b/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;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java
index a0cb8de..6184b41 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlanManagementServiceImpl.java
+++ b/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涓氬姟灞傚鐞�
*
--
Gitblit v1.9.3