From 7a98433ec5be6fe652e9100d1742cd382dcd3927 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 30 七月 2025 17:05:13 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java | 11 +++++++++--
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 1 +
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 8 ++++----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index d3c4bed..af0f61b 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -85,6 +85,7 @@
SysUser sysUser = sysUserMapper.selectUserById(afterSalesService.getDisposeUserId());
if(sysUser == null) throw new RuntimeException("澶勭悊浜轰笉瀛樺湪");
afterSalesService.setDisposeNickName(sysUser.getNickName());
+ afterSalesService.setStatus(2);
boolean update = afterSalesServiceService.updateById(afterSalesService);
return update ? AjaxResult.success() : AjaxResult.error();
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index 7605ef9..f8c459d 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -1,13 +1,16 @@
package com.ruoyi.aftersalesservice.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* @author :yys
@@ -75,13 +78,17 @@
* 鍙嶉鏃ユ湡
*/
@ApiModelProperty("鍙嶉鏃ユ湡")
- private LocalDate feedbackDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date feedbackDate;
/**
* 澶勭悊鏃ユ湡
*/
@ApiModelProperty("澶勭悊鏃ユ湡")
- private LocalDate disDate;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date disDate;
/**
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 17419a4..21f05f0 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -5,11 +5,11 @@
<select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
select * from after_sales_service
where 1 = 1
- <if test="req.feedbackDate != null and req.feedbackDate != ''">
- and feedback_date like concat('%', #{req.feedbackDate}, '%')
+ <if test="req.feedbackDate != null">
+ AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
</if>
- <if test="req.disDate != null and req.disDate != ''">
- and dis_date like concat('%', #{req.disDate}, '%')
+ <if test="req.disDate != null">
+ AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
</if>
<if test="req.tenantId != null and req.tenantId != ''">
and tenant_id = #{req.tenantId}
--
Gitblit v1.9.3