diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
index 148112f9..eda6e2db 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
@@ -66,6 +66,18 @@ public class AppEnterpriseInformationController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询企业信息以及二维码地址
+     */
+    @GetMapping("/queryListAndQrInfo")
+    @ResponseBody
+    public TableDataInfo queryListAndQrInfo(EnterpriseInformation enterpriseInformation)
+    {
+        startPage();
+        List<EnterpriseInformation> list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation);
+        return getDataTable(list);
+    }
+
     /**
      * 新增企业信息登记
      */
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
index f30bff84..d1685e0c 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java
@@ -102,6 +102,11 @@ public class EnterpriseInformation extends BaseDomain
      */
     private String searchValue;
 
+    /**
+     * 二维码地址
+     */
+    private String qrCodeUrl;
+
     public String getReason() {
         return reason;
     }
@@ -292,6 +297,14 @@ public class EnterpriseInformation extends BaseDomain
         this.operatingTermEnd = operatingTermEnd;
     }
 
+    public String getQrCodeUrl() {
+        return qrCodeUrl;
+    }
+
+    public void setQrCodeUrl(String qrCodeUrl) {
+        this.qrCodeUrl = qrCodeUrl;
+    }
+
     @Override
     public String getSearchValue() {
         return searchValue;
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
index 5999c89a..aca78827 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
@@ -17,15 +17,15 @@ public interface EnterpriseInformationMapper
      * @param id 企业信息登记ID
      * @return 企业信息登记
      */
-    public EnterpriseInformation selectEnterpriseInformationById(String id);
-    public EnterpriseInformation selectEnterpriseInformationByNum(String num);
+    EnterpriseInformation selectEnterpriseInformationById(String id);
+    EnterpriseInformation selectEnterpriseInformationByNum(String num);
 
     /**
      * 查询企业信息
      * @param salt 盐加密之后的统一信用代码
      * @return
      */
-    public EnterpriseInformation selectEnterpriseInformationBySalt(String salt);
+    EnterpriseInformation selectEnterpriseInformationBySalt(String salt);
 
     /**
      * 查询企业信息登记列表
@@ -33,7 +33,14 @@ public interface EnterpriseInformationMapper
      * @param enterpriseInformation 企业信息登记
      * @return 企业信息登记集合
      */
-    public List<EnterpriseInformation> selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation);
+    List<EnterpriseInformation> selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation);
+
+    /**
+     * 查询企业信息以及二维码信息
+     * @param enterpriseInformation
+     * @return
+     */
+    List<EnterpriseInformation> selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation);
 
     /**
      * 新增企业信息登记
@@ -41,7 +48,7 @@ public interface EnterpriseInformationMapper
      * @param enterpriseInformation 企业信息登记
      * @return 结果
      */
-    public int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation);
+    int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation);
 
     /**
      * 修改企业信息登记
@@ -49,14 +56,14 @@ public interface EnterpriseInformationMapper
      * @param enterpriseInformation 企业信息登记
      * @return 结果
      */
-    public int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation);
+    int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation);
 
     /**
      * 修改企业登记信息
      * @param enterpriseInformation
      * @return
      */
-    public int updateEnterpriseInformationByEnterpriseNumber(EnterpriseInformation enterpriseInformation);
+    int updateEnterpriseInformationByEnterpriseNumber(EnterpriseInformation enterpriseInformation);
 
     /**
      * 删除企业信息登记
@@ -64,7 +71,7 @@ public interface EnterpriseInformationMapper
      * @param id 企业信息登记ID
      * @return 结果
      */
-    public int deleteEnterpriseInformationById(String id);
+    int deleteEnterpriseInformationById(String id);
 
     /**
      * 批量删除企业信息登记
@@ -72,12 +79,12 @@ public interface EnterpriseInformationMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteEnterpriseInformationByIds(String[] ids);
+    int deleteEnterpriseInformationByIds(String[] ids);
 
     /**
      * 通过查询企业信息
      * @param enterpriseName
      * @return
      */
-    public List<EnterpriseInformation> selectEnterpriseInformationByName(String enterpriseName);
+    List<EnterpriseInformation> selectEnterpriseInformationByName(String enterpriseName);
 }
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
index 41919054..42c46cfc 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
@@ -17,15 +17,15 @@ public interface IEnterpriseInformationService
      * @param id 企业信息登记ID
      * @return 企业信息登记
      */
-    public EnterpriseInformation selectEnterpriseInformationById(String id);
-    public EnterpriseInformation selectEnterpriseInformationByNum(String num);
+    EnterpriseInformation selectEnterpriseInformationById(String id);
+    EnterpriseInformation selectEnterpriseInformationByNum(String num);
 
     /**
      * 查询企业信息
      * @param salt 通过盐加密之后的企业统一信用代码
      * @return
      */
