首页三温图仓房下拉优化

src/main/java/com/chinaitop/depot/basic/controller/BasicStorehouseController.java

@@ -95,7 +95,7 @@ public class BasicStorehouseController {
 			@ApiImplicitParam(name = "delFlag", value = "是否删除", paramType = "query")
 	})
 	public PageInfo<BasicStorehouse> getList(Integer pageNum, Integer pageSize, Integer storehouseType,
-											 String storeName, Integer houseId, Integer orgId, Integer storehouseState, 
+											 String storeName, Integer houseId, Integer orgId, Integer storehouseState,
 											 String libraryType, Integer delFlag) {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 
@@ -504,7 +504,7 @@ public class BasicStorehouseController {
 		}
 		return errormsg;
 	}
-	
+
 	/**
 	 * 按仓房编码进行查询，去重
 	 * @param storehouseCode 仓房编码
@@ -569,17 +569,17 @@ public class BasicStorehouseController {
 		}
 		return list;
 	}
-	
+
 	/**
 	 * 查询三温检查列表最新数据所对应的仓房
-	 * 
+	 *
 	 * @param orgId 粮库ID
 	 * @return
 	 */
 	@RequestMapping(value = "/getThreeTempCheckList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-	@ApiOperation(value="根据单位查找单位下的所有仓房信息(统一对外接口)", notes = "根据单位查找单位下的所有仓房信息(统一对外接口)")
+	@ApiOperation(value="三温检查仓房", notes = "查询三温检查列表最新数据所对应的仓房")
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "orgId", value = "粮库ID", paramType = "query")
+			@ApiImplicitParam(name = "orgId", value = "粮库ID", paramType = "query")
 	})
 	public Map<String, Object> getThreeTempCheckList(Integer orgId) throws Exception {
 		Map<String, Object> map = null;

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

@@ -1,5 +1,5 @@
-<?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">
+<?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.chinaitop.depot.basic.mapper.BasicStorehouseMapper">
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicStorehouse">
     <id column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
@@ -153,7 +153,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from basic_storehouse
     where storehouse_id = #{storehouseId,jdbcType=INTEGER}
@@ -1165,14 +1165,17 @@
       INSERT INTO basic_storehouse (createDate, del_flag, uuid, depot_id, depot_name, storehouse_code, storehouse_name, storehouse_type) VALUES
 		${sql}
   </insert>
-  
+
   <select id="getThreeTempCheckList" parameterType="java.util.Map" resultMap="BaseResultMap">
-    select DISTINCT storehouse_id
+    select DISTINCT storehouse.storehouse_id,storehouse.storehouse_name
     from basic_storehouse storehouse
-    inner join t_testdata testdata on testdata.org_id = storehouse.org_id and testdata.storehouse = storehouse.storehouse_code
+    LEFT JOIN basic_warehouse warehouse ON warehouse.storehouse_id = storehouse.storehouse_id
     <where>
+      warehouse.crk_status = 1
+      OR warehouse.crk_status = 3
+      OR warehouse.crk_status = 9
       <if test="orgId != null">
-      	storehouse.org_id = #{orgId}
+        AND storehouse.org_id = #{orgId}
       </if>
       <if test="libraryType != null">
         AND storehouse.library_type = #{libraryType}
@@ -1180,7 +1183,7 @@
       <if test="delFlag != null">
         AND storehouse.del_flag = #{delFlag}
       </if>
-    </where> 
+    </where>
   </select>
   <select id="getAgentDepotId" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT id