增加查询条件

src/main/java/com/chinaitop/depot/storage/controller/ClearanceConfirmationController.java

@@ -60,7 +60,7 @@ public class ClearanceConfirmationController {
     })
     public PageInfo<ClearanceConfirmation> getCleConList(Integer pageNum, Integer pageSize,
                                                      String storeName,
-                                                     String ajmc, Integer orgId) {
+                                                     Integer warehouseId, Integer orgId) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         if (pageNum != null && pageSize != null) {
             PageHelper.startPage(pageNum, pageSize);
@@ -71,8 +71,8 @@ public class ClearanceConfirmationController {
             if (null != storeName && !"".equals(storeName)) {
                 modelMap.put("storehouseName", storeName);
             }
-            if (null != ajmc && !"".equals(ajmc)) {
-                modelMap.put("ajmc", ajmc);
+            if (null != warehouseId && !"".equals(warehouseId)) {
+                modelMap.put("warehouseId", warehouseId);
             }
             /* 只能查询当前单位的数据  */
             if (null != orgId) {

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -114,6 +114,9 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
     <if test="orgId != null">
       AND AB.org_id = #{orgId,jdbcType=INTEGER}
     </if>
+    <if test="warehouseId != null">
+      AND cc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
     AND (cc.czbz = 'i' OR cc.czbz = 'u')
     order by cc.id desc
   </select>