Merge remote-tracking branch 'origin/master'

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj1.java

@@ -23,6 +23,10 @@ public class Czrkdj1 extends BaseEntity {
     @Excel(name = "任务id")
     private Long taskId;
 
+    /** 全文识别内容 */
+    @Excel(name = "全文识别内容")
+    private String allInfo;
+
     /**
      * 业务类型(字典)
      */

dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml

@@ -56,7 +56,7 @@
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
             <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and m_name !='无'</if>
+            <if test="flag != null and flag=='1'.toString()">and `name` !='' and `name` !='无' </if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and b.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.da.dangan.mapper.DaCzrkdjMapper">
     <resultMap type="DaCzrkdj" id="DaCzrkdjResult">
         <result property="id" column="id"/>
-        <result property="allInfo"    column="all_info"    />
+        <result property="allInfo" column="all_info"    />
         <result property="taskId" column="task_id"/>
         <result property="ywType" column="yw_type"/>
         <result property="muId" column="mu_id"/>
@@ -77,8 +77,8 @@
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
-            <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and name !='无'</if>
+            <!-- flag=0 展示全部  =1不展示没有姓名的记录和没有全文识别信息的记录-->
+            <if test="flag != null and flag=='1'.toString()">and ((`name` !='' and `name` !='无' ) or all_info!='')</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>
@@ -204,7 +204,8 @@
             <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 ( all_info like concat('%', #{name}, '%')
+                or `name` like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%')
                 or other_name like concat('%', #{name}, '%')
                 or used_name like concat('%', #{name}, '%')

dangan-dangan/src/main/resources/mapper/dangan/DaQuanwenMapper.xml

@@ -37,6 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="allInfo != null  and allInfo != ''"> and all_info = #{allInfo}</if>
             <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
+            <!-- flag=0 展示全部  =1不展示没有全文识别信息的记录-->
+            <if test="flag != null and flag=='1'.toString()"> and  all_info!=''</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
             <if test="picIds != null  and picIds != ''"> and pic_ids = #{picIds}</if>
@@ -50,7 +52,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
         </where>
     </select>
-    
+
+    <!--检索+无同音字-->
+    <select id="searchDaQuanwenList1" parameterType="DaQuanwen" resultMap="DaQuanwenResult">
+        select distinct q.* from da_quanwen q
+        <if test="userId != null  "> left join da_user_catalog uc on q.mu_id = uc.mu_id</if>
+        <where>
+            <if test="userId != null  ">and uc.user_id = #{userId}</if>
+            <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
+            <if test="allInfo != null  and allInfo != ''">
+                and  all_info like concat('%', #{name}, '%'
+            </if>
+        </where>
+        order by id desc
+    </select>
+
     <select id="selectDaQuanwenById" parameterType="Long" resultMap="DaQuanwenResult">
         <include refid="selectDaQuanwenVo"/>
         where id = #{id}

dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml

@@ -57,7 +57,7 @@
             <if test="userId != null">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
             <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and name1 !='无'</if>
+            <if test="flag != null and flag=='1'.toString()">and name1 !='' and name1 !='无'</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and q.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml

@@ -53,7 +53,7 @@
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
             <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and w_name !='无'</if>
+            <if test="flag != null and flag=='1'.toString()">`w_name` !='' and w_name !='无'</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and y.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml

@@ -59,7 +59,7 @@
             <if test="userId != null ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
             <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and (name !='无' or name1!='无')</if>
+            <if test="flag != null and flag=='1'.toString()">and name !='无' and name!=''</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>

dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml

@@ -68,7 +68,7 @@
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
             <!-- flag=0 展示全部  =1不展示没有姓名的记录 -->
-            <if test="flag != null and flag=='1'.toString()">and name !='无'</if>
+            <if test="flag != null and flag=='1'.toString()">and name !='' and name !='无'</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
             <if test="muId != null ">and z.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''">and mu_path = #{muPath}</if>