diff --git a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
index d7b3933312..a792aaf5e1 100644
--- a/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
+++ b/Api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java
@@ -9,7 +9,6 @@
 import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodePurchaseApplyConstant;
-import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.api.purchaseApply.ApiPurchaseApplyDataVo;
 import com.java110.vo.api.purchaseApply.ApiPurchaseApplyVo;
@@ -60,7 +59,7 @@ public void setPurchaseApplyInnerServiceSMOImpl(IPurchaseApplyInnerServiceSMO pu
 
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写订单类型");
+        //Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写订单类型");
         super.validatePageInfo(reqJson);
     }
 
@@ -73,25 +72,10 @@ protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context,
 
         List<ApiPurchaseApplyDataVo> purchaseApplys = null;
         if (count > 0) {
+            List<PurchaseApplyDto> purchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyAndDetails(purchaseApplyDto);
+            purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ApiPurchaseApplyDataVo.class);
             purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto), ApiPurchaseApplyDataVo.class);
-            List<String> orderIds = new ArrayList<>();
-            for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
-                orderIds.add(apiPurchaseApplyDataVo.getApplyOrderId());
-            }
-            //明细列表
-            PurchaseApplyDetailDto purchaseApplyDetailDto = new PurchaseApplyDetailDto();
-            purchaseApplyDetailDto.setApplyOrderIds(orderIds);
-            List<PurchaseApplyDetailVo> purchaseApplyDetailVos = BeanConvertUtil.covertBeanList(purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyDetails(purchaseApplyDetailDto), PurchaseApplyDetailVo.class);
 
