From 6c65bc2938ad7ab83166074022b332c65c9f0371 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 28 六月 2025 10:55:30 +0800
Subject: [PATCH] 2025-06-27 bug修改
---
src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java | 9 +++++++++
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 2 ++
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 3 ++-
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 1 +
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 3 +++
doc/add.sql | 3 +++
6 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/doc/add.sql b/doc/add.sql
index 2803cae..6a41119 100644
--- a/doc/add.sql
+++ b/doc/add.sql
@@ -68,3 +68,6 @@
modify sale_ledger_id bigint default 0 null comment '閿�鍞彴璐d';
+alter table ticket_registration
+ add enter_date timestamp null;
+
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 9d50979..7b8ceed 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -114,6 +114,7 @@
*/
@GetMapping("/productRecordPage")
public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+
IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
return AjaxResult.success(list);
}
diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
index ddd681b..33de871 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -47,6 +50,12 @@
*/
private String businessPerson;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate enterDate;
+
/**
* 涓氬姟鍛榠d
*/
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 7d4f261..6d09179 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -148,4 +148,7 @@
private String issueDateStart;
@TableField(exist = false)
private String issueDateEnd;
+
+ @ApiModelProperty(value = "褰曞叆鏃堕棿")
+ private LocalDate enterDate;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index a8b594d..ee393d0 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -52,6 +52,8 @@
@Override
public IPage<ProductRecordDto> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+ IPage<ProductRecordDto> productRecordDtoIPage1 = productRecordMapper.productRecordPage(page, ticketRegistrationDto);
+ page.setSize(productRecordDtoIPage1.getTotal());
IPage<ProductRecordDto> productRecordDtoIPage = productRecordMapper.productRecordPage(page, ticketRegistrationDto);
productRecordDtoIPage.getRecords().forEach(productRecordDto -> {
productRecordDto.setCommonFiles(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, productRecordDto.getTicketRegistrationId())
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 1039266..ddde6d5 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -136,6 +136,7 @@
ticketRegistration.setIssueDate(ticketRegistrationDto.getIssueDate());
ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
+ ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productData = ticketRegistrationDto.getProductData();
@@ -224,7 +225,7 @@
fileRecord.setName(originalFilename);
fileRecord.setUrl(formalFilePath.toString());
fileRecord.setCreateTime(LocalDateTime.now());
- fileRecord.setType(tempFile.getType());
+ fileRecord.setType(4);
commonFileMapper.insert(fileRecord);
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
--
Gitblit v1.9.3