询价列表查询过滤条件更新

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -23,11 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 public class InquiryServiceImpl implements InquiryService {

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -581,38 +581,27 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
      */
     @Override
     public void coverInquiryItemProdToUser(Long enUU) throws Exception {
-		System.out.println("开始时间" + new Date());
 		long start = System.currentTimeMillis();
-//		String codePrefix = DateUtils.format(new Date(), "yyMMddHHmm") + StringUtil.getRandomNumber(3);
 		String importId = StringUtil.getRandomNumber(8);
-		System.out.println("importId:" + importId);
         int size = 1000;
         int page = 1;
 		int i = 0;
         String countSql = "select count(1) from (select id_prid,id_venduu,id_venduseruu,count(1) as nums from purc$inquiryitems left join purc$inquiry on id_inid = in_id" +
 				"        where id_venduseruu is not null and id_status = 201 and in_enuu = " + enUU + " group by id_prid,id_venduseruu,id_venduu order by count(1) desc)";
         Integer count = commonDao.queryForObject(countSql, Integer.class);
-		System.out.println("循环次数：" + Math.ceil((double)count / (double)size));
         for (; page <= Math.ceil((double)count / (double)size); page++ ) {
-			System.out.println("开始循环：" + page);
 			String sql = "select " + importId + " as pr_import_id, pr_title,pr_code,pr_spec,pr_unit,pr_minpack,pr_minorder,pr_leadtime,pr_ltinstock,pr_brand,pr_cmpcode,'B2B' as pr_sourceapp,id_prid as pr_sourceid,1 as pr_issale,0 aspr_ispurchase,pr_isshow,pr_ispubsale,pr_standard,pr_create_time,id_venduu as pr_enuu,id_venduseruu as pr_useruu from (" +
 					" select P.*,t.*,rownum r from (select id_prid,id_venduu,id_venduseruu,count(1) as nums from purc$inquiryitems left join purc$inquiry on id_inid = in_id " +
 					" where id_venduseruu is not null and id_status = 201 and in_enuu = " + enUU + " group by id_prid,id_venduseruu,id_venduu order by count(1) desc " +
 					" ) t left join v$products P on id_prid = pr_id where P.pr_title is not null and P.pr_code is not null and rownum <= 10" +
 					") where r > 0";
-			System.out.println(sql);
 			List<ProductTemp> productTemps = commonDao.query(sql, ProductTemp.class);
-			System.out.println(enUU + "找到询价单详情" + productTemps.size());
 			// 本地校验
 			checkTempProducts(productTemps);
 			// 保存到公共库
 			saveToDataCenter(productTemps);
-			System.out.println("循环一次物料：" + productTemps.size());
 			i += productTemps.size();
-			System.out.println("结束循环：" + page + "耗时：" + (System.currentTimeMillis() - start));
 		}
-		System.out.println("总计处理物料：" + i);
-		System.out.println("结束循环耗时：" + (System.currentTimeMillis() - start));
     }
 
 	/**
@@ -630,7 +619,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 			productTempDao.matchExists(importId);
 			// 已禁用物料自动解禁
 			productTempDao.toggleDisabled(importId);
-			System.out.println("校验:" + (System.currentTimeMillis() - start));
 		}
 	}
 
@@ -643,11 +631,9 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 			String importId = temps.get(0).getPr_import_id();
 			// 已匹配+未匹配到的物料
 			List<Product> products = productTempDao.getProducts(importId);
-			System.out.println("取匹配后结果:" + (System.currentTimeMillis() - start));
 			start = System.currentTimeMillis();
 			// 更新物料并插入个人物料
 			ModelMap map = ProductUtils.paginationUpdateAndAddToProductUser(products);
-			System.out.println("更新物料:" + (System.currentTimeMillis() - start));
 		}
 	}
 
@@ -810,7 +796,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		// 通过相关的id在inquiry表中查询信息，再根据状态进行过滤
 		for (PurchaseInquiryItem purcInquiry : purchaseInquiryItem) {
 			PurchaseInquiry purcInqury = purchaseInquiryDao.findOne(purcInquiry.getInquiry().getId());
-			if (purcInqury.getOverdue().equals(Constant.NO)) {
+			if (null != purcInqury && purcInqury.getOverdue().equals(Constant.NO)) {
 				list.add(purcInqury);
 				number = list.size();
 			}

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -474,9 +474,6 @@ margin-left: 55px;
 					<a href="javascript:void(0)" ng-if="isUnread(inquiryItem.id)">
 						<i class="fa fa-circle" style="color: #f40;"></i>
 					</a>&nbsp;&nbsp;
-						<!--<span> <input type="checkbox" class="selector"
-									  ng-model="inquiryItem.$selected">
-						</span> -->
 					<span class="text-num text-bold"
 									  title="{{inquiryItem.inquiry.date}}"
 									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
@@ -495,7 +492,7 @@ margin-left: 55px;
 			</td>
 			<td class="text-right" colspan="1" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
-					<span class="text-inverse text-bold" ng-bind-html="::inquiryItem.inquiry.endDate | datespan"></span>
+					<span class="text-inverse text-bold" ng-bind-html="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></span>
 				</div>
 			</td>
 			<td class="text-center">

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -323,7 +323,7 @@
 			</td>
 			<td class="text-right" colspan="1" class="order-sum">
 				<div ng-if="inquiryItem.replyable">
-					<span class="text-inverse text-bold" ng-bind-html="inquiryItem.inquiry.endDate | datespan"></span>
+					<span class="text-inverse text-bold" ng-bind-html="inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></span>
 				</div>
 			</td>
 			<td class="text-center">
@@ -520,7 +520,7 @@
 					<span class="text-trans error">未采纳</span>
 				</div>
 				<div ng-if="inquiryItem.status == 200">
-					<div ng-if="inquiryItem.overdue == 0 && inquiryItem.inquiry.check != 1">
+					<div ng-if="inquiryItem.overdue == 0 && inquiryItem.inquiry.check != 1 && inquiryItem.invalid == 0">
 						<div ng-show="!inquiryItem.$editing">
 							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; getToken()">报 价</a>
 						</div>
@@ -549,6 +549,9 @@
 					<div ng-if="inquiryItem.overdue == 1" class="block">
 						<span class="text-trans error">已过期</span>
 					</div>
+					<div ng-if="inquiryItem.invalid == 1" class="block">
+						<span class="text-trans text-light">已失效</span>
+					</div>
 				</div>
                 <div ng-if="(inquiryItem.status == 201 && (inquiryItem.agreed != null) || inquiryItem.overdue == 1) && inquiryItem.inquiry.check != 1">
                     <br><br>