From e6eb8c14f98921ba73a7efdfc1415c6483dc4112 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 18 七月 2025 14:34:46 +0800 Subject: [PATCH] 查询时间范围条件 --- ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml | 1 + ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 2 +- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 19 +++++++++++++++++-- 3 files changed, 19 insertions(+), 3 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 da20150..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; /** * 鐧诲綍鏂规硶 @@ -103,8 +108,18 @@ 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 AjaxResult.error("鐧诲綍澶辫触!"); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java index 3a4d61f..5349c71 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java @@ -108,7 +108,7 @@ List<Map<String ,Object >> getCusInfoList(@Param("card") String card,@Param("time") Date time); - List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name); + List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name,@Param("time") Date time); @Select("SELECT IF(b.cus_sex=0,'0','1') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" + diff --git a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml index b4f1898..edf3ce8 100644 --- a/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml +++ b/ltkj-hosp/src/main/resources/mapper/TjCustomerMapper.xml @@ -309,6 +309,7 @@ LEFT JOIN tj_report r ON o.tj_number = r.tj_number WHERE c.cus_idcard = #{card} AND c.cus_name = #{name} AND c.deleted = 0 + and o.create_time > #{time} ORDER BY o.create_time DESC </select> -- Gitblit v1.8.0