From ad2ac68dbc8499f3294390ee37756cd66f1fd601 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 09 七月 2025 09:29:42 +0800
Subject: [PATCH] yys 修改类名，字段名，增加修改字段信息
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 4
src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java | 4
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java | 10 +--
src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java | 5 -
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java | 23 +++++--
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 4
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 2
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 60 ++++++++++---------
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 24 +++++--
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 2
10 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 8009463..122d4b8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -47,7 +47,7 @@
*/
@Excel(name = "鍏ュ簱鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
+ private LocalDateTime createTime;
/**
* 鍑哄叆搴撶敤鎴�
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index b0d8cad..62fd6f7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -27,7 +27,7 @@
*/
@Excel(name = "鍑哄簱鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
+ private LocalDateTime createTime;
/**
* 鍑哄叆搴撶敤鎴�
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
index c472256..4121aa8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java
@@ -1,12 +1,11 @@
package com.ruoyi.procurementrecord.mapper;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.procurementrecord.dto.ProcurementDto;
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecord;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -15,7 +14,7 @@
* @author :yys
* @date : 2025/7/7 14:30
*/
-public interface ProcurementRecordMapper extends BaseMapper<ProcurementRecord> {
+public interface ProcurementRecordMapper extends BaseMapper<ProcurementRecordStorage> {
/**
* 鏍规嵁閲囪喘鍙拌处id鏌ヨ閲囪喘鍏ュ簱淇℃伅
*
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index e4761a2..07db479 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -44,19 +44,28 @@
private BigDecimal inboundNum;
/**
- * 鍑哄嚭搴撴椂闂�
- */
- private LocalDateTime createDate;
-
- /**
* 鍑哄嚭搴撶敤鎴�
*/
private String createBy;
+ /**
+ * 鍏ュ簱鐢ㄦ埛id
+ */
+ private Long createUser;
/**
- * 鍑哄嚭搴撶敤鎴穒d
+ * 鍏ュ簱鏃堕棿
*/
- private Integer userId;
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鑰�
+ */
+ private Long updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
/**
* 绉熸埛ID
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecord.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
similarity index 79%
rename from src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecord.java
rename to src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index 562e1fe..890dde6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecord.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -16,7 +16,7 @@
@TableName("procurement_record_storage")
@Data
@Builder
-public class ProcurementRecord {
+public class ProcurementRecordStorage {
private static final long serialVersionUID = 1L;
@@ -39,11 +39,6 @@
private BigDecimal inboundNum;
/**
- * 鍏ュ簱鏃堕棿
- */
- private LocalDateTime createDate;
-
- /**
* 鍏ュ簱鐢ㄦ埛
*/
private String createBy;
@@ -51,7 +46,22 @@
/**
* 鍏ュ簱鐢ㄦ埛id
*/
- private Long userId;
+ private Long createUser;
+
+ /**
+ * 鍏ュ簱鏃堕棿
+ */
+ private LocalDateTime createTime;
+
+ /**
+ * 淇敼鑰�
+ */
+ private Long updateUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ private LocalDateTime updateTime;
/**
* 绉熸埛ID
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
index d0806c4..41a2f44 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
@@ -7,7 +7,7 @@
import com.ruoyi.procurementrecord.dto.ProcurementDto;
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecord;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -16,7 +16,7 @@
* @author :yys
* @date : 2025/7/7 14:36
*/
-public interface ProcurementRecordService extends IService<ProcurementRecord> {
+public interface ProcurementRecordService extends IService<ProcurementRecordStorage> {
List<ProcurementDto> listProcurementBySalesLedgerId(ProcurementDto procurementDto);
int add(ProcurementAddDto procurementDto);
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index 078d8f9..a561187 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -4,15 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecord;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
import com.ruoyi.project.system.domain.SysUser;
@@ -56,9 +52,11 @@
.salesLedgerProductId(procurementRecordOutAdd.getSalesLedgerProductId())
.inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
.inboundNum(new BigDecimal(procurementRecordOutAdd.getQuantity()))
- .createDate(LocalDateTime.now())
- .userId(procurementRecordOutAdd.getUserId())
+ .createTime(LocalDateTime.now())
+ .createUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
.createBy(sysUser.getNickName())
+ .updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
+ .updateTime(LocalDateTime.now())
.tenantId(sysUser.getTenantId());
this.save(procurementRecordOut.build());
return 0;
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 5590a6c..92ef336 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -10,12 +10,10 @@
import com.ruoyi.procurementrecord.dto.*;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecord;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
-import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -34,7 +32,7 @@
@Service
@RequiredArgsConstructor
@Slf4j
-public class ProcurementRecordServiceImpl extends ServiceImpl<ProcurementRecordMapper, ProcurementRecord> implements ProcurementRecordService {
+public class ProcurementRecordServiceImpl extends ServiceImpl<ProcurementRecordMapper, ProcurementRecordStorage> implements ProcurementRecordService {
private final ProcurementRecordMapper procurementRecordMapper;
@@ -51,16 +49,16 @@
if(CollectionUtils.isEmpty( collect)){
return procurementDtos;
}
- LambdaQueryWrapper<ProcurementRecord> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- procurementRecordLambdaQueryWrapper.in(ProcurementRecord::getSalesLedgerProductId, collect);
- List<ProcurementRecord> procurementRecords = procurementRecordMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ procurementRecordLambdaQueryWrapper.in(ProcurementRecordStorage::getSalesLedgerProductId, collect);
+ List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordMapper.selectList(procurementRecordLambdaQueryWrapper);
+ if(CollectionUtils.isEmpty(procurementRecordStorages)){
return procurementDtos;
}
for (ProcurementDto dto : procurementDtos) {
// 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍏ュ簱璁板綍
- List<ProcurementRecord> collect1 = procurementRecords.stream()
- .filter(procurementRecord -> procurementRecord.getSalesLedgerProductId().equals(dto.getId()))
+ List<ProcurementRecordStorage> collect1 = procurementRecordStorages.stream()
+ .filter(procurementRecordStorage -> procurementRecordStorage.getSalesLedgerProductId().equals(dto.getId()))
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫叆搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
@@ -71,7 +69,7 @@
// 璁＄畻宸插叆搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭叆搴撴暟閲�
BigDecimal totalInboundNum = collect1.stream()
- .map(ProcurementRecord::getInboundNum)
+ .map(ProcurementRecordStorage::getInboundNum)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 寰呭叆搴撴暟閲� = 鎬绘暟閲� - 宸插叆搴撴暟閲�
@@ -80,33 +78,35 @@
return procurementDtos;
}
- public ProcurementRecord getProcurementRecordById(Integer id){
- ProcurementRecord procurementRecord = procurementRecordMapper.selectById(id);
- if(procurementRecord == null) {
+ public ProcurementRecordStorage getProcurementRecordById(Integer id){
+ ProcurementRecordStorage procurementRecordStorage = procurementRecordMapper.selectById(id);
+ if(procurementRecordStorage == null) {
throw new RuntimeException("鏈壘鍒拌閲囪喘鍏ュ簱璁板綍");
}
- return procurementRecord;
+ return procurementRecordStorage;
}
- public List<ProcurementRecord> getProcurementRecordByIds(List<Integer> id){
- List<ProcurementRecord> procurementRecord = procurementRecordMapper.selectBatchIds(id);
- if(procurementRecord == null) {
+ public List<ProcurementRecordStorage> getProcurementRecordByIds(List<Integer> id){
+ List<ProcurementRecordStorage> procurementRecordStorage = procurementRecordMapper.selectBatchIds(id);
+ if(procurementRecordStorage == null) {
throw new RuntimeException("鏈壘鍒拌閲囪喘鍏ュ簱璁板綍");
}
- return procurementRecord;
+ return procurementRecordStorage;
}
@Override
public int updatePro(ProcurementUpdateDto procurementDto) {
- ProcurementRecord procurementRecordById = getProcurementRecordById(procurementDto.getId());
- procurementRecordById.setInboundNum(procurementDto.getQuantityStock());
- return procurementRecordMapper.updateById(procurementRecordById);
+ ProcurementRecordStorage procurementRecordStorageById = getProcurementRecordById(procurementDto.getId());
+ procurementRecordStorageById.setInboundNum(procurementDto.getQuantityStock());
+ procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId());
+ procurementRecordStorageById.setUpdateTime(LocalDateTime.now());
+ return procurementRecordMapper.updateById(procurementRecordStorageById);
}
@Override
public int deletePro(ProcurementUpdateDto procurementDto) {
- List<ProcurementRecord> procurementRecordById = getProcurementRecordByIds(procurementDto.getIds());
- procurementRecordMapper.deleteBatchIds(procurementRecordById.stream().map(ProcurementRecord::getId).collect(Collectors.toList()));
+ List<ProcurementRecordStorage> procurementRecordStorageById = getProcurementRecordByIds(procurementDto.getIds());
+ procurementRecordMapper.deleteBatchIds(procurementRecordStorageById.stream().map(ProcurementRecordStorage::getId).collect(Collectors.toList()));
// 鍒犻櫎鎵�鏈夊搴旂殑鍑哄簱璁板綍
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordOutLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordOutLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, procurementDto.getIds());
@@ -130,16 +130,18 @@
// 鎵归噺鏂板
for (Details detail : procurementDto.getDetails()) {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
- LambdaQueryWrapper<ProcurementRecord> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- procurementRecordLambdaQueryWrapper.eq(ProcurementRecord::getSalesLedgerProductId, detail.getId());
+ LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ procurementRecordLambdaQueryWrapper.eq(ProcurementRecordStorage::getSalesLedgerProductId, detail.getId());
Long aLong = procurementRecordMapper.selectCount(procurementRecordLambdaQueryWrapper);
- ProcurementRecord.ProcurementRecordBuilder procurementRecordBuilder = ProcurementRecord.builder()
+ ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
.salesLedgerProductId(detail.getId())
.inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
.inboundNum(detail.getInboundQuantity())
- .createDate(LocalDateTime.now())
- .userId(loginUser.getUserId())
+ .createTime(LocalDateTime.now())
+ .createUser(loginUser.getUserId())
+ .updateTime(LocalDateTime.now())
+ .updateUser(loginUser.getUserId())
.tenantId(loginUser.getTenantId())
.createBy(procurementDto.getNickName());
this.save(procurementRecordBuilder.build());
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index cf76a56..3548891 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -42,7 +42,7 @@
t1.inbound_batches,
t1.inbound_num,
t1.inbound_num as inboundNum0,
- t1.create_date,
+ t1.create_time,
t1.create_by
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
@@ -70,7 +70,7 @@
t2.tax_exclusive_total_price,
t1.inbound_batches,
t1.inbound_num,
- t1.create_date,
+ t1.create_time,
t1.create_by
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 8c35ffc..4b8416e 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -14,7 +14,7 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_num,
- t1.create_date,
+ t1.create_time,
t1.create_by
from procurement_record_out t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
@@ -38,7 +38,7 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_num,
- t1.create_date,
+ t1.create_time,
t1.create_by
from procurement_record_out t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
--
Gitblit v1.9.3