多条件获取

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -74,7 +74,9 @@ public class DatePermissionInterceptor implements Interceptor {
 				if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
 					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
 							+ " WHERE FIND_IN_SET(org_id,getChildrenOrg("+orgId+"))) org_info ");
-				}else {
+				}else if(!"com.chinaitop.depot.device.mapper.StorageDeviceinputMapper.getNumberGetList".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.device.mapper.StorageDeviceinputMapper.getUseCount".equals(mappedStatement.getId())
+						){
 					//解析sql中的表名
 					Statement statement = CCJSqlParserUtil.parse(bouString);
 					Select selectStatement = (Select)statement;

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -252,8 +252,14 @@ public class StorageDeviceGetController {
    	@ApiImplicitParams({
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query")
    	})
-    public List<StorageDeviceinput> getNumberGetList(String model){
-    	List<StorageDeviceinput> getNumberList=deviceInputService.getNumberGetList(model);
+    public List<StorageDeviceinput> getNumberGetList(String deviceTypeId,String deviceName,String shelfId,String model,Integer orgId){
+    	Map<String, Object> map  = new HashMap<>();
+		map.put("deviceName", deviceName);
+		map.put("deviceTypeId", deviceTypeId);
+		map.put("shelfId", shelfId);
+		map.put("model", model);
+		map.put("orgId", orgId);
+    	List<StorageDeviceinput> getNumberList=deviceInputService.getNumberGetList(map);
     	return getNumberList;
     }
     
@@ -266,10 +272,14 @@ public class StorageDeviceGetController {
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query"),
    		 @ApiImplicitParam(name = "number", value = "编号", paramType = "query")
    	})
-    public List<StorageDeviceinput> getUseCountGetList(String number,String model){
+    public List<StorageDeviceinput> getUseCountGetList(String deviceTypeId,String deviceName,String shelfId,String number,String model,Integer orgId){
     		Map<String,Object> map = new HashMap<String,Object>();
+    		map.put("deviceTypeId", deviceTypeId);
+    		map.put("deviceName", deviceName);
+    		map.put("shelfId", shelfId);
     		map.put("number", number);
     		map.put("model", model);
+    		map.put("orgId", orgId);
     		List<StorageDeviceinput> getUseCountList=deviceInputService.getUseCount(map);
     	return getUseCountList;
     }

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.java

@@ -60,7 +60,7 @@ public interface StorageDeviceinputMapper {
 
    	List<ContentBean> getModelGetList(Map<String, Object> map);
 
-   	List<StorageDeviceinput> getNumberGetList(String model);
+   	List<StorageDeviceinput> getNumberGetList(Map<String, Object> map);
 
    	List<StorageDeviceinput> getUseCountGetList(String number);
 

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -591,9 +591,11 @@
 
   
 
-   <select id="getNumberGetList" parameterType="java.lang.String" resultMap="BaseResultMap">
+   <select id="getNumberGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
 
-   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model};
+   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model} and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId}; 
 
   </select>
 
@@ -609,7 +611,10 @@
 
    <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
 
-   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model};
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
+    and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId};
 
   </select>
 

src/main/java/com/chinaitop/depot/device/service/StorageDeviceInputService.java

@@ -49,7 +49,7 @@ public interface StorageDeviceInputService {
 
 	List<ContentBean> getModelGetList(Map<String, Object> map);
 
-	List<StorageDeviceinput> getNumberGetList(String model);
+	List<StorageDeviceinput> getNumberGetList(Map<String, Object> map);
 
 	List<StorageDeviceinput> getUseCountGetList(String number);
 

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceInputServiceImpl.java

@@ -155,9 +155,9 @@ public class StorageDeviceInputServiceImpl implements StorageDeviceInputService{
 
 	//获取规格型号对应的编号getNumberGetList
 	@Override
-	public List<StorageDeviceinput> getNumberGetList(String model) {
+	public List<StorageDeviceinput> getNumberGetList(Map<String, Object> map) {
 		// TODO Auto-generated method stub
-		return deviceInputMapper.getNumberGetList(model);
+		return deviceInputMapper.getNumberGetList(map);
 	}
 
 	//根据编号获取可用数量