From 0b348e38b0f7139ca5e205ceadd2501f90de94f9 Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 9 Jul 2024 15:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/dangan/DaBirthDjMapper.xml | 8 ++++---- .../resources/mapper/dangan/DaCzrkdjMapper.xml | 18 ++++++++++-------- .../mapper/dangan/DaPicturesRecardMapper.xml | 1 + .../resources/mapper/dangan/DaQyzMapper.xml | 13 ++++++++++--- .../resources/mapper/dangan/DaYtzmMapper.xml | 8 ++++---- .../mapper/dangan/DaZfnyhkcgMapper.xml | 6 +++--- .../resources/mapper/dangan/DaZqzMapper.xml | 6 ++++-- 7 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index 7ec7468..1405f47 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -58,16 +58,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and b.mu_id = #{muId} and mu_path = #{muPath} - and birth_num = #{birthNum} + and birth_num like concat('%', #{birthNum}, '%') and (name like concat('%', #{name}, '%') or m_name like concat('%', #{name}, '%') or f_name like concat('%', #{name}, '%') ) - and birthday = #{birthday} + and birthday like concat('%', #{birthday}, '%') and sex = #{sex} - and born_address = #{bornAddress} + and born_address like concat('%', #{bornAddress}, '%') and m_name like concat('%', #{mName}, '%') and m_age = #{mAge} and m_gj = #{mGj} @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and home_address = #{homeAddress} and mom_sign = #{momSign} and jsry_sign = #{jsrySign} - and js_unit = #{jsUnit} + and js_unit like concat('%', #{jsUnit}, '%') and dj_type = #{djType} and pic_ids = #{picIds} and pictures = #{pictures} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index 9db2c47..986358e 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -97,10 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and jhr2 = #{jhr2} and jhgx2 = #{jhgx2} and gmcszqfrq = #{gmcszqfrq} - and birthday = #{birthday} + + and birthday like concat('%', #{birthday}, '%') and address = #{address} and yj = #{yj} - and nation = #{nation} + and nation like concat('%', #{nation}, '%') and zjxy = #{zjxy} and whcd = #{whcd} and hyzk = #{hyzk} @@ -127,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sljmsfzqm = #{sljmsfzqm} and qfyj = #{qfyj} and yxrq = #{yxrq} - and card_id = #{cardId} + and card_id concat('%', #{cardId}, '%') and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} @@ -163,15 +164,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and other_name like concat('%', #{otherName}, '%') and used_name like concat('%', #{usedName}, '%') and sex = #{sex} - and jhr1 = #{jhr1} + and jhr1 like concat('%', #{jhr1}, '%') and jhgx1 = #{jhgx1} - and jhr2 = #{jhr2} + and jhr2 like concat('%', #{jhr2}, '%') and jhgx2 = #{jhgx2} and gmcszqfrq = #{gmcszqfrq} - and birthday = #{birthday} + + and birthday like concat('%', #{birthday}, '%') and address = #{address} and yj = #{yj} - and nation = #{nation} + and nation like concat('%', #{nation}, '%') and zjxy = #{zjxy} and whcd = #{whcd} and hyzk = #{hyzk} @@ -198,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sljmsfzqm = #{sljmsfzqm} and qfyj = #{qfyj} and yxrq = #{yxrq} - and card_id = #{cardId} + and card_id concat('%', #{cardId}, '%') and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml index 7dbea7d..4caa2d1 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml @@ -42,6 +42,7 @@ and yw_type = #{ywType} and recognize = #{recognize} and error_correct = #{errorCorrect} + and create_time = #{createTime} order by id DESC diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml index 5d3ebde..3b93aad 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml @@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and q.mu_id = #{muId} and mu_path = #{muPath} - and fw_unit = #{fwUnit} - and wj_xh = #{wjXh} + and fw_unit like concat('%', #{fwUnit}, '%') + and wj_xh like concat('%', #{wjXh}, '%') and ( name1 like concat('%', #{name1}, '%') or name2 like concat('%', #{name1}, '%') @@ -69,7 +69,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) and sex1 = #{sex1} - and card_id1 = #{cardId1} + + /*and (card_id1 like concat('%', #{cardId1}, '%') + or cardId2 like concat('%', #{cardId1}, '%') + or cardId3 like concat('%', #{cardId1}, '%') + or cardId4 like concat('%', #{cardId1}, '%') + )*/ + and card_id1 like concat('%', #{cardId1}, '%') + and name2 = #{name2} and sex2 = #{sex2} and card_id2 = #{cardId2} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml index b0a1840..e31465e 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml @@ -55,8 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and y.mu_id = #{muId} and mu_path = #{muPath} - and year = #{year} - and xh = #{xh} + and year like concat('%', #{year}, '%') + and xh like concat('%', #{xh}, '%') and ( w_name like concat('%', #{wName}, '%') or m_name like concat('%', #{wName}, '%') @@ -67,8 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and m_name like concat('%', #{mName}, '%') and m_unit = #{mUnit} and m_card_id = #{mCardId} - and syzh = #{syzh} - and birthday = #{birthday} + and syzh like concat('%', #{syzh}, '%') + and birthday like concat('%', #{birthday}, '%') and hospital = #{hospital} and baby_sex = #{babySex} and suggest = #{suggest} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml index 73f3307..0280ffd 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and z.mu_id = #{muId} and mu_path = #{muPath} - and num = #{num} + and num like concat('%', #{num}, '%') and ( name like concat('%', #{name}, '%') or name1 like concat('%', #{name}, '%') @@ -89,8 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and sex5 = #{sex5} and jg1 = #{jg1} and jg2 = #{jg2} - and cbr = #{cbr} - and cb_date = #{cbDate} + and cbr like concat('%', #{cbr}, '%') + and cb_date like concat('%', #{cbDate}, '%') and pic_ids = #{picIds} and pictures = #{pictures} and all_pic_ids = #{allPicIds} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index 5661952..3977db0 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and yw_type = #{ywType} and z.mu_id = #{muId} and mu_path = #{muPath} - and num = #{num} + and num like concat('%',#{num}, '%') and ( name like concat('%', #{name}, '%') or name1 like concat('%', #{name}, '%') @@ -79,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or name4 like concat('%', #{name}, '%') ) - and card_id = #{cardId} + + and card_id like concat('%', #{cardId}, '%') + and address = #{address} and dj_jg = #{djJg} and relation1 = #{relation1}