1

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

@@ -140,7 +140,7 @@ public class BasicStorehouseController {
 			if (null != list && list.size() > 0 && ParameterUtil.isequal("0",libraryType)) {
 				String keeperNames = "";
 				for (BasicStorehouse storehouse : list) {
-					keeperNames = basicStorehouseService.getStorehouseKeeper(storehouse.getStorehouseId(), orgId, true);
+					keeperNames = basicStorehouseService.getKeeperNames(storehouse.getStorehouseId());
 					storehouse.setDutystoreman(keeperNames);
 				}
 			}

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

@@ -5,6 +5,7 @@ import com.chinaitop.depot.basic.model.BasicKeeperHouseExample;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface BasicKeeperHouseMapper {
     int countByExample(BasicKeeperHouseExample example);
@@ -32,4 +33,11 @@ public interface BasicKeeperHouseMapper {
     void deleteByKeeperIdAndHouseId(@Param("keeperId")Integer keeperId,@Param("houseId")Integer houseId);
 
     BasicKeeperHouse getHouseKeeperBykeeperIdAndHouseId(@Param("keeperId")Integer keeperId,@Param("houseId")Integer houseId);
+
+    /**
+     * 根据仓房ID获取仓房保管员，公共接口不要乱改
+     * @param map
+     * @return
+     */
+    String getKeepNames(Integer houseId);
 }

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

@@ -256,4 +256,15 @@
          </if>
        </where>
   </select>
+
+  <!-- 根据仓房ID获取仓房保管员，公共接口不要乱改 -->
+  <select id="getKeepNames" resultType="java.lang.String" parameterType="java.lang.Integer">
+      select 
+		b.real_name
+	  from basic_keeper_house a
+	  left join user_info b on b.user_id=a.keeper_id
+	  where a.house_id=#{houseId}
+      order by a.updatetime desc
+	  limit 1
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/model/BasicTank.java

@@ -77,6 +77,9 @@ public class BasicTank {
     //油罐货位欸标准编码
     private String yghwdm;
 
+    //业务字段：保管员名称
+    private String keeperNames;
+
     /**
      * 建设单位
      */
@@ -651,5 +654,13 @@ public class BasicTank {
 	public void setYghwdm(String yghwdm) {
 		this.yghwdm = yghwdm;
 	}
+
+	public String getKeeperNames() {
+		return keeperNames;
+	}
+
+	public void setKeeperNames(String keeperNames) {
+		this.keeperNames = keeperNames;
+	}
     
 }

src/main/java/com/chinaitop/depot/basic/service/BasicStorehouseService.java

@@ -128,4 +128,12 @@ public interface BasicStorehouseService {
 	 * @throws Exception
 	 */
 	public Map<String, String> saveOrUpdateSptStorehouseData(String datas) throws Exception;
+
+	/**
+	 * 根据仓房ID获取保管员,公共接口不要乱改
+	 * @param houseId 仓房ID
+	 * @return
+	 * @throws Exception
+	 */
+	public String getKeeperNames(Integer houseId) throws Exception;
 }

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

@@ -54,7 +54,7 @@ public class BasicKeeperHouseServiceImpl implements BasicKeeperHouseService {
 		}
 		List<BasicKeeperHouse> keepHouse_list = mapper.selectByExample(keepHouseExample);
 
-		/* 获取保管这个仓房的多有人的员工ID */
+		/* 获取保管这个仓房的多有人的用户ID */
 		List<Integer> keep_list = null;
 		if (null != keepHouse_list && keepHouse_list.size() > 0) {
 			keep_list = new ArrayList<Integer>();

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

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.mapper.BasicEnumMapper;
+import com.chinaitop.depot.basic.mapper.BasicKeeperHouseMapper;
 import com.chinaitop.depot.basic.mapper.BasicStorehouseMapper;
 import com.chinaitop.depot.basic.mapper.BasicTankMapper;
 import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
@@ -69,6 +70,9 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 	private BasicKeeperHouseService keeperHouseService;
 
 	@Resource
+	private BasicKeeperHouseMapper keeperHouseMapper;
+
+	@Resource
 	private BasicKeeperService keeperService;
 
 	@Resource
@@ -155,6 +159,8 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		}
 		Map<Integer, Object> objMap = new HashMap<Integer, Object>();
 		for (int i = 0; i < tankObj.size(); i++) {
+			String keeperNames = keeperHouseMapper.getKeepNames(Integer.parseInt(tankObj.get(i).getId()));
+			tankObj.get(i).setKeeperNames(keeperNames);
 			objMap.put(Integer.parseInt(tankObj.get(i).getId()), tankObj.get(i));
 		}
 		return objMap;
@@ -217,6 +223,8 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		}
 		Map<Integer, Object> objMap = new HashMap<Integer, Object>();
 		for (BasicStorehouse obj : houseObj) {
+			String keeperNames = keeperHouseMapper.getKeepNames(obj.getStorehouseId());
+			obj.setDutystoreman(keeperNames);
 			objMap.put(obj.getStorehouseId(), obj);
 		}
 		return objMap;
@@ -253,6 +261,8 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		}
 		Map<String, Object> objMap = new HashMap<>();
 		for (BasicStorehouse obj : houseObj) {
+			String keeperNames = keeperHouseMapper.getKeepNames(obj.getStorehouseId());
+			obj.setDutystoreman(keeperNames);
 			objMap.put(obj.getStorehouseCode(), obj);
 		}
 		return objMap;
@@ -612,7 +622,7 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 	public String getStorehouseKeeper(Integer id, Integer orgId, boolean flag) {
 		String keeperNames = "";
 
-		/* 获取这个仓房的所有保管员的员工ID */
+		/* 获取这个仓房下的所有保管员的用户ID */
 		List<Integer> keep_list = keeperHouseService.getKeeperId(orgId, id);
 
 		//2、然后把这些人的翻译过来，展示出来
@@ -1470,4 +1480,10 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		return map;
 	}
 
+	@Override
+	public String getKeeperNames(Integer houseId) throws Exception {
+		String keeperNames = keeperHouseMapper.getKeepNames(houseId);
+		return keeperNames;
+	}
+
 }