ljx：xml文件新增查询返回type number

enteprise-admin/src/main/java/com/enteprise/enterprise/mapper/EnterpriseMapper.java

@@ -18,7 +18,7 @@ public interface EnterpriseMapper
      * @param id enterprise主键
      * @return enterprise
      */
-    public Enterprise selectEnterpriseById(Long id);
+    public EnterpriseDto selectEnterpriseById(Long id);
 
     /**
      * 查询enterprise列表

enteprise-admin/src/main/java/com/enteprise/enterprise/service/IEnterpriseService.java

@@ -18,7 +18,7 @@ public interface IEnterpriseService
      * @param id enterprise主键
      * @return enterprise
      */
-    public Enterprise selectEnterpriseById(Long id);
+    public EnterpriseDto selectEnterpriseById(Long id);
 
     /**
      * 查询enterprise列表

enteprise-admin/src/main/java/com/enteprise/enterprise/service/impl/EnterpriseServiceImpl.java

@@ -37,7 +37,7 @@ public class EnterpriseServiceImpl implements IEnterpriseService
      * @return enterprise
      */
     @Override
-    public Enterprise selectEnterpriseById(Long id)
+    public EnterpriseDto selectEnterpriseById(Long id)
     {
         return enterpriseMapper.selectEnterpriseById(id);
     }

enteprise-admin/src/main/resources/mapper/enterprise/EnterpriseMapper.xml

@@ -24,8 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectEnterpriseById" parameterType="Long" resultMap="EnterpriseResult">
-        <include refid="selectEnterpriseVo"/>
+    <select id="selectEnterpriseById" parameterType="Long" >
+        SELECT a.id, a.enterprise_name enterpriseName, a.location, a.code,  a.type_num typeNum, b.name typeName
+        from enterprise a
+                 left join enterprise_type b
+                           on a.type_num = b.number
         where id = #{id}
     </select>