diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml index d850a52..36edf6f 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml @@ -1,48 +1,48 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,53 +53,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct b.* from da_birth_dj b left join da_user_catalog uc on b.mu_id = uc.mu_id - and uc.user_id = #{userId} - and task_id = #{taskId} + and uc.user_id = #{userId} + and task_id = #{taskId} - and m_name !='无' - and yw_type = #{ywType} - and b.mu_id = #{muId} - and mu_path = #{muPath} - and birth_num like concat('%', #{birthNum}, '%') + and m_name !='无' + and yw_type = #{ywType} + and b.mu_id = #{muId} + and mu_path = #{muPath} + and birth_num like concat('%', #{birthNum}, '%') - 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} ), + '%' )) + ) - and birthday like concat('%', #{birthday}, '%') - + and birthday like concat('%', #{birthday}, '%') + - and (m_card_id like concat('%', #{mCardId}, '%') + and (m_card_id like concat('%', #{mCardId}, '%') or f_card_id like concat('%', #{mCardId}, '%') ) - and sex = #{sex} - and born_address like concat('%', #{bornAddress}, '%') - and m_name like concat('%', #{mName}, '%') - and m_age = #{mAge} - and m_gj = #{mGj} - and m_nation = #{mNation} - and f_name like concat('%', #{fName}, '%') - and f_age = #{fAge} - and f_gj = #{fGj} - and f_nation = #{fNation} - and f_card_id = #{fCardId} - and home_address = #{homeAddress} - and mom_sign = #{momSign} - and jsry_sign = #{jsrySign} - and js_unit like concat('%', #{jsUnit}, '%') - and dj_type = #{djType} - and pic_ids = #{picIds} - and pictures = #{pictures} - and all_pic_ids = #{allPicIds} - and all_pics = #{allPics} - and error_correct = #{errorCorrect} - and audit_status = #{auditStatus} - and audit_name like concat('%', #{auditName}, '%') - and audit_result = #{auditResult} - and audit_reason = #{auditReason} + and sex = #{sex} + and born_address like concat('%', #{bornAddress}, + '%') + + and m_name like concat('%', #{mName}, '%') + and m_age = #{mAge} + and m_gj = #{mGj} + and m_nation = #{mNation} + and f_name like concat('%', #{fName}, '%') + and f_age = #{fAge} + and f_gj = #{fGj} + and f_nation = #{fNation} + and f_card_id = #{fCardId} + and home_address = #{homeAddress} + and mom_sign = #{momSign} + and jsry_sign = #{jsrySign} + and js_unit like concat('%', #{jsUnit}, '%') + and dj_type = #{djType} + and pic_ids = #{picIds} + and pictures = #{pictures} + and all_pic_ids = #{allPicIds} + and all_pics = #{allPics} + and error_correct = #{errorCorrect} + and audit_status = #{auditStatus} + and audit_name like concat('%', #{auditName}, '%') + and audit_result = #{auditResult} + and audit_reason = #{auditReason} order by id desc @@ -108,15 +120,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct b.* from da_birth_dj b left join da_user_catalog uc on b.mu_id = uc.mu_id - and uc.user_id = #{userId} + and uc.user_id = #{userId} - and (name like concat('%', #{name}, '%') - or m_name like concat('%', #{name}, '%') - or f_name like concat('%', #{name}, '%') - or birthday like concat('%', #{name}, '%') - 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}, '%') + ) order by id desc @@ -168,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{taskId}, #{ywType}, @@ -208,7 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index d18948a..f56a73b 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -1,69 +1,69 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71,95 +71,141 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select distinct q.* from da_qyz q + select distinct q.* from da_qyz q left join da_user_catalog uc on q.mu_id = uc.mu_id - and uc.user_id = #{userId} - and task_id = #{taskId} + and uc.user_id = #{userId} + and task_id = #{taskId} - and name1 !='无' - and yw_type = #{ywType} - and q.mu_id = #{muId} - and mu_path = #{muPath} - and fw_unit like concat('%', #{fwUnit}, '%') - and wj_xh like concat('%', #{wjXh}, '%') + and name1 !='无' + and yw_type = #{ywType} + and q.mu_id = #{muId} + and mu_path = #{muPath} + and fw_unit like concat('%', #{fwUnit}, '%') + and wj_xh like concat('%', #{wjXh}, '%') - and ( name1 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} ), + '%' )) ) - and sex1 = #{sex1} + and sex1 = #{sex1} - and (card_id1 like concat('%', #{cardId1}, '%') + and (card_id1 like concat('%', #{cardId1}, '%') or card_id2 like concat('%', #{cardId1}, '%') or card_id3 like concat('%', #{cardId1}, '%') or card_id4 like concat('%', #{cardId1}, '%') ) - - and name2 = #{name2} - and sex2 = #{sex2} - and card_id2 = #{cardId2} - and name3 = #{name3} - and sex3 = #{sex3} - and card_id3 = #{cardId3} - and name4 = #{name4} - and sex4 = #{sex4} - and card_id4 = #{cardId4} - and qy_reason = #{qyReason} - and y_address = #{yAddress} - and qw_address = #{qwAddress} - and s_date = #{sDate} - and e_date = #{eDate} - and cbr = #{cbr} - and pic_ids = #{picIds} - and pictures = #{pictures} - and all_pic_ids = #{allPicIds} - and all_pics = #{allPics} - and error_correct = #{errorCorrect} - and audit_status = #{auditStatus} - and audit_name like concat('%', #{auditName}, '%') - and audit_result = #{auditResult} - and audit_reason = #{auditReason} + + and name2 = #{name2} + and sex2 = #{sex2} + and card_id2 = #{cardId2} + and name3 = #{name3} + and sex3 = #{sex3} + and card_id3 = #{cardId3} + and name4 = #{name4} + and sex4 = #{sex4} + and card_id4 = #{cardId4} + and qy_reason = #{qyReason} + and y_address = #{yAddress} + and qw_address = #{qwAddress} + and s_date = #{sDate} + and e_date = #{eDate} + and cbr = #{cbr} + and pic_ids = #{picIds} + and pictures = #{pictures} + and all_pic_ids = #{allPicIds} + and all_pics = #{allPics} + and error_correct = #{errorCorrect} + and audit_status = #{auditStatus} + and audit_name like concat('%', #{auditName}, '%') + and audit_result = #{auditResult} + and audit_reason = #{auditReason} order by id desc - + insert into da_qyz @@ -171,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{taskId}, #{ywType}, @@ -211,7 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -264,7 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_qyz where id in + delete from da_qyz where id in #{id} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml index c0e152c..01fed29 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml @@ -1,45 +1,45 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47,65 +47,82 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into da_ytzm @@ -154,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{taskId}, #{ywType}, @@ -190,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -239,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_ytzm where id in + delete from da_ytzm where id in #{id} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml index af9788c..8d8f8e4 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml @@ -1,51 +1,51 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,72 +53,110 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -127,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into da_zfnyhkcg @@ -171,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{taskId}, #{ywType}, @@ -213,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -268,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_zfnyhkcg where id in + delete from da_zfnyhkcg where id in #{id} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml index 45a3c43..1db0615 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml @@ -1,60 +1,60 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,24 +65,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct z.* from da_zqz z left join da_user_catalog uc on z.mu_id = uc.mu_id - and uc.user_id = #{userId} - and task_id = #{taskId} + and uc.user_id = #{userId} + and task_id = #{taskId} - and name !='无' - and yw_type = #{ywType} - and z.mu_id = #{muId} - and mu_path = #{muPath} - and num like concat('%',#{num}, '%') + and name !='无' + and yw_type = #{ywType} + and z.mu_id = #{muId} + and mu_path = #{muPath} + and num like concat('%',#{num}, '%') - 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} ), '%' + )) ) - + - and (card_id like concat('%', #{cardId}, '%') + and (card_id like concat('%', #{cardId}, '%') or card_id1 like concat('%', #{cardId}, '%') or card_id2 like concat('%', #{cardId}, '%') or card_id3 like concat('%', #{cardId}, '%') @@ -90,48 +106,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and (birth_date1 like concat('%', #{birthDate1}, '%') + and (birth_date1 like concat('%', #{birthDate1}, '%') or birth_date2 like concat('%', #{birthDate1}, '%') or birth_date3 like concat('%', #{birthDate1}, '%') or birth_date4 like concat('%', #{birthDate1}, '%') ) - and address = #{address} - and dj_jg = #{djJg} - and relation1 = #{relation1} - and name1 = #{name1} - and sex1 = #{sex1} - and card_id1 = #{cardId1} - and relation2 = #{relation2} - and name2 = #{name2} - and sex2 = #{sex2} - and birth_date2 = #{birthDate2} - and card_id2 = #{cardId2} - and relation3 = #{relation3} - and name3 = #{name3} - and birth_date3 = #{birthDate3} - and sex3 = #{sex3} - and card_id3 = #{cardId3} - and relation4 = #{relation4} - and name4 = #{name4} - and sex4 = #{sex4} - and birth_date4 = #{birthDate4} - and card_id4 = #{cardId4} - and fwdw = #{fwdw} - and qr_address = #{qrAddress} - and zq_reason = #{zqReason} - and pzjg = #{pzjg} - and cbr = #{cbr} - and qf_date = #{qfDate} - and pic_ids = #{picIds} - and pictures = #{pictures} - and all_pic_ids = #{allPicIds} - and all_pics = #{allPics} - and error_correct = #{errorCorrect} - and audit_status = #{auditStatus} - and audit_name like concat('%', #{auditName}, '%') - and audit_result = #{auditResult} - and audit_reason = #{auditReason} + and address = #{address} + and dj_jg = #{djJg} + and relation1 = #{relation1} + and name1 = #{name1} + and sex1 = #{sex1} + and card_id1 = #{cardId1} + and relation2 = #{relation2} + and name2 = #{name2} + and sex2 = #{sex2} + and birth_date2 = #{birthDate2} + and card_id2 = #{cardId2} + and relation3 = #{relation3} + and name3 = #{name3} + and birth_date3 = #{birthDate3} + and sex3 = #{sex3} + and card_id3 = #{cardId3} + and relation4 = #{relation4} + and name4 = #{name4} + and sex4 = #{sex4} + and birth_date4 = #{birthDate4} + and card_id4 = #{cardId4} + and fwdw = #{fwdw} + and qr_address = #{qrAddress} + and zq_reason = #{zqReason} + and pzjg = #{pzjg} + and cbr = #{cbr} + and qf_date = #{qfDate} + and pic_ids = #{picIds} + and pictures = #{pictures} + and all_pic_ids = #{allPicIds} + and all_pics = #{allPics} + and error_correct = #{errorCorrect} + and audit_status = #{auditStatus} + and audit_name like concat('%', #{auditName}, '%') + and audit_result = #{auditResult} + and audit_reason = #{auditReason} order by id desc @@ -139,13 +155,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct z.* from da_zqz z left join da_user_catalog uc on z.mu_id = uc.mu_id - and uc.user_id = #{userId} + and uc.user_id = #{userId} - 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} ), '%' + )) or card_id like concat('%', #{name}, '%') or card_id1 like concat('%', #{name}, '%') or card_id2 like concat('%', #{name}, '%') @@ -156,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" or birth_date3 like concat('%', #{name}, '%') or birth_date4 like concat('%', #{name}, '%') ) - + order by id desc @@ -165,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into da_zqz @@ -333,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from da_zqz where id in + delete from da_zqz where id in #{id} diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue index e765fcc..ea649ad 100644 --- a/dangan-ui/src/views/dangan/pictureRecard/index.vue +++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue @@ -62,11 +62,11 @@ - + 创建识别任务 - + - +