添加后端查询条件 前端excel导出

@@ -47,8 +47,9 @@ public class PayOrderController {
                                          @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
                                          @RequestParam(value = "pageNum", required = false, defaultValue = "5") int pageNum,
                                          @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                          @RequestParam(value = "orderNumber", required = false) String orderNumber,
                                          @RequestParam(value = "payTime", required = false) String payTime,
                                          @RequestParam(value = "payTime", required = false) String payTime,
-                                         @RequestParam(value = "username", required = false) String username) {
-        PageInfo<PayRecords> order = payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime, username);
+                                         @RequestParam(value = "username", required = false) String username,
+                                         @RequestParam(value = "payType", required = false) String payType) {
+        PageInfo<PayRecords> order = payOrderService.getOrder(pageSize, pageNum, orderNumber, payTime, username, payType);
         return order;
         return order;
     }
     }
 
 

@@ -21,7 +21,8 @@ public interface PayRecordsMapper {
     List<PayRecords> findAll(@Param(value = "orderNumber") String orderNumber,
     List<PayRecords> findAll(@Param(value = "orderNumber") String orderNumber,
                              @Param(value = "startTime") String startTime,
                              @Param(value = "startTime") String startTime,
                              @Param(value = "endTime") String endTime,
                              @Param(value = "endTime") String endTime,
-                             @Param(value = "username") String username);
+                             @Param(value = "username") String username,
+                             @Param(value = "payType") String payType);
 
 
     String findOrderNumber(String orderId);
     String findOrderNumber(String orderId);
 
 

@@ -2,7 +2,9 @@ package com.sunyo.energy.location.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 
+import java.beans.SimpleBeanInfo;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 
 
 public class PayRecords {
 public class PayRecords {
@@ -39,6 +41,14 @@ public class PayRecords {
 
 
     private String paytypeaddress;
     private String paytypeaddress;
 
 
+    private String stringType;
+
+    private String stringStatus;
+
+    private String stringReamke3;
+
+    private String stringDate;
+
     public Integer getId() {
     public Integer getId() {
         return id;
         return id;
     }
     }
@@ -167,4 +177,52 @@ public class PayRecords {
     public void setPaytypeaddress(String paytypeaddress) {
     public void setPaytypeaddress(String paytypeaddress) {
         this.paytypeaddress = paytypeaddress == null ? null : paytypeaddress.trim();
         this.paytypeaddress = paytypeaddress == null ? null : paytypeaddress.trim();
     }
     }
+
+    public String getStringType() {
+        if (getPaytype()){
+            return stringReamke3 = "电";
+        }else {
+            return stringReamke3 = "水";
+        }
+    }
+
+    public void setStringType(String stringType) {
+        this.stringType = stringType;
+    }
+
+    public String getStringStatus() {
+        if (getPaystatus()){
+            return stringReamke3 = "支付成功";
+        }else {
+            return stringReamke3 = "支付失败";
+        }
+    }
+
+    public void setStringStatus(String stringStatus) {
+        this.stringStatus = stringStatus;
+    }
+
+    public String getStringReamke3() {
+        if ("1".equals(getReamke3())){
+            return stringReamke3 = "充值成功";
+        }else {
+            return stringReamke3 = "充值失败";
+        }
+
+    }
+
+    public void setStringReamke3(String stringReamke3) {
+        this.stringReamke3 = stringReamke3;
+    }
+
+    public String getStringDate() {
+        Date paytime = getPaytime();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format = simpleDateFormat.format(paytime);
+        return format;
+    }
+
+    public void setStringDate(String stringDate) {
+        this.stringDate = stringDate;
+    }
 }
 }

@@ -7,7 +7,7 @@ import com.sunyo.energy.location.model.PayRecords;
  * Created by XYH on 2019/12/16.
  * Created by XYH on 2019/12/16.
  */
  */
 public interface PayOrderService {
 public interface PayOrderService {
-    PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username);
+    PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username, String payType);
 
 
     int addOrder(PayRecords payRecords);
     int addOrder(PayRecords payRecords);
 
 

@@ -23,7 +23,7 @@ public class PayOrderImpl implements PayOrderService {
 
 
 
 
     @Override
     @Override
-    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username) {
+    public PageInfo<PayRecords> getOrder(int pageSize, int pageNum, String orderNumber, String payTime, String username, String payType) {
 
 
         // 开始时间
         // 开始时间
         String startTime = "";
         String startTime = "";
@@ -40,9 +40,9 @@ public class PayOrderImpl implements PayOrderService {
         List<PayRecords> list = new ArrayList<>();
         List<PayRecords> list = new ArrayList<>();
         if ("admin".equals(username)) {
         if ("admin".equals(username)) {
             username = "";
             username = "";
-            list = recordsMapper.findAll(orderNumber, startTime, endTime, username);
+            list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType);
         } else {
         } else {
-            list = recordsMapper.findAll(orderNumber, startTime, endTime, username);
+            list = recordsMapper.findAll(orderNumber, startTime, endTime, username, payType);
         }
         }
 
 
 
 

@@ -241,7 +241,6 @@ public class WaterMeterServiceImp implements WaterMeterService {
         datas.put("Add_sacc", allSacc);
         datas.put("Add_sacc", allSacc);
         datas.put("Add_addmode", "2");
         datas.put("Add_addmode", "2");
         String status = HttpsUtils.httpRequest(payUrl, datas);
         String status = HttpsUtils.httpRequest(payUrl, datas);
-
         datas.put("allSacc", allSacc);
         datas.put("allSacc", allSacc);
         datas.put("status", status);
         datas.put("status", status);
 
 

@@ -47,6 +47,9 @@
         <if test="username != '' and username != null">
         <if test="username != '' and username != null">
             and payLocationName = #{username,jdbcType=VARCHAR}
             and payLocationName = #{username,jdbcType=VARCHAR}
         </if>
         </if>
+        <if test="payType != '' and payType != null">
+            and payType = #{payType, jdbcType=BIT}
+        </if>
         order by payTime desc
         order by payTime desc
     </select>
     </select>