Merge remote-tracking branch 'origin/master'

dangan-dangan/src/main/java/com/da/dangan/controller/DaJianSuoController.java

@@ -313,7 +313,7 @@ public class DaJianSuoController extends BaseController {
         return getDataTable(list);
     }
     /**
-     * 查询准迁证列表
+     * 查询全文识别列表   /全文识别  没有 同音查询
      */
     @PreAuthorize("@ss.hasPermi('dangan:qw:list')")
     @GetMapping("/qw1")

dangan-dangan/src/main/java/com/da/dangan/domain/DaQuanwen.java

@@ -54,12 +54,16 @@ public class DaQuanwen extends BaseEntity
     @Excel(name = "相关图片")
     private String allPics;
 
-    /** 是否纠错(字典0否1是) */
+    /**
-    @Excel(name = "是否纠错(字典0否1是)")
+     * 是否纠错(字典0否1是)
+     */
+    @Excel(name = "是否纠错",dictType = "error_correct")
     private String errorCorrect;
 
-    /** 审核状态(字典) */
+    /**
-    @Excel(name = "审核状态(字典)")
+     * 审核状态(字典)
+     */
+    @Excel(name = "审核状态",dictType = "audit_status")
     private String auditStatus;
 
     /** 审核人 */

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

@@ -61,7 +61,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="allInfo != null  and allInfo != ''">
-                and  all_info like concat('%', #{name}, '%'
+                and  all_info like concat('%', #{allInfo}, '%')
             </if>
         </where>
         order by id desc