ruanfa
/
dangan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanglei 1 year ago
parent 51857cb6d4 e7ec643a52
commit 6753d9c8c5
7 changed files with 805 additions and 604 deletions
Show Stats Download Patch File Download Diff File

31
dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
Unescape View File

@ -62,9 +62,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="muPath != null and muPath != ''">and mu_path = #{muPath}</if>
<if test="birthNum != null and birthNum != ''">and birth_num like concat('%', #{birthNum}, '%')</if>
<if test="name != null and name != ''">
and (name like concat('%', #{name}, '%')
<!--and (name like concat('%', #{name}, '%')
or m_name like concat('%', #{name}, '%')
or f_name like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(m_name like concat('%', #{name}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
or
(f_name like concat('%', #{name}, '%')OR to_pinyin ( f_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
)
</if>
<if test="birthday != null ">
@ -76,7 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="bornAddress != null and bornAddress != ''"> and born_address like concat('%', #{bornAddress}, '%') </if>
<if test="bornAddress != null and bornAddress != ''">and born_address like concat('%', #{bornAddress},
'%')
</if>
<if test="mName != null and mName != ''">and m_name like concat('%', #{mName}, '%')</if>
<if test="mAge != null and mAge != ''">and m_age = #{mAge}</if>
<if test="mGj != null and mGj != ''">and m_gj = #{mGj}</if>
@ -110,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="userId != null ">and uc.user_id = #{userId}</if>
<if test="name != null and name != ''">
<!--
and (name like concat('%', #{name}, '%')
or m_name like concat('%', #{name}, '%')
or f_name like concat('%', #{name}, '%')
@ -117,6 +130,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or m_card_id like concat('%', #{name}, '%')
or f_card_id like concat('%', #{name}, '%')
)
-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(m_name like concat('%', #{name}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
or
(f_name like concat('%', #{name}, '%')OR to_pinyin ( f_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
or birthday like concat('%', #{name}, '%')
or m_card_id like concat('%', #{name}, '%')
or f_card_id like concat('%', #{name}, '%')
)
</if>
</where>
order by id desc

60
dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
Unescape View File

@ -83,16 +83,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="muPath != null and muPath != ''">and mu_path = #{muPath}</if>
<if test="relation != null and relation != ''">and relation = #{relation}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--and ( name like concat('%', #{name}, '%')
or hz_name like concat('%', #{name}, '%')
or other_name like concat('%', #{name}, '%')
or used_name like concat('%', #{name}, '%')
or jhr1 like concat('%', #{name}, '%')
or jhr2 like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(hz_name like concat('%', #{name}, '%')OR to_pinyin ( hz_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
or
(other_name like concat('%', #{name}, '%')OR to_pinyin ( other_name ) LIKE CONCAT( '%', to_pinyin (
#{name} ), '%' ))
or
(used_name like concat('%', #{name}, '%')OR to_pinyin ( used_name ) LIKE CONCAT( '%', to_pinyin (
#{name} ), '%' ))
or
(jhr1 like concat('%', #{name}, '%')OR to_pinyin ( jhr1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(jhr2 like concat('%', #{name}, '%')OR to_pinyin ( jhr2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
)
</if>
<if test="birthday != null and birthday != ''">
and birthday like concat('%', #{birthday}, '%')
and birthday like concat('%', #{birthday},
</if>
<if test="cardId != null and cardId != ''">
and card_id like concat('%', #{cardId}, '%')
@ -114,13 +133,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zyjfwcs != null and zyjfwcs != ''">and zyjfwcs = #{zyjfwcs}</if>
<if test="bxsqtzz != null and bxsqtzz != ''">and bxsqtzz = #{bxsqtzz}</if>
<if test="gmzdhhmqfjgjrq != null and gmzdhhmqfjgjrq != ''">and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}</if>
<if test="hsyhdqlbxshsdjhk != null and hsyhdqlbxshsdjhk != ''"> and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}</if>
<if test="hsybxshcqlhsdjhk != null and hsybxshcqlhsdjhk != ''"> and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}</if>
<if test="hsyhdqlbxshsdjhk != null and hsyhdqlbxshsdjhk != ''">and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}
</if>
<if test="hsybxshcqlhsdjhk != null and hsybxshcqlhsdjhk != ''">and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}
</if>
<if test="hshyqwhd != null and hshyqwhd != ''">and hshyqwhd = #{hshyqwhd}</if>
<if test="zxhkrq != null and zxhkrq != ''">and zxhkrq = #{zxhkrq}</if>
<if test="zxhkyy != null and zxhkyy != ''">and zxhkyy = #{zxhkyy}</if>
<if test="hkdjsxbgjznrsjjblrz1 != null and hkdjsxbgjznrsjjblrz1 != ''"> and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}</if>
<if test="hkdjsxbgjznrsjjblrz2 != null and hkdjsxbgjznrsjjblrz2 != ''"> and hkdjsxbgjznrsjjblrz2 = #{hkdjsxbgjznrsjjblrz2}</if>
<if test="hkdjsxbgjznrsjjblrz1 != null and hkdjsxbgjznrsjjblrz1 != ''">and hkdjsxbgjznrsjjblrz1 =
#{hkdjsxbgjznrsjjblrz1}
</if>
<if test="hkdjsxbgjznrsjjblrz2 != null and hkdjsxbgjznrsjjblrz2 != ''">and hkdjsxbgjznrsjjblrz2 =
#{hkdjsxbgjznrsjjblrz2}
</if>
<if test="jiguan != null and jiguan != ''">and jiguan = #{jiguan}</if>
<if test="xzz != null and xzz != ''">and xzz = #{xzz}</if>
<if test="hzName != null and hzName != ''">and hz_name like concat('%', #{hzName}, '%')</if>
@ -154,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null ">and uc.user_id = #{userId}</if>
<if test="ywType != null and ywType != ''">and yw_type = #{ywType}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--and ( name like concat('%', #{name}, '%')
or hz_name like concat('%', #{name}, '%')
or other_name like concat('%', #{name}, '%')
or used_name like concat('%', #{name}, '%')
@ -162,6 +187,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or jhr2 like concat('%', #{name}, '%')
or birthday like concat('%', #{name}, '%')
or card_id like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(hz_name like concat('%', #{name}, '%')OR to_pinyin ( hz_name ) LIKE CONCAT( '%', to_pinyin ( #{name} ),
'%' ))
or
(other_name like concat('%', #{name}, '%')OR to_pinyin ( other_name ) LIKE CONCAT( '%', to_pinyin (
#{name} ), '%' ))
or
(used_name like concat('%', #{name}, '%')OR to_pinyin ( used_name ) LIKE CONCAT( '%', to_pinyin (
#{name} ), '%' ))
or
(jhr1 like concat('%', #{name}, '%')OR to_pinyin ( jhr1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(jhr2 like concat('%', #{name}, '%')OR to_pinyin ( jhr2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or birthday like concat('%', #{name}, '%')
or card_id like concat('%', #{name}, '%')
)
</if>
</where>

36
dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml
Unescape View File

@ -64,10 +64,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fwUnit != null and fwUnit != ''">and fw_unit like concat('%', #{fwUnit}, '%')</if>
<if test="wjXh != null and wjXh != ''">and wj_xh like concat('%', #{wjXh}, '%')</if>
<if test="name1 != null and name1 != ''">
and ( name1 like concat('%', #{name1}, '%')
<!--and ( name1 like concat('%', #{name1}, '%')
or name2 like concat('%', #{name1}, '%')
or name3 like concat('%', #{name1}, '%')
or name4 like concat('%', #{name1}, '%')
)-->
and (
(name1 like concat('%', #{name1}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name2 like concat('%', #{name1}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name3 like concat('%', #{name1}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name4 like concat('%', #{name1}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
)
</if>
<if test="sex1 != null and sex1 != ''">and sex1 = #{sex1}</if>
@ -111,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="userId != null">and uc.user_id = #{userId}</if>
<if test="name1 != null and name1 != ''">
and ( name1 like concat('%', #{name1}, '%')
<!--and ( name1 like concat('%', #{name1}, '%')
or name2 like concat('%', #{name1}, '%')
or name3 like concat('%', #{name1}, '%')
or name4 like concat('%', #{name1}, '%')
@ -119,6 +133,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or card_id2 like concat('%', #{name1}, '%')
or card_id3 like concat('%', #{name1}, '%')
or card_id4 like concat('%', #{name1}, '%')
)-->
and (
(name1 like concat('%', #{name1}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name2 like concat('%', #{name1}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name3 like concat('%', #{name1}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or
(name4 like concat('%', #{name1}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name1} ),
'%' ))
or card_id1 like concat('%', #{name1}, '%')
or card_id2 like concat('%', #{name1}, '%')
or card_id3 like concat('%', #{name1}, '%')
or card_id4 like concat('%', #{name1}, '%')
)
</if>
</where>

21
dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml
Unescape View File

@ -60,8 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="year != null and year != ''">and year like concat('%', #{year}, '%')</if>
<if test="xh != null and xh != ''">and xh like concat('%', #{xh}, '%')</if>
<if test="wName != null and wName != ''">
and ( w_name like concat('%', #{wName}, '%')
<!--and ( w_name like concat('%', #{wName}, '%')
or m_name like concat('%', #{wName}, '%')
)-->
and (
(w_name like concat('%', #{wName}, '%')OR to_pinyin ( w_name ) LIKE CONCAT( '%', to_pinyin ( #{wName}
), '%' ))
or
(m_name like concat('%', #{wName}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{wName} ),
'%' ))
)
</if>
<if test="birthday != null ">
@ -101,11 +108,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="userId != null ">and uc.user_id = #{userId}</if>
<if test="wName != null and wName != ''">
and ( w_name like concat('%', #{wName}, '%')
<!--and ( w_name like concat('%', #{wName}, '%')
or m_name like concat('%', #{wName}, '%')
or birthday like concat('%', #{wName}, '%')
or w_card_id like concat('%', #{wName}, '%')
or m_card_id like concat('%', #{wName}, '%')
)-->
and (
(w_name like concat('%', #{wName}, '%')OR to_pinyin ( w_name ) LIKE CONCAT( '%', to_pinyin ( #{wName}
), '%' ))
or
(m_name like concat('%', #{wName}, '%')OR to_pinyin ( m_name ) LIKE CONCAT( '%', to_pinyin ( #{wName} ),
'%' ))
or birthday like concat('%', #{wName}, '%')
or w_card_id like concat('%', #{wName}, '%')
or m_card_id like concat('%', #{wName}, '%')
)
</if>
</where>

42
dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml
Unescape View File

@ -65,12 +65,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="muPath != null and muPath != ''">and mu_path = #{muPath}</if>
<if test="num != null and num != ''">and num like concat('%', #{num}, '%')</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--and ( name like concat('%', #{name}, '%')
or name1 like concat('%', #{name}, '%')
or name2 like concat('%', #{name}, '%')
or name3 like concat('%', #{name}, '%')
or name4 like concat('%', #{name}, '%')
or name5 like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name5 like concat('%', #{name}, '%')OR to_pinyin ( name5 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
)
</if>
<if test="address != null and address != ''">and address = #{address}</if>
@ -111,12 +130,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="userId != null ">and uc.user_id = #{userId}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--and ( name like concat('%', #{name}, '%')
or name1 like concat('%', #{name}, '%')
or name2 like concat('%', #{name}, '%')
or name3 like concat('%', #{name}, '%')
or name4 like concat('%', #{name}, '%')
or name5 like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name5 like concat('%', #{name}, '%')OR to_pinyin ( name5 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
)
</if>
</where>

45
dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml
Unescape View File

@ -74,11 +74,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="muPath != null and muPath != ''">and mu_path = #{muPath}</if>
<if test="num != null and num != ''">and num like concat('%',#{num}, '%')</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--and ( name like concat('%', #{name}, '%')
or name1 like concat('%', #{name}, '%')
or name2 like concat('%', #{name}, '%')
or name3 like concat('%', #{name}, '%')
or name4 like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
)
</if>
<if test="cardId != null and cardId != ''">
@ -141,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="userId != null ">and uc.user_id = #{userId}</if>
<if test="name != null and name != ''">
and ( name like concat('%', #{name}, '%')
<!--nd ( name like concat('%', #{name}, '%')
or name1 like concat('%', #{name}, '%')
or name2 like concat('%', #{name}, '%')
or name3 like concat('%', #{name}, '%')
@ -155,6 +171,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or birth_date2 like concat('%', #{name}, '%')
or birth_date3 like concat('%', #{name}, '%')
or birth_date4 like concat('%', #{name}, '%')
)-->
and (
(name like concat('%', #{name}, '%')OR to_pinyin ( name ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name1 like concat('%', #{name}, '%')OR to_pinyin ( name1 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name2 like concat('%', #{name}, '%')OR to_pinyin ( name2 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name3 like concat('%', #{name}, '%')OR to_pinyin ( name3 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or
(name4 like concat('%', #{name}, '%')OR to_pinyin ( name4 ) LIKE CONCAT( '%', to_pinyin ( #{name} ), '%'
))
or card_id like concat('%', #{name}, '%')
or card_id1 like concat('%', #{name}, '%')
or card_id2 like concat('%', #{name}, '%')
or card_id3 like concat('%', #{name}, '%')
or card_id4 like concat('%', #{name}, '%')
or birth_date1 like concat('%', #{name}, '%')
or birth_date2 like concat('%', #{name}, '%')
or birth_date3 like concat('%', #{name}, '%')
or birth_date4 like concat('%', #{name}, '%')
)
</if>
</where>

4
dangan-ui/src/views/dangan/pictureRecard/index.vue
Unescape View File

@ -66,7 +66,7 @@
<el-col :span="1.5" v-if="queryParams.recognize==='0'&&(queryParams.ywType==='option1'||queryParams.ywType==='option2'||queryParams.ywType==='option3'||queryParams.ywType==='option4'||queryParams.ywType==='option5'||queryParams.ywType==='option6'||queryParams.ywType==='option7'||queryParams.ywType==='option8'||queryParams.ywType==='option9')">
<el-button icon="el-icon-full-screen" size="mini" type="primary" @click="cjsbrw">创建识别任务</el-button>
</el-col>
<el-col :span="1.5">
<el-col :span="1.5" v-if="queryParams.recognize==='0'">
<el-button
type="danger"
plain
@ -120,7 +120,7 @@
<image-preview :src="scope.row.picUrl" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column v-if="queryParams.recognize==='0'" label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"

Write Preview
Loading…
Cancel
Save