Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java

@@ -1,4 +1,4 @@
-package com.zcloud.mapper.dsno2.freighttrailer;
+package com.zcloud.mapper.datasource.freighttrailer;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;

src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java

@@ -2,7 +2,7 @@ package com.zcloud.service.freighttrailer.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.dsno2.freighttrailer.FreightTrailerMapper;
+import com.zcloud.mapper.datasource.freighttrailer.FreightTrailerMapper;
 import com.zcloud.service.freighttrailer.FreightTrailerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zcloud.mapper.dsno2.freighttrailer.FreightTrailerMapper">
+<mapper namespace="com.zcloud.mapper.datasource.freighttrailer.FreightTrailerMapper">
 
 	<!--表名 -->
 	<sql id="tableName">
@@ -12,9 +12,6 @@
 	<sql id="Field2">
 		FREIGHTTRAILER_ID,
 		CORPINFO_ID,
-		INDUSTRY_TYPE,
-		INDUSTRY_TYPE_TREE,
-		INDUSTRY_TYPE_NAMES,
 		NUM,
 		PLATE_NUMBER,
 		VIN,
@@ -49,9 +46,6 @@
 	<sql id="FieldValue">
 		#{FREIGHTTRAILER_ID},
 		#{CORPINFO_ID},
-		#{INDUSTRY_TYPE},
-		#{INDUSTRY_TYPE_TREE},
-		#{INDUSTRY_TYPE_NAMES},
 		#{NUM},
 		#{PLATE_NUMBER},
 		#{VIN},
@@ -111,9 +105,6 @@
 		update
 		<include refid="tableName"></include>
 		set
-		INDUSTRY_TYPE = #{INDUSTRY_TYPE},
-		INDUSTRY_TYPE_TREE = #{INDUSTRY_TYPE_TREE},
-		INDUSTRY_TYPE_NAMES = #{INDUSTRY_TYPE_NAMES},
 		NUM = #{NUM},
 		PLATE_NUMBER = #{PLATE_NUMBER},
 		VIN = #{VIN},
@@ -149,9 +140,6 @@
 		select
 		f.FREIGHTTRAILER_ID,
 		f.CORPINFO_ID,
-		f.INDUSTRY_TYPE,
-		f.INDUSTRY_TYPE_TREE,
-		f.INDUSTRY_TYPE_NAMES,
 		f.NUM,
 		f.PLATE_NUMBER,
 		f.VIN,
@@ -179,9 +167,11 @@
 		f.CREATOR,
 		f.CREATORNAME,
 		f.CREATTIME,
-		f.ISDELETE
+		f.ISDELETE,
+		b.COMPANY_AREA
 		from
 		<include refid="tableName"></include> f
+		inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID
 		where
 		f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}
 	</select>