1

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.java

@@ -31,4 +31,6 @@ public interface BasicTankMapper {
     int updateByPrimaryKey(BasicTank record);
 
     List<BasicTank> selectByExampleNew(Map<String, Object> map);
+    
+    List<BasicTank> selectTankAndHw(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -37,6 +37,7 @@
     <result column="sjdw" property="sjdw" jdbcType="VARCHAR" />
     <result column="jldw" property="jldw" jdbcType="VARCHAR" />
     <result column="spt_dataid" property="sptDataid" jdbcType="VARCHAR" />
+    <result column="hwbm" property="yghwdm" jdbcType="VARCHAR" />
     
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -701,4 +702,17 @@
     </if>
     order by tank.storageTank_code desc
   </select>
+  <select id="selectTankAndHw" parameterType="java.util.Map" resultMap="BaseResultMap">
+    select tank.*,hw.hwbm yghwdm
+    from basic_tank tank
+    inner join basic_tank_hw hw ON hw.id = tank.id
+    WHERE 1 = 1
+    <if test="orgId != null">
+      AND tank.org_id = #{orgId,jdbcType=INTEGER}
+    </if>
+    <if test="libraryType != null">
+      AND tank.library_type = #{libraryType,jdbcType=VARCHAR}
+    </if>
+    order by tank.storageTank_code desc
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/impl/BasicStorehouseServiceImpl.java

@@ -138,19 +138,18 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 	}
 	
 	private Map<Integer, Object> getTankObj(Integer orgId, String libraryType) {
-		BasicTankExample example = new BasicTankExample();
-		BasicTankExample.Criteria criteria = example.createCriteria();
+		Map<String, Object> map = new HashMap<>();
 		List<BasicTank> tankObj = null;
 		try {
 			if (ParameterUtil.isnotnull(libraryType)) {
-				criteria.andLibraryTypeEqualTo(libraryType);
+				map.put("libraryType", libraryType);
 			}else if(ParameterUtil.isnull(libraryType)){
-				criteria.andLibraryTypeEqualTo("0");//如果不传值则默认查询主库数据，不查询代储库数据
+				map.put("libraryType", "0");//如果不传值则默认查询主库数据，不查询代储库数据
 			}
 			if (ParameterUtil.isnotnull(orgId)) {
-				criteria.andOrgIdEqualTo(orgId);
+				map.put("orgId", orgId);
 			}
-			tankObj = basicTankMapper.selectByExample(example); //获取当前单位所有的仓房和油罐数据
+			tankObj = basicTankMapper.selectTankAndHw(map); //获取当前单位所有的仓房和油罐数据
 		} catch (Exception e) {
 			System.out.println(e.getMessage());
 		}