-            for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
-                List<PurchaseApplyDetailVo> applyDetailList = new ArrayList<>();
-                for( PurchaseApplyDetailVo purchaseApplyDetailVo : purchaseApplyDetailVos){
-                    if(apiPurchaseApplyDataVo.getApplyOrderId().equals(purchaseApplyDetailVo.getApplyOrderId())){
-                        applyDetailList.add(purchaseApplyDetailVo);
-                    }
-                }
-                apiPurchaseApplyDataVo.setPurchaseApplyDetailVo(applyDetailList);
-            }
             for( ApiPurchaseApplyDataVo apiPurchaseApplyDataVo : purchaseApplys){
                 List<PurchaseApplyDetailVo> applyDetailList = apiPurchaseApplyDataVo.getPurchaseApplyDetailVo();
                 StringBuffer resNames = new StringBuffer();
diff --git a/StoreService/src/main/java/com/java110/store/dao/IPurchaseApplyServiceDao.java b/StoreService/src/main/java/com/java110/store/dao/IPurchaseApplyServiceDao.java
index 14bd2c8f6f..d54306889e 100644
--- a/StoreService/src/main/java/com/java110/store/dao/IPurchaseApplyServiceDao.java
+++ b/StoreService/src/main/java/com/java110/store/dao/IPurchaseApplyServiceDao.java
@@ -1,6 +1,7 @@
 package com.java110.store.dao;
 
 
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.utils.exception.DAOException;
 import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
 
@@ -68,6 +69,8 @@ public interface IPurchaseApplyServiceDao {
      */
     List<Map> getPurchaseApplyInfo(Map info) throws DAOException;
 
+    List<PurchaseApplyDto> getPurchaseApplyInfo2(Map info) throws DAOException;
+
 
     //查询采购明细
     List<Map> getPurchaseApplyDetailInfo(Map info) throws DAOException;
diff --git a/StoreService/src/main/java/com/java110/store/dao/impl/PurchaseApplyServiceDaoImpl.java b/StoreService/src/main/java/com/java110/store/dao/impl/PurchaseApplyServiceDaoImpl.java
index 8cb01bf3f9..ee9675a3ac 100644
--- a/StoreService/src/main/java/com/java110/store/dao/impl/PurchaseApplyServiceDaoImpl.java
+++ b/StoreService/src/main/java/com/java110/store/dao/impl/PurchaseApplyServiceDaoImpl.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.store.dao.IPurchaseApplyServiceDao;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
@@ -118,6 +119,15 @@ public List<Map> getPurchaseApplyInfo(Map info) throws DAOException {
         return businessPurchaseApplyInfos;
     }
 
+    @Override
+    public List<PurchaseApplyDto> getPurchaseApplyInfo2(Map info) throws DAOException {
+        logger.debug("查询采购申请信息 入参 info : {}",info);
+
+        List<PurchaseApplyDto> businessPurchaseApplyInfos = sqlSessionTemplate.selectList("purchaseApplyServiceDaoImpl.getPurchaseApplyInfo2",info);
+
+        return businessPurchaseApplyInfos;
+    }
+
     @Override
     public List<Map> getPurchaseApplyDetailInfo(Map info) throws DAOException {
         logger.debug("查询采购申请明细信息 入参 info : {}",info);
diff --git a/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java b/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
index 93c0b93247..26a8b45ce0 100644
--- a/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
+++ b/StoreService/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
@@ -61,6 +61,33 @@ public List<PurchaseApplyDto> queryPurchaseApplys(@RequestBody  PurchaseApplyDto
         return purchaseApplys;
     }
 
+    @Override
+    public List<PurchaseApplyDto> queryPurchaseApplyAndDetails(@RequestBody  PurchaseApplyDto purchaseApplyDto) {
+
+        //校验是否传了 分页信息
+
+        int page = purchaseApplyDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            purchaseApplyDto.setPage((page - 1) * purchaseApplyDto.getRow());
+        }
+
+        List<PurchaseApplyDto> purchaseApplys = BeanConvertUtil.covertBeanList(purchaseApplyServiceDaoImpl.getPurchaseApplyInfo2(BeanConvertUtil.beanCovertMap(purchaseApplyDto)), PurchaseApplyDto.class);
+
+        if (purchaseApplys == null || purchaseApplys.size() == 0) {
+            return purchaseApplys;
+        }
+
+        String[] userIds = getUserIds(purchaseApplys);
+        //根据 userId 查询用户信息
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (PurchaseApplyDto purchaseApply : purchaseApplys) {
+            refreshPurchaseApply(purchaseApply, users);
+        }
+        return purchaseApplys;
+    }
+
     /**
      * 从用户列表中查询用户，将用户中的信息 刷新到 floor对象中
      *
diff --git a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js
index 450d96c7c3..155844389b 100644
--- a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js
+++ b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-detail/purchaseApplyDetail.js
@@ -35,8 +35,7 @@
                     params:{
                         page:_page,
                         row:_rows,
-                        applyOrderId:vc.component.purchaseApplyDetailInfo.applyOrderId,
-                        resOrderType:'10000'
+                        applyOrderId:vc.component.purchaseApplyDetailInfo.applyOrderId
                     }
                 };
 
diff --git a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html
index 34d8e74be7..9ae389750a 100644
--- a/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html
+++ b/WebService/src/main/resources/components/purchaseApplyPackage/purchaseApply-manage/purchaseApplyManage.html
@@ -64,8 +64,10 @@ <h5>采购申请信息</h5>
                     >
                         <thead>
                         <tr>
+                            <th class="text-center">单号</th>
                             <th class="text-center">审批状态</th>
                             <th class="text-center">申请人</th>
+                            <th class="text-center">流程处理人</th>
                             <th class="text-center">申请时间</th>
                             <th class="text-center">物品</th>
                             <th class="text-center">总计价格</th>
@@ -74,8 +76,10 @@ <h5>采购申请信息</h5>
                         </thead>
                         <tbody>
                         <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
+                            <td class="text-center">{{purchaseApply.applyOrderId}}</td>
                             <td class="text-center">{{purchaseApply.stateName}}</td>
                             <td class="text-center">{{purchaseApply.userName}}</td>
+                            <td class="text-center">{{purchaseApply.applyUser}}</td>
                             <td class="text-center">{{purchaseApply.createTime}}</td>
                             <td class="text-center">{{purchaseApply.resourceNames}}</td>
                             <td class="text-center">{{purchaseApply.totalPrice}}</td>
diff --git a/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.html b/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.html
index f4b568dc82..3e0636fef2 100644
--- a/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.html
+++ b/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.html
@@ -55,6 +55,8 @@ <h3 class="modal-title" id="chooseResourceStoreModelLabel2">选择物品管理</
                                     </tr>
                                     </tbody>
                                 </table>
+                                <!-- 分页 -->
+                                <vc:create name="pagination"></vc:create>
                                 <div class="ibox-content" v-if="chooseResourceStoreInfo2.resourceStores.length > 0">
 
                                     <button class="btn btn-primary float-right" type="button" v-on:click="getSelectResourceStores()">
diff --git a/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.js b/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.js
index a6f40acbcb..d8c901ecce 100644
--- a/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.js
+++ b/WebService/src/main/resources/components/resourceStorePackage/choose-resourceStore2/chooseResourceStore2.js
@@ -1,4 +1,6 @@
 (function(vc){
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
     vc.extends({
         propTypes: {
            emitChooseResourceStore:vc.propTypes.string,
@@ -16,18 +18,21 @@
         _initEvent:function(){
             vc.on('chooseResourceStore2','openChooseResourceStoreModel2',function(_param){
                 $('#chooseResourceStoreModel2').modal('show');
-                vc.component._refreshchooseResourceStoreInfo2();
-                vc.component._loadAllResourceStoreInfo(1,10,'');
+                vc.component.chooseResourceStoreInfo2._currentResourceStoreName = "";
+                vc.component._loadAllResourceStoreInfo(_currentPage, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._loadAllResourceStoreInfo(_currentPage, DEFAULT_ROWS);
             });
+
         },
         methods:{
-            _loadAllResourceStoreInfo:function(_page,_row,_name){
+            _loadAllResourceStoreInfo:function(_page,_row){
                 var param = {
                     params:{
                         page:_page,
                         row:_row,
-                        communityId:vc.getCurrentCommunity().communityId,
-                        name:_name
+                        communityId:vc.getCurrentCommunity().communityId
                     }
                 };
 
@@ -38,6 +43,12 @@
                              function(json){
                                 var _resourceStoreInfo = JSON.parse(json);
                                 vc.component.chooseResourceStoreInfo2.resourceStores = _resourceStoreInfo.resourceStores;
+                                 vc.component.chooseResourceStoreInfo2.total = _resourceStoreInfo.total;
+                                 vc.component.chooseResourceStoreInfo2.records = _resourceStoreInfo.records;
+                                 vc.emit('pagination', 'init', {
+                                     total: vc.component.chooseResourceStoreInfo2.records,
+                                     currentPage: _page
+                                 });
                              },function(){
                                 console.log('请求失败处理');
                              }
@@ -56,9 +67,6 @@
             queryResourceStores:function(){
                 vc.component._loadAllResourceStoreInfo(1,10,vc.component.chooseResourceStoreInfo2._currentResourceStoreName);
             },
-            _refreshchooseResourceStoreInfo2:function(){
-                vc.component.chooseResourceStoreInfo2._currentResourceStoreName = "";
-            },
             getSelectResourceStores:function () {
                 var selectResourceStores = vc.component.chooseResourceStoreInfo2.selectResourceStores;
                 var resourceStores = vc.component.chooseResourceStoreInfo2.resourceStores;
diff --git a/docs/document/api/activities/listActivitiess.md b/docs/document/api/activities/listActivitiess.md
index cb7b11fee5..2e2f4e9726 100644
--- a/docs/document/api/activities/listActivitiess.md
+++ b/docs/document/api/activities/listActivitiess.md
@@ -1,6 +1,6 @@
 
 
-**1\. 查询活动**
+**1\. 查询活动  **
 ###### 接口功能
 > 用户通过web端或APP查询活动接口
 
diff --git a/docs/document/api/applicationKey/applyApplicationKey.md b/docs/document/api/applicationKey/applyApplicationKey.md
index bd5d1cc5f1..2994a28f72 100644
--- a/docs/document/api/applicationKey/applyApplicationKey.md
+++ b/docs/document/api/applicationKey/applyApplicationKey.md
@@ -1,6 +1,6 @@
 
 
-**1\. 手机端申请钥匙**
+**1\. 手机端申请钥匙  **
 ###### 接口功能
 > 手机端申请钥匙接口
 
diff --git a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
index 7b4889fb73..43fa8b6236 100644
--- a/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java
@@ -1,9 +1,11 @@
 package com.java110.dto.purchaseApply;
 
 import com.java110.dto.PageDto;
+import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -18,17 +20,23 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     private String resOrderType;
     private String description;
     private String applyOrderId;
+    private String bId;
     private String state;
     private String storeId;
     private String userName;
     private String userId;
     private String stateName;
-
+    private List<PurchaseApplyDetailVo> purchaseApplyDetailVo;
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private String currentUserId;
+    private String processInstanceId;
+    private String taskId;
+    private String auditCode;
+    private String auditMessage;
 
 
     public String getResOrderType() {
@@ -55,6 +63,14 @@ public void setApplyOrderId(String applyOrderId) {
         this.applyOrderId = applyOrderId;
     }
 
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
     public String getState() {
         return state;
     }
@@ -87,6 +103,21 @@ public void setUserId(String userId) {
         this.userId = userId;
     }
 
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public List<PurchaseApplyDetailVo> getPurchaseApplyDetailVo() {
+        return purchaseApplyDetailVo;
+    }
+
+    public void setPurchaseApplyDetailVo(List<PurchaseApplyDetailVo> purchaseApplyDetailVo) {
+        this.purchaseApplyDetailVo = purchaseApplyDetailVo;
+    }
 
     public Date getCreateTime() {
         return createTime;
@@ -104,11 +135,43 @@ public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
 
-    public String getStateName() {
-        return stateName;
+    public String getCurrentUserId() {
+        return currentUserId;
     }
 
-    public void setStateName(String stateName) {
-        this.stateName = stateName;
+    public void setCurrentUserId(String currentUserId) {
+        this.currentUserId = currentUserId;
+    }
+
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getAuditCode() {
+        return auditCode;
+    }
+
+    public void setAuditCode(String auditCode) {
+        this.auditCode = auditCode;
+    }
+
+    public String getAuditMessage() {
+        return auditMessage;
+    }
+
+    public void setAuditMessage(String auditMessage) {
+        this.auditMessage = auditMessage;
     }
 }
diff --git a/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java b/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java
index 8acc51a751..95b2177761 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java
@@ -15,6 +15,7 @@ public class PurchaseApplyDetailVo {
     private List<String> applyOrderIds;
     private String bId;
     private String operate;
+    private String id;
 
 
     public String getApplyOrderId() {
@@ -104,6 +105,14 @@ public String getOperate() {
     public void setOperate(String operate) {
         this.operate = operate;
     }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }
 
 
diff --git a/java110-core/src/main/java/com/java110/core/smo/purchaseApply/IPurchaseApplyInnerServiceSMO.java b/java110-core/src/main/java/com/java110/core/smo/purchaseApply/IPurchaseApplyInnerServiceSMO.java
index 3f808875fa..f979f7dc31 100644
--- a/java110-core/src/main/java/com/java110/core/smo/purchaseApply/IPurchaseApplyInnerServiceSMO.java
+++ b/java110-core/src/main/java/com/java110/core/smo/purchaseApply/IPurchaseApplyInnerServiceSMO.java
@@ -32,6 +32,9 @@ public interface IPurchaseApplyInnerServiceSMO {
     @RequestMapping(value = "/queryPurchaseApplys", method = RequestMethod.POST)
     List<PurchaseApplyDto> queryPurchaseApplys(@RequestBody PurchaseApplyDto purchaseApplyDto);
 
+    @RequestMapping(value = "/queryPurchaseApplyAndDetails", method = RequestMethod.POST)
+    List<PurchaseApplyDto> queryPurchaseApplyAndDetails(@RequestBody PurchaseApplyDto purchaseApplyDto);
+
     /**
      * 查询<p>小区楼</p>总记录数
      *
diff --git a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
index af23d9d2d5..74f3c4d995 100644
--- a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
@@ -83,7 +83,7 @@
     <!-- 查询小区楼信息 add by wuxw 2018-07-03 -->
     <select id="getFloorInfo" parameterType="Map" resultType="Map">
         select t.floor_id,t.floor_id floorId,t.name,t.status_cd, t.status_cd statusCd,t.remark,t.b_id,
-        t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum,t.community_id communityId
+        t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum,t.community_id communityId,t.community_id
         from f_floor t
         where 1 =1
         <if test="floorId !=null and floorId != ''">
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index 2a7af613ea..73226de38b 100644
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -4,6 +4,33 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="purchaseApplyServiceDaoImpl">
 
+
+    <resultMap type="com.java110.dto.purchaseApply.PurchaseApplyDto" id="applyMap">
+        <id column="applyOrderId"  property="applyOrderId"/>
+        <result column="description"  property="description"/>
+        <result column="resOrderType"  property="resOrderType"/>
+        <result column="statusCd"  property="statusCd"/>
+        <result column="state"  property="state"/>
+        <result column="storeId"  property="storeId"/>
+        <result column="userName"  property="userName"/>
+        <result column="bId"  property="bId"/>
+        <result column="userId" property="userId"/>
+        <result column="createTime" property="createTime"/>
+        <result column="stateName" property="stateName"/>
+        <!-- 一对多关系 -->
+        <collection property="purchaseApplyDetailVo" ofType="com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo"  javaType="java.util.ArrayList">
+            <id property="id" column="id"/>
+            <result property="applyOrderId" column="applyOrderId"/>
+            <result property="resId" column="resId"/>
+            <result property="quantity" column="quantity"/>
+            <result property="resName" column="resName"/>
+            <result property="remark" column="remark"/>
+            <result property="resCode" column="resCode"/>
+            <result property="price" column="price"/>
+            <result property="stock" column="stock"/>
+        </collection>
+    </resultMap>
+
     <!-- 保存采购申请信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessPurchaseApplyInfo" parameterType="Map">
            insert into business_purchase_apply
@@ -17,14 +44,14 @@
         insert into business_purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-        (
+            (
             #{item.applyOrderId},
             #{item.resId},
             #{item.quantity},
             #{item.remark},
             #{item.bId},
             #{item.operate}
-        )
+            )
         </foreach>
     </insert>
 
@@ -50,11 +77,11 @@
     <!-- 查询采购申请信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessPurchaseApplyInfo" parameterType="Map" resultType="Map">
         select
-            t.operate,t.res_order_type resOrderType,
-            t.description,
-            t.apply_order_id applyOrderId,t.state,
-            t.store_id storeId,
-            t.user_name userName,t.b_id bId,t.user_id userId
+        t.operate,t.res_order_type resOrderType,
+        t.description,
+        t.apply_order_id applyOrderId,t.state,
+        t.store_id storeId,
+        t.user_name userName,t.b_id bId,t.user_id userId
         from business_purchase_apply t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -141,11 +168,12 @@
     <!-- 查询采购申请信息 add by wuxw 2018-07-03 -->
     <select id="getPurchaseApplyInfo" parameterType="Map" resultType="Map">
         select
-            t.res_order_type resOrderType,t.description,
-            t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
-            t.store_id storeId,t.user_name userName,
-            t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName
-        from purchase_apply t inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
+        t.res_order_type resOrderType,t.description,
+        t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
+        t.store_id storeId,t.user_name userName,
+        t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
+        from purchase_apply t
+        inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
         where 1 =1
         <if test="resOrderType !=null and resOrderType != ''">
             and t.res_order_type= #{resOrderType}
@@ -179,15 +207,61 @@
 
     </select>
 
+
+
+    <select id="getPurchaseApplyInfo2" parameterType="Map" resultMap="applyMap">
+        select
+        t.res_order_type resOrderType,t.description,
+        t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
+        t.store_id storeId,t.user_name userName,
+        t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
+        de.apply_order_id applyOrderId,de.res_id resId,de.quantity,de.remark,de.id,rs.res_name resName,rs.price,rs.stock,rs.res_code resCode
+        from purchase_apply t
+        inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
+        inner join purchase_apply_detail de on de.apply_order_id = t.apply_order_id
+        inner join resource_store rs on de.res_id = rs.res_id
+
+        where 1 =1
+        <if test="resOrderType !=null and resOrderType != ''">
+            and t.res_order_type= #{resOrderType}
+        </if>
+        <if test="description !=null and description != ''">
+            and t.description= #{description}
+        </if>
+        <if test="applyOrderId !=null and applyOrderId != ''">
+            and t.apply_order_id= #{applyOrderId}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and t.user_name like concat('%',#{userName},'%')
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
     <!-- 查询采购明细 -->
     <select id="getPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
         select
-            p.apply_order_id applyOrderId,
-            p.res_id resId,p.quantity,p.remark,
-            r.res_name resName,r.res_code resCode,
-            r.price,r.stock
+        p.apply_order_id applyOrderId,
+        p.res_id resId,p.quantity,p.remark,
+        r.res_name resName,r.res_code resCode,
+        r.price,r.stock
         from
-            purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id
+        purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id
         where 1=1
         <if test="applyOrderIds !=null">
             and p.apply_order_id in