From e7ac7e5702f6ac1f88403485de232e5494a1c76a Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 11 八月 2025 13:55:57 +0800
Subject: [PATCH] 修改错误日志打印
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjReservationMapper.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjReservationMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjReservationMapper.java
index 58652bf..df60f82 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjReservationMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjReservationMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjReservation;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -22,7 +23,7 @@
* @param id 浣撴棰勭害涓婚敭
* @return 浣撴棰勭害
*/
- public TjReservation selectTjReservationById(Integer id);
+ public TjReservation selectTjReservationById(String id);
/**
* 鏌ヨ浣撴棰勭害鍒楄〃
@@ -72,4 +73,25 @@
@Select("SELECT * FROM tj_reservation WHERE deleted = 1")
public List<TjReservation> selectTjReservationByDelete();
+
+
+ @Select("SELECT * FROM (\n" +
+ "SELECT a.id_card,a.pac_id,a.company,a.company_id,a.team_no,a.grouping_id FROM tj_reservation a WHERE a.deleted=0 AND a.company_id=#{compId} \n" +
+ "UNION\n" +
+ "SELECT c.cus_idcard id_card, o.pac_id pac_id,o.firm_name company,o.firm_id company_id,o.firm_id team_no,IFNULL(o.pac_id,o.group_id) grouping_id FROM tj_order o " +
+ "JOIN tj_customer c ON c.cus_id=o.user_id WHERE o.deleted=0 AND o.firm_id=#{compId} AND o.tj_type=1 AND o.pac_id !=0) aa GROUP BY aa.id_card")
+ List<TjReservation> getFirimSfList(String compId);
+
+
+ @Select("SELECT * FROM (\n" +
+ "SELECT a.`name`,a.phoe,a.sex, a.id_card,a.pac_id,a.company,a.company_id,a.team_no,a.grouping_id FROM tj_reservation a " +
+ "WHERE a.deleted=0 AND (a.team_no=#{teamNo} or a.company_id=#{teamNo}) AND a.pac_id=#{pacId}\n" +
+ "UNION\n" +
+ "SELECT c.cus_name name,c.cus_phone phone,c.cus_sex sex,c.cus_idcard id_card, o.pac_id pac_id,o.firm_name company,o.firm_id company_id,o.order_id team_no,IFNULL(o.pac_id,o.group_id) grouping_id FROM " +
+ "tj_order o \n" +
+ "JOIN tj_customer c ON c.cus_id=o.user_id WHERE o.deleted=0" +
+ " AND (o.firm_id=(SELECT DISTINCT r.company_id FROM tj_reservation r " +
+ "WHERE r.deleted=0 AND ( r.team_no=#{teamNo} or r.company_id=#{teamNo})) or o.firm_id=#{teamNo}) \n" +
+ "AND o.tj_type=1 AND o.pac_id =#{pacId}) aa GROUP BY aa.id_card;")
+ List<TjReservation> getTeamTjPeopleList(@Param("teamNo") String teamNo,@Param("pacId") String pacId);
}
--
Gitblit v1.8.0