-    public EnterpriseInformation selectEnterpriseInformationBySalt(String salt);
+    EnterpriseInformation selectEnterpriseInformationBySalt(String salt);
 
     /**
      * 查询企业信息登记列表
@@ -33,7 +33,14 @@ public interface IEnterpriseInformationService
      * @param enterpriseInformation 企业信息登记
      * @return 企业信息登记集合
      */
-    public List<EnterpriseInformation> selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation);
+    List<EnterpriseInformation> selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation);
+    /**
+     * 查询企业信息登记列表
+     *
+     * @param enterpriseInformation 企业信息登记
+     * @return 企业信息登记集合
+     */
+    List<EnterpriseInformation> selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation);
 
     /**
      * 新增企业信息登记
@@ -41,7 +48,7 @@ public interface IEnterpriseInformationService
      * @param enterpriseInformation 企业信息登记
      * @return 结果
      */
-    public int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation);
+    int insertEnterpriseInformation(EnterpriseInformation enterpriseInformation);
 
     /**
      * 修改企业信息登记
@@ -49,7 +56,7 @@ public interface IEnterpriseInformationService
      * @param enterpriseInformation 企业信息登记
      * @return 结果
      */
-    public int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation);
+    int updateEnterpriseInformation(EnterpriseInformation enterpriseInformation);
 
     /**
      * 修改企业信息登记
@@ -57,7 +64,7 @@ public interface IEnterpriseInformationService
      * @param enterpriseInformation 企业信息登记
      * @return 结果
      */
-    public int update(EnterpriseInformation enterpriseInformation);
+    int update(EnterpriseInformation enterpriseInformation);
 
     /**
      * 批量删除企业信息登记
@@ -65,14 +72,14 @@ public interface IEnterpriseInformationService
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteEnterpriseInformationByIds(String ids);
+    int deleteEnterpriseInformationByIds(String ids);
 
     /**
      * 二维码生成
      * @param enterpriseNumber
      * @return
      */
-    public int generateQrCode(String enterpriseNumber);
+    int generateQrCode(String enterpriseNumber);
 
     /**
      * 删除企业信息登记信息
@@ -80,13 +87,13 @@ public interface IEnterpriseInformationService
      * @param id 企业信息登记ID
      * @return 结果
      */
-    public int deleteEnterpriseInformationById(String id);
+    int deleteEnterpriseInformationById(String id);
 
     /**
      * 下载图片
      * @param fileUrl
      */
-    public void downloadQrCodeImage(String fileUrl);
+    void downloadQrCodeImage(String fileUrl);
 
     /**
      * 生成新的二维码
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
index 2e9714bf..fd0ed243 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
@@ -119,6 +119,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
         return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation);
     }
 
+    @Override
+    public List<EnterpriseInformation> selectEnterpriseInformationAndQrInfo(EnterpriseInformation enterpriseInformation) {
+        return enterpriseInformationMapper.selectEnterpriseInformationAndQrInfo(enterpriseInformation);
+    }
+
     /**
      * 新增企业信息登记
      * 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
index 6bb413d8..5c6b6842 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="salt"    column="salt"    />
         <result property="enterpriseTel"    column="enterprise_tel"    />
         <result property="industry"    column="industry"    />
+        <result property="qrCodeUrl"    column="qr_code_url"    />
     </resultMap>
 
     <sql id="selectEnterpriseInformationVo">
@@ -65,7 +66,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    
+
+    <select id="selectEnterpriseInformationAndQrInfo" parameterType="EnterpriseInformation" resultMap="EnterpriseInformationResult">
+            SELECT
+                ei.*,gh.qr_code_url
+            FROM
+                enterprise_information ei
+                LEFT JOIN (
+                SELECT
+                *
+                FROM
+                ( SELECT * FROM qr_code_generate_history WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1000000000 ) t
+                GROUP BY
+                t.enterprise_number
+                ORDER BY
+                t.generate_time DESC
+                ) gh ON ei.enterprise_number = gh.enterprise_number
+            <where>
+                and ei.is_delete = 0
+                <if test="searchValue != null and searchValue != ''">
+                    AND (ei.enterprise_name like concat('%', #{searchValue}, '%')
+                    or ei.enterprise_number like concat('%', #{searchValue}, '%'))
+                </if>
+
+            </where>
+            ORDER BY ei.create_time DESC
+    </select>
+
     <select id="selectEnterpriseInformationById" parameterType="String" resultMap="EnterpriseInformationResult">
         <include refid="selectEnterpriseInformationVo"/>
         where id = #{id}