From 706d0d62cc25829ec6948e2fd5d03e62acf29306 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 11 三月 2026 11:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java | 4 +++-
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 6 +++++-
doc/20260306_create_purchase_return_orders.sql | 1 +
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java | 2 +-
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 4 +++-
src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java | 2 +-
src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml | 2 +-
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 2 ++
src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java | 2 +-
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java | 8 ++++----
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 21 +++++++++++----------
11 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/doc/20260306_create_purchase_return_orders.sql b/doc/20260306_create_purchase_return_orders.sql
index 84c700b..328cb00 100644
--- a/doc/20260306_create_purchase_return_orders.sql
+++ b/doc/20260306_create_purchase_return_orders.sql
@@ -30,6 +30,7 @@
id bigint auto_increment primary key,
purchase_return_order_id bigint not null default 0 comment '閫�璐у崟id',
sales_ledger_product_id bigint not null default 0 comment '閲囪喘浜у搧id',
+ return_quantity decimal(16, 4) not null default 0 comment '閫�璐ф暟閲�',
create_time datetime null comment '褰曞叆鏃堕棿',
update_time datetime null comment '鏇存柊鏃堕棿',
index idx_purchase_return_order_id (purchase_return_order_id),
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
index 30fbb84..e3b1e8b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrderProductsController.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.controller;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -9,10 +10,11 @@
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-03-09 01:37:44
+ * @since 2026-03-10 04:45:35
*/
@RestController
@RequestMapping("/purchaseReturnOrderProducts")
+@Api(tags = "閲囪喘閫�璐т骇鍝�")
public class PurchaseReturnOrderProductsController {
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index 67273d1..1e56411 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -9,6 +9,7 @@
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +23,7 @@
*/
@RestController
@RequestMapping("/purchaseReturnOrders")
+@Api(tags = "閲囪喘閫�璐у崟")
public class PurchaseReturnOrdersController {
@Autowired
private PurchaseReturnOrdersService purchaseReturnOrdersService;
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java
index d6580d4..f4ab57b 100644
--- a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrderProductsMapper.java
@@ -10,7 +10,7 @@
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-03-09 01:37:44
+ * @since 2026-03-10 04:45:35
*/
@Mapper
public interface PurchaseReturnOrderProductsMapper extends BaseMapper<PurchaseReturnOrderProducts> {
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
index 69e141f..da9e769 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
@@ -19,7 +19,7 @@
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-03-09 01:37:44
+ * @since 2026-03-10 04:45:35
*/
@Getter
@Setter
@@ -38,6 +38,9 @@
@ApiModelProperty("閲囪喘浜у搧id")
private Long salesLedgerProductId;
+ @ApiModelProperty("閫�璐ф暟閲�")
+ private BigDecimal returnQuantity;
+
@ApiModelProperty("褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@@ -45,7 +48,4 @@
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
-
- @ApiModelProperty("閫�璐ф暟閲�")
- private BigDecimal num;
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index 821347d..3de6e3d 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -7,7 +7,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -48,7 +51,8 @@
private Integer projectPhase;
@ApiModelProperty("鍒跺崟鏃ユ湡")
- private LocalDateTime preparedAt;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate preparedAt;
@ApiModelProperty("鍒跺崟浜篿d")
private Long preparedUserId;
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java
index 0997d13..7cb76ad 100644
--- a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrderProductsService.java
@@ -9,7 +9,7 @@
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-03-09 01:37:44
+ * @since 2026-03-10 04:45:35
*/
public interface PurchaseReturnOrderProductsService extends IService<PurchaseReturnOrderProducts> {
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java
index a6da982..8edd3e9 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrderProductsServiceImpl.java
@@ -12,7 +12,7 @@
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-03-09 01:37:44
+ * @since 2026-03-10 04:45:35
*/
@Service
public class PurchaseReturnOrderProductsServiceImpl extends ServiceImpl<PurchaseReturnOrderProductsMapper, PurchaseReturnOrderProducts> implements PurchaseReturnOrderProductsService {
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
index d0ab7ea..37c2f5b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -38,9 +38,11 @@
@Transactional(rollbackFor = Exception.class)
public Boolean add(PurchaseReturnOrderDto purchaseReturnOrderDto) {
this.save(purchaseReturnOrderDto);
- if (purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
+ if (!purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos().isEmpty()) {
for (PurchaseReturnOrderProductsDto purchaseReturnOrderProductsDto :purchaseReturnOrderDto.getPurchaseReturnOrderProductsDtos()) {
+ purchaseReturnOrderProductsDto.setSalesLedgerProductId(purchaseReturnOrderProductsDto.getSalesLedgerProductId());
purchaseReturnOrderProductsDto.setPurchaseReturnOrderId(purchaseReturnOrderDto.getId());
+ purchaseReturnOrderProductsDto.setReturnQuantity(purchaseReturnOrderProductsDto.getReturnQuantity());
purchaseReturnOrderProductsMapper.insert(purchaseReturnOrderProductsDto);
}
}
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml
index e77fdf0..9ae589f 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrderProductsMapper.xml
@@ -7,9 +7,9 @@
<id column="id" property="id" />
<result column="purchase_return_order_id" property="purchaseReturnOrderId" />
<result column="sales_ledger_product_id" property="salesLedgerProductId" />
+ <result column="return_quantity" property="returnQuantity" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="num" property="num" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index b45878c..14f0a37 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -31,20 +31,21 @@
<result column="tenant_id" property="tenantId" />
</resultMap>
<select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
- select st.*,
- su.nick_name assessmentUserName,
- count(std.id) nums
- from safe_training st
- left join safe_training_details std on std.safe_training_id = st.id
- left join sys_user su on st.assessment_user_id = su.user_id
- where st.state = #{c.state}
- GROUP BY st.id
+ SELECT
+ st.*,
+ su.nick_name AS assessmentUserName,
+ COUNT(std.id) AS nums
+ FROM safe_training st
+ LEFT JOIN safe_training_details std ON std.safe_training_id = st.id
+ LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id
+ WHERE st.state = #{c.state}
<if test="c.placeTraining != null and c.placeTraining != ''">
- and st.place_training like concat('%', #{c.placeTraining}, '%')
+ AND st.place_training LIKE CONCAT('%', #{c.placeTraining}, '%')
</if>
<if test="c.trainingDate != null ">
- and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
+ AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
</if>
+ GROUP BY st.id, su.nick_name
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
select st.*,
--
Gitblit v1.9.3