From e6eb8c14f98921ba73a7efdfc1415c6483dc4112 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 18 七月 2025 14:34:46 +0800
Subject: [PATCH] 查询时间范围条件

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index d0b0c52..d888d2b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -1,10 +1,13 @@
 package com.ltkj.web.controller.system;
 
 import java.awt.peer.LabelPeer;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ltkj.common.annotation.RepeatSubmit;
 import com.ltkj.common.core.domain.entity.SysDept;
@@ -81,6 +84,8 @@
     private ITjOrderService tjOrderService;
     @Autowired
     private TjCustomerMapper tjCustomerMapper;
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     /**
      * 鐧诲綍鏂规硶
@@ -98,15 +103,26 @@
         if (loginBody.getMobile()) {
             token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
         } else {
-            token = loginService.Cuslogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
+            token = loginService.Cuslogin(loginBody.getUsername(),loginBody.getSfzh(), loginBody.getPassword(), loginBody.getType(), loginBody.getCode(), loginBody.getUuid());
             LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
             wq.eq(TjCustomer::getCusPhone, loginBody.getUsername());
+            wq.eq(TjCustomer::getCusIdcard, loginBody.getSfzh());
             TjCustomer tjCustomer = customerService.getOne(wq);
-            List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName());
-            ajax.put("orderList",customer);
+            String key = sysConfigService.selectConfigByKey("h5OrXcxQueryDate");
+            if (StrUtil.isBlank(key)){
+                key = "2025-05-01";
+            }
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                Date date = sdf.parse(key);
+                List<Map<String ,Object>> customer = tjCustomerMapper.getCusInfoListByCardAndName(tjCustomer.getCusIdcard(),tjCustomer.getCusName(),date);
+                ajax.put("orderList",customer);
+            } catch (ParseException e) {
+                return AjaxResult.error();
+            }
         }
         if (null == token) {
-            return success("璇ヨ处鍙锋鍦ㄤ娇鐢ㄤ腑");
+            return AjaxResult.error("鐧诲綍澶辫触!");
         }
         ajax.put(Constants.TOKEN, token);
         return ajax;

--
Gitblit v1.8.0