From 859eea0afc1a0ed9a61b0908203bda0c301419bf Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 06 六月 2023 08:38:11 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/boying/controller/phone/TicketController.java |   72 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 18be733..b05ef68 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -10,15 +10,14 @@
 import com.boying.entity.*;
 import com.boying.service.*;
 import com.boying.util.DateUtilOther;
+import com.boying.util.NumberToCN;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
@@ -28,10 +27,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.util.*;
 
 @RestController
-@RequestMapping("ticket")
+@RequestMapping("ffzf/ticket")
 @RequiredArgsConstructor
 public class TicketController{
 
@@ -68,23 +68,16 @@
     }
 
     @PostMapping("findPage")
-    public Object findPage(Page page, Integer type){
-        if(type==null){
-            QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
-            wrapper.lambda()
-                    .eq(Ticket::getType,1)
-                    .orderByDesc(Ticket::getId);
-            return R.ok(ticketService.page(page, wrapper));
-        }else{
-            QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
-            wrapper.lambda()
-                    .eq(Ticket::getType,type)
-                    .orderByDesc(Ticket::getId);
-            return R.ok(ticketService.page(page, wrapper));
-        }
-
+    public Object findPage(Page page, Ticket ticket){
+        QueryWrapper<Ticket> wrapper =  new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
+                .eq(ticket.getType() != null,Ticket::getType,ticket.getType())
+                .eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
+                .eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())
+                .orderByDesc(Ticket::getCreateTime);
+        return R.ok(ticketService.page(page, wrapper));
     }
-
 
     @PostMapping("/save")
     public Object save(Ticket ticket,HttpServletRequest request) throws IOException{
@@ -160,12 +153,36 @@
         return R.ok(ticket);
     }
 
+    /**
+     * 閫氳繃id鏌ヨ绁ㄦ嵁琛�
+     * @param id id
+     * @return R
+     */
+    @ApiOperation(value = "閫氳繃id鏌ヨ", notes = "閫氳繃id鏌ヨ")
+    @GetMapping("/{id}" )
+    public R getById(@PathVariable("id" ) Integer id) {
+        Ticket byId = ticketService.getById(id);
+        byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+        return R.ok(byId);
+    }
+
+
     @PostMapping("/delete")
     public Object delete(Long id){
         Ticket ticket =ticketService.getById(id);
         ticket.setStatus(3);
         ticketService.saveOrUpdate(ticket);
         return R.ok("鎿嶄綔鎴愬姛");
+    }
+
+    @PostMapping("/updateById")
+    public Object updateById(Ticket ticket){
+        if(ticket.getMoney() >0){
+            BigDecimal numberOfMoney = new BigDecimal(ticket.getMoney()+"");
+            String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
+            ticket.setMoneyStr(s.toString());
+        }
+        return R.ok(ticketService.updateById(ticket));
     }
 
     public void saveLogo(String name,String lng,String lat){
@@ -298,4 +315,17 @@
         }
         return R.ok(ticket);
     }
+
+    /**
+     * 鎵嬪姩缂磋垂
+     * @param id id
+     * @return R
+     */
+    @ApiOperation(value = "鎵嬪姩缂磋垂", notes = "鎵嬪姩缂磋垂")
+    @PostMapping("/jiaofei" )
+    public R jiaofei(Integer id) {
+        Ticket byId = ticketService.getById(id);
+        byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+        return R.ok(byId);
+    }
 }

--
Gitblit v1.9.1