【UAS招标】提问列表招标单号链接修改；新增招标单加入疑问截止时间填写；删除调试的System.out输出。

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -652,7 +652,6 @@ public class DeputyOrderController {
 			ResponseWrap res = com.uas.sso.common.util.HttpUtil.doGet(redirectUrl.toString());
 			if (!res.isSuccess())
 				map.put("error", "暂未获取到相关数据");
-			System.out.println(res.getContent());
 			JSONObject jsonObject = JSONObject.parseObject(res.getContent());
 			if (jsonObject != null) {
 				String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");

src/main/java/com/uas/platform/b2b/controller/SnapshotController.java

@@ -469,7 +469,6 @@ public class SnapshotController {
 //				for (Object[] objects : list){
 //					count = count + Integer.valueOf(objects[0].toString());
 //				}
-//				System.out.println("product:" + count);
 //				hashtable.put("product", count);
 //				SystemSession.clear();
 			}
@@ -735,7 +734,6 @@ public class SnapshotController {
 //				for(Object[] objects : list){
 //					count = count + Integer.valueOf(objects[0].toString());
 //				}
-//				System.out.println("purcProduct:" + count);
 //				hashtable.put("purcProduct", count);
 //				SystemSession.clear();
 			}

src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -1,7 +1,6 @@
 
 package com.uas.platform.b2b.erp.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
@@ -97,7 +96,6 @@ public class InquiryController {
 	@ResponseBody
 	public List<InquiryDetail> getReply() {
 		List<InquiryDetail> details = inquiryService.convertPurchaseInquiryReply(purchaseInquiryService.findNotUploadReply());
-		System.out.println(JSON.toJSON(details));
 		logger.log("询价单", "下载询价单报价结果", details.size());
 		return details;
 	}

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

@@ -606,7 +606,6 @@ public class TenderServiceImpl implements TenderService {
                 obj.add(saleTender.getCode());
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String date = dateFormat.format(saleTender.getDate());
-                System.out.println(date);
                 obj.add(date);
                 sms.setParams(obj);
                 sms.setReceiver(saleTender.getUserTel());

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

@@ -504,7 +504,6 @@ public class SOAPConsoleServiceImpl implements SOAPConsoleService {
         JSONObject resultJo = getSOAPJson(SID, SIDParam);
 
         if ("6011".equals(resultJo.getString("retcode"))) {
-            System.out.print(resultJo.toJSONString());
             map.put("retmsg",resultJo.getString("retmsg"));
             map.put("retcode",resultJo.getString("retcode"));
             //修改开票单状态

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

@@ -87,7 +87,6 @@ public class VendorsServiceImpl implements VendorService {
 			String result = AccountUtils.synchronizeRecord(record);
 			vendor.setSynchStatus(Constant.YES);
 			vendorDao.save(vendor);
-			System.out.println(result);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/webapp/resources/js/index/app.js

@@ -17415,6 +17415,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 if ($scope.tender.publishDate instanceof Date) {
                     $scope.tender.publishDate = $scope.tender.publishDate.getTime();
                 }
+                if ($scope.tender.questionEndDate instanceof Date) {
+                    $scope.tender.questionEndDate = $scope.tender.questionEndDate.getTime();
+                }
 
                 $scope.tender.purchaseTenderProds = $scope.tenderProd;
                 for (var i = 0; i < $scope.tender.purchaseTenderProds.length; i++) {

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

@@ -887,6 +887,23 @@ input[type="radio"], input[type="checkbox"] {
                         </div>
                     </div>
                     <div class="col-xs-4">
+                        <span class="tender-desc f14" style="padding-top: 15px;">提问截止时间:</span>
+                        <div class="input-group input-trigger date-picker">
+                            <input type="text" ng-model="tender.questionEndDate" required
+                                   class="form-control" placeholder="点击选择提问截止日期" readonly="readonly"
+                                   datepicker-popup="yyyy-MM-dd" is-open="condition.$endOpened"
+                                   ng-required="true" min-date="currentDay()" max-date="getMaxDate()"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-focus="openDatePicker($event, condition, '$endOpened')"
+                                   ng-change="onDateCondition()"> <span
+                                class="input-group-btn">
+							<button type="button" class="btn btn-default btn-open"
+                                    ng-click="openDatePicker($event, condition, '$endOpened')">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+                        </div>
                     </div>
                     <div class="col-xs-12" style="position: relative; margin-bottom: 20px;">
                         <div class="tender-desc">上传招标文件：</div>

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

@@ -363,7 +363,7 @@
             <tr class="pro-line-sty01">
                 <td class="list-notnum" width="300" colspan="1">
                     <div>
-                        招标单号：<a ui-sref="purc.evaluation({id:tender.id})" target="_self" title="点击查看对应评标单">{{question.saleTenderAnswer.tenderCode}}</a>
+                        招标单号：<a ui-sref="purc.evaluation({id:question.saleTenderAnswer.tenderId})" target="_self" title="点击查看对应评标单">{{question.saleTenderAnswer.tenderCode}}</a>
                     </div>
                 </td>
                 <td class="list-notnum" width="350" colspan="2">

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

@@ -364,7 +364,7 @@
             <tr class="pro-line-sty01">
                 <td class="list-notnum" width="300" colspan="1">
                     <div>
-                        招标单号：<a ui-sref="sale.tender({id:tender.id})" target="_self" title="点击查看招标单详情">{{question.saleTenderAnswer.tenderCode}}</a>
+                        招标单号：<a ui-sref="sale.tender({id:question.saleTenderAnswer.tenderId})" target="_self" title="点击查看招标单详情">{{question.saleTenderAnswer.tenderCode}}</a>
                     </div>
                 </td>
                 <td class="list-notnum" width="350" colspan="2">