Browse Source

多条件获取

gaodandan 5 years ago
parent
commit
79e661e6da

+ 3 - 1
src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

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

+ 13 - 3
src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -252,8 +252,14 @@ public class StorageDeviceGetController {
252
    	@ApiImplicitParams({
252
    	@ApiImplicitParams({
253
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query")
253
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query")
254
    	})
254
    	})
255
-    public List<StorageDeviceinput> getNumberGetList(String model){
256
-    	List<StorageDeviceinput> getNumberList=deviceInputService.getNumberGetList(model);
255
+    public List<StorageDeviceinput> getNumberGetList(String deviceTypeId,String deviceName,String shelfId,String model,Integer orgId){
256
+    	Map<String, Object> map  = new HashMap<>();
257
+		map.put("deviceName", deviceName);
258
+		map.put("deviceTypeId", deviceTypeId);
259
+		map.put("shelfId", shelfId);
260
+		map.put("model", model);
261
+		map.put("orgId", orgId);
262
+    	List<StorageDeviceinput> getNumberList=deviceInputService.getNumberGetList(map);
257
     	return getNumberList;
263
     	return getNumberList;
258
     }
264
     }
259
     
265
     
@@ -266,10 +272,14 @@ public class StorageDeviceGetController {
266
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query"),
272
    		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query"),
267
    		 @ApiImplicitParam(name = "number", value = "编号", paramType = "query")
273
    		 @ApiImplicitParam(name = "number", value = "编号", paramType = "query")
268
    	})
274
    	})
269
-    public List<StorageDeviceinput> getUseCountGetList(String number,String model){
275
+    public List<StorageDeviceinput> getUseCountGetList(String deviceTypeId,String deviceName,String shelfId,String number,String model,Integer orgId){
270
     		Map<String,Object> map = new HashMap<String,Object>();
276
     		Map<String,Object> map = new HashMap<String,Object>();
277
+    		map.put("deviceTypeId", deviceTypeId);
278
+    		map.put("deviceName", deviceName);
279
+    		map.put("shelfId", shelfId);
271
     		map.put("number", number);
280
     		map.put("number", number);
272
     		map.put("model", model);
281
     		map.put("model", model);
282
+    		map.put("orgId", orgId);
273
     		List<StorageDeviceinput> getUseCountList=deviceInputService.getUseCount(map);
283
     		List<StorageDeviceinput> getUseCountList=deviceInputService.getUseCount(map);
274
     	return getUseCountList;
284
     	return getUseCountList;
275
     }
285
     }

+ 1 - 1
src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.java

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

+ 8 - 3
src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -591,9 +591,11 @@
591
 
591
 
592
   
592
   
593
 
593
 
594
-   <select id="getNumberGetList" parameterType="java.lang.String" resultMap="BaseResultMap">
594
+   <select id="getNumberGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
595
 
595
 
596
-   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model};
596
+   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model} and device_type=#{deviceTypeId} and
597
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
598
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId}; 
597
 
599
 
598
   </select>
600
   </select>
599
 
601
 
@@ -609,7 +611,10 @@
609
 
611
 
610
    <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
612
    <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
611
 
613
 
612
-   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model};
614
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
615
+    and device_type=#{deviceTypeId} and
616
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
617
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId};
613
 
618
 
614
   </select>
619
   </select>
615
 
620
 

+ 1 - 1
src/main/java/com/chinaitop/depot/device/service/StorageDeviceInputService.java

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

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

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