From b3a30267d5fcb3e2a4f19441b8667c728fd28609 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 18 七月 2025 14:37:39 +0800 Subject: [PATCH] 报告弃检重复问题 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 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 06d11c7..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; @@ -16,8 +19,11 @@ import com.ltkj.framework.config.UserHoder; import com.ltkj.hosp.domain.DictHosp; import com.ltkj.hosp.domain.TjCustomer; +import com.ltkj.hosp.domain.TjOrder; +import com.ltkj.hosp.mapper.TjCustomerMapper; import com.ltkj.hosp.service.IDictHospService; import com.ltkj.hosp.service.ITjCustomerService; +import com.ltkj.hosp.service.ITjOrderService; import com.ltkj.system.domain.SysPost; import com.ltkj.system.domain.SysRoleMenu; import com.ltkj.system.domain.SysUserPost; @@ -51,13 +57,10 @@ public class SysLoginController { @Autowired private SysLoginService loginService; - @Autowired private ISysMenuService menuService; - @Autowired private SysPermissionService permissionService; - @Resource private ITjCustomerService customerService; @Resource @@ -77,6 +80,12 @@ private boolean secretKeyLogin; @Autowired private RedisCache redisCache; + @Autowired + private ITjOrderService tjOrderService; + @Autowired + private TjCustomerMapper tjCustomerMapper; + @Autowired + private ISysConfigService sysConfigService; /** * 鐧诲綍鏂规硶 @@ -94,10 +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); + 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