diff --git a/src/main/java/com/zcloud/mapper/dsno2/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java similarity index 95% rename from src/main/java/com/zcloud/mapper/dsno2/freighttrailer/FreightTrailerMapper.java rename to src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java index 7699754..d42d03a 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/freighttrailer/FreightTrailerMapper.java +++ b/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; diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java index 7b91bb4..b938895 100644 --- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java +++ b/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; diff --git a/src/main/resources/mybatis/dsno2/freighttrailer/FreightTrailerMapper.xml b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml similarity index 93% rename from src/main/resources/mybatis/dsno2/freighttrailer/FreightTrailerMapper.xml rename to src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml index 169b865..d2c95ed 100644 --- a/src/main/resources/mybatis/dsno2/freighttrailer/FreightTrailerMapper.xml +++ b/src/main/resources/mybatis/datasource/freighttrailer/FreightTrailerMapper.xml @@ -1,6 +1,6 @@ - + @@ -12,9 +12,6 @@ FREIGHTTRAILER_ID, CORPINFO_ID, - INDUSTRY_TYPE, - INDUSTRY_TYPE_TREE, - INDUSTRY_TYPE_NAMES, NUM, PLATE_NUMBER, VIN, @@ -49,9 +46,6 @@ #{FREIGHTTRAILER_ID}, #{CORPINFO_ID}, - #{INDUSTRY_TYPE}, - #{INDUSTRY_TYPE_TREE}, - #{INDUSTRY_TYPE_NAMES}, #{NUM}, #{PLATE_NUMBER}, #{VIN}, @@ -111,9 +105,6 @@ update 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 f + inner join bus_corp_info b on f.CORPINFO_ID = b.CORPINFO_ID where f.FREIGHTTRAILER_ID = #{FREIGHTTRAILER_ID}