From 2960519845a4a8a86e62859de4a022f016833248 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Fri, 29 Nov 2024 16:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/audit/controller/AuditController.java   | 12 +++++++++++-
 .../src/main/java/com/example/audit/mapper/AuditMapper.java  |  6 +++---
 .../java/com/example/audit/service/AuditServiceImpl.java     |  2 +-
 .../java/com/example/commons/domain/entity/Activity.java     |  3 +++
 .../java/com/example/recharge/mapper/ActivityMapper.java     |  3 +--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/demo/audit/src/main/java/com/example/audit/controller/AuditController.java b/demo/audit/src/main/java/com/example/audit/controller/AuditController.java
index c6bd8d1..e7c847a 100644
--- a/demo/audit/src/main/java/com/example/audit/controller/AuditController.java
+++ b/demo/audit/src/main/java/com/example/audit/controller/AuditController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
 
 @RestController
-@RequestMapping("/recharge/audit")
+@RequestMapping("/audit/audit")
 @RequiredArgsConstructor
 @Slf4j
 @CrossOrigin
@@ -29,6 +29,16 @@ public class AuditController {
             return Result.error(e.getMessage());
         }
     }
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Audit audit){
+        try {
+        auditService.edit(audit);
+        return Result.success();
+        }catch (Exception e){
+            log.warn(Arrays.toString(e.getStackTrace()));
+            return Result.error(e.getMessage());
+        }
+    }
     @PostMapping
     public Result search(@RequestBody Page page){
         if(ObjectUtils.isEmpty(page.getPageNum())){
diff --git a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
index fc630df..ea0b7fd 100644
--- a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
+++ b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java
@@ -22,10 +22,10 @@ public interface AuditMapper {
             "<script>",
             "update audit",
             "<set>",
-            "<if test='status!=null'> and status=#{status}</if>",
+            "<if test='status!=null'>status=#{status}</if>",
             "</set>",
-            "where admin_id=#{adminId}",
-            "<script>"
+            "where audit_id=#{auditId}",
+            "</script>"
     })
     int update(Audit audit);
 
diff --git a/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java b/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java
index 6fd9523..87fbd79 100644
--- a/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java
+++ b/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java
@@ -24,7 +24,7 @@ public class AuditServiceImpl implements AuditService {
 
     @Override
     public int edit(Audit audit) {
-        return 0;
+        return auditMapper.update(audit);
     }
 
     @Override
diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java
index 774956b..e03968d 100644
--- a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java
+++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 
@@ -21,5 +22,7 @@ public class Activity {
 
     private String name;
     private Integer status;
+    private Date startDate;
+    private Date endDate;
 
 }
diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
index 3cd970d..0afeaf2 100644
--- a/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
+++ b/demo/recharge/src/main/java/com/example/recharge/mapper/ActivityMapper.java
@@ -52,8 +52,7 @@ public interface ActivityMapper {
             "inner join admin on activity.admin_id=admin.admin_id ",
             "<where>",
             "`activity_flag`=1",
-            "<if test='startTime!=null'>start_time=#{startTime}</if>",
-            "<if test='endTime!=null'>and end_time=#{endTime}</if>",
+            "<if test='startDate != null and endDate != null'>AND activity.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='activityName!=null'>and activity_name like concat('%',#{activityName},'%')</if>",
             "</where>",
             "</script>"