，

src/main/java/com/chinaitop/depot/business/controller/BusinessPlanController.java

@@ -76,17 +76,7 @@ public class BusinessPlanController {
     })
     public PageInfo<BusinessPlan> getList(Integer pageNum, Integer pageSize, Integer userId ,HttpServletRequest request, BusinessPlan businessPlan,String createTimeStart,String createTimeEnd) throws Exception {
 
-    	SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        if(createTimeStart!=null){
-        	
-            Date startDate = simpleDateFormat.parse(createTimeStart);
-            businessPlan.setKszxrq(startDate);
-        }
-        if(createTimeEnd!=null){
-        	Date endDate = simpleDateFormat.parse(createTimeEnd);
-        	businessPlan.setJzzxrq(endDate);
-        }
-        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, userId, businessPlan, "FIELD(audit_state,0,3,1,2,4 ), id desc", null);
+        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, userId, businessPlan, "FIELD(audit_state,0,3,1,2,4 ), id desc", null,createTimeStart,createTimeEnd);
         PageInfo<BusinessPlan> pageInfo = new PageInfo<BusinessPlan>(list);
         return pageInfo;
     }
@@ -106,7 +96,7 @@ public class BusinessPlanController {
     public PageInfo<BusinessPlan> getAuditPassList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan, Integer billType) {
         // 可以查询所有人通过的计划，必须是应用的.
         businessPlan.setAuditState(AuditType.AGREE.getAuditCode());
-        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, null, businessPlan, " agree_time desc", billType);
+        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, null, businessPlan, " agree_time desc", billType,null,null);
         double sumAmount = 0;
         if(list.size()>0){
         	for (int i = 0; i < list.size(); i++) {

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.java

@@ -55,4 +55,6 @@ public interface BusinessDeliveryStorageNoticeMapper {
 
 	//根据通知单状态查询数据--主表
     List<Map<String,Object>> uploadNoticeData(Map<String,Object> map);
+
+	List<Map<String, Object>> getNoticeData(Map<String, Object> mapCondition1);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -944,4 +944,40 @@
       </foreach>
     </if>
   </select>
+  
+  <select id="getNoticeData" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+        notice.*,
+        customer.address, <!-- 地址 -->
+        customer.identification,<!-- 身份证号 -->
+        customer.mobile,<!-- 手机号 -->
+        customer.social_credit_code identification,<!-- 社会信用代码 -->
+        customer.enterprise_phone mobile,<!-- 企业电话 -->
+        customer.account_number yhkh,
+		customer.bank_name khyhmc,
+		customer.account_name khyhhb,
+		customer.administrative_division skr,<!-- 收款人 -->
+		customer.business_regist_num jhkh, <!-- 计划客户 -->
+		enum.enumName planTypeName,
+        plan.execute_type planTypeId
+    FROM
+        business_delivery_storage_notice notice
+    left join business_customer customer on customer.id=notice.customer_bid
+    left join business_plan plan on notice.plan_bid = plan.id
+    left join basic_enum enum on  plan.execute_type = enum.enumId
+    WHERE ((notice.audit_state=2) or (notice.bill_type=2)) and 1 = 1 <!-- 审批通过的,中转通知单没有审批 -->
+    AND notice.in_Application in (1,3,4)
+    <if test="orgId != null" ><!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
+      AND notice.house_id = #{orgId,jdbcType=INTEGER}
+    </if>
+    <if test="ids != null" >
+      AND notice.id in
+      <foreach collection="ids" item="listItem" open="(" close=")" separator="," >
+        #{listItem}
+      </foreach>
+    </if>
+    <if test="ids == null" >
+      AND notice.id is null
+    </if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/business/service/BusinessPlanService.java

@@ -80,7 +80,7 @@ public interface BusinessPlanService {
      * @return
      */
     List<BusinessPlan> queryByExample(Integer pageNum, Integer pageSize,
-            Integer userId, BusinessPlan businessPlan, String order, Integer billType);
+            Integer userId, BusinessPlan businessPlan, String order, Integer billType,String createTimeStart,String createTimeEnd);
 
     
     /**

src/main/java/com/chinaitop/depot/business/service/impl/BusinessPlanServiceImpl.java

@@ -729,7 +729,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
 
     @Override
     public List<BusinessPlan> queryByExample(Integer pageNum, Integer pageSize,
-            Integer userId, BusinessPlan businessPlan, String order, Integer billType) {
+            Integer userId, BusinessPlan businessPlan, String order, Integer billType,String createTimeStart,String createTimeEnd) {
         BusinessPlanExample example = new BusinessPlanExample();
         Criteria createCriteria = example.createCriteria();
         if (userId != null) {
@@ -774,6 +774,24 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
         	createCriteria.andJzzxrqLessThanOrEqualTo(businessPlan.getJzzxrq());
         }
         
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+        	if(createTimeStart!=null && createTimeStart!=""){
+        		createTimeStart = createTimeStart+" "+"00:00:00";
+        		Date startDate = simpleDateFormat.parse(createTimeStart);
+        		createCriteria.andCreateTimeGreaterThanOrEqualTo(startDate);
+        	}
+        	if(createTimeEnd!=null && createTimeEnd!=""){
+        		createTimeEnd = createTimeEnd +" "+ "23:59:59";
+        		Date endtDate = simpleDateFormat.parse(createTimeEnd);
+        		createCriteria.andCreateTimeLessThanOrEqualTo(endtDate);
+        	}
+        	
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        
         //储备粮计划
         if(businessPlan.getAttributeType() != null ){
         	createCriteria.andAttributeTypeEqualTo(businessPlan.getAttributeType());

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -91,10 +91,19 @@ public class PushServiceImpl implements PushsService{
 			List<BusinessStoreWareDetail> json = businessStoreWareDetailMapper.selectByExample(businessStoreWareDetailExample);
 			mains.put("fromData",json);//从表数据以json形式插入主表数据
 		}
+		
+		Map<String,Object> mapCondition1 = new HashMap<String, Object>();
+		mapCondition1.put("orgId",orgId);
+		if(ParameterUtil.isnotnull(ids)) {
+			List<String> idsList = Arrays.asList(ids.split(","));
+			mapCondition1.put("ids", idsList);
+		}
+		List<Map<String,Object>> mainList1 =businessDeliveryStorageNoticeMapper.getNoticeData(mapCondition1);
 
         Map<String,Object> mapData = new HashMap<String, Object>();
 		mapData.put("status", "success");
 		mapData.put("mainData", mainList);
+		mapData.put("mainData1", mainList1);
 		return JSON.toJSONString(ResponseEntity.ok(mapData));
 	}