公共询价列表查询增加功能，如果已报价，显示已报价，并且查看详情时会跳转到已报价的详情

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

@@ -139,5 +139,4 @@ public class FileController {
         }
     }
 
-
 }

src/main/java/com/uas/platform/b2b/model/PurcInquiryItemInfo.java

@@ -145,12 +145,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_status")
 	private Short status;
 
-	/**
-	 * 是否采纳
-	 */
-	@Column(name = "id_agreed")
-	private Short agreed;
-
 	/**
 	 * 是否买家已设置分段数
 	 */
@@ -215,6 +209,26 @@ public class PurcInquiryItemInfo {
 	@Transient
     private String userTel;
 
+	/**** 针对客户，查询公共询价信息时展示的相关其他需求数据 *****/
+	/**
+	 * 是否已报价 1、是；0、否
+	 */
+	@Transient
+	private Short quoted;
+
+	/**
+	 * 如果已报价，记录已转报价后的明细id
+	 */
+	@Transient
+	private Long quteId;
+
+	/**
+	 * 是否已采纳
+	 */
+	@Transient
+	private Short agreed;
+	/****** end ******/
+
 	public Long getId() {
 		return id;
 	}
@@ -478,4 +492,20 @@ public class PurcInquiryItemInfo {
     public void setUserTel(String userTel) {
         this.userTel = userTel;
     }
+
+	public Short getQuoted() {
+		return quoted;
+	}
+
+	public void setQuoted(Short quoted) {
+		this.quoted = quoted;
+	}
+
+	public Long getQuteId() {
+		return quteId;
+	}
+
+	public void setQuteId(Long quteId) {
+		this.quteId = quteId;
+	}
 }

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

@@ -5349,7 +5349,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     // 公共询价列表
-    app.controller('PublicInquiryListCtrl', ['$scope', '$stateParams', 'PurchaseInquiry', '$filter', 'toaster', 'BaseService', 'ngTableParams', 'PurcInquiry', 'publicInquiry', 'publicInquiryList', '$modal', function ($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, PurcInquiry, publicInquiry, publicInquiryList, $modal) {
+    app.controller('PublicInquiryListCtrl', ['$scope', '$stateParams', 'PurchaseInquiry', '$filter', 'toaster', 'BaseService', 'ngTableParams', 'PurcInquiry', 'publicInquiry', 'publicInquiryList', '$modal', '$http', function ($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, PurcInquiry, publicInquiry, publicInquiryList, $modal, $http) {
         BaseService.scrollBackToTop();
         /**
          * 改变单据日期范围
@@ -5514,8 +5514,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         });
 
-        $scope.toDetail = function (id) {
-            window.location.hash = '#/baseInfo/inquiryList/' + id;
+        $scope.toDetail = function (item) {
+            if (item.quoted == 0) {
+                window.location.hash = '#/baseInfo/inquiryList/' + item.id;
+            } else {
+                window.open("#/sale/pubinquiry/" + item.quteId);
+            }
         };
 
         // 搜索框回车
@@ -5523,13 +5527,25 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
-        // 得到消息
+        //得到消息
         PurcInquiry.getMessage({}, function (data) {
             $scope.message = data;
         }, function (response) {
 
         });
 
+        /*$http({
+            method: 'GET',
+            dataType: 'JSON',
+            url: 'http://192.168.253.12:24000/inquiry/public/messageList',
+            async : false,
+            params: {enuu:10041559, size: 10},
+        }).success(function(data) {
+            console.log(data)
+        }).error(function() {
+            console.log('error')
+        });*/
+
         // 转客户询价
         $scope.transtoInquiry = function (inquiryItem) {
             publicInquiry.quotationInfo({id: inquiryItem.id}, function(data) {

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -389,27 +389,28 @@
                                </thead>
                                <tbody ng-if="active == 'all'">
                                     <tr ng-repeat="inquiryItem in $data">
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.brand || '无'"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.title || inquiryItem.prodTitle"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.cmpCode || inquiryItem.prodCode"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.product.spec || inquiryItem.spec"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
-                                        <td ng-click="toDetail(inquiryItem.id)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.brand || inquiryItem.inbrand"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.title || inquiryItem.prodTitle"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.cmpCode || inquiryItem.cmpCode"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.product.spec || inquiryItem.spec"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.needquantity"></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
+                                        <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>
                                         <td>
-                                            <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="isOverDue(inquiryItem.inquiry.endDate)">我要报价</a>
-                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
+                                            <a class="offer"ng-click="transtoInquiry(inquiryItem)" ng-if="isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1">我要报价</a>
+                                            <a class="offer" ng-if="!isOverDue(inquiryItem.inquiry.endDate) && inquiryItem.quoted != 1" ng-click="">已结束</a>
+                                            <a class="offer" ng-if="inquiryItem.quoted == 1" ng-click="">已报价</a>
                                         </td>
                                     </tr>
                                </tbody>
                                <tbody ng-if="active == 'teams'">
                                    <tr ng-repeat="inquiryItem in $data" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" title="查看详情">
                                        <td ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
-                                       <td ng-bind="inquiryItem.product.brand || '无'"></td>
-                                       <td ng-bind="inquiryItem.product.title"></td>
-                                       <td ng-bind="inquiryItem.product.cmpCode"></td>
-                                       <td ng-bind="inquiryItem.product.spec"></td>
+                                       <td ng-bind="inquiryItem.product.brand || inquiryItem.inbrand"></td>
+                                       <td ng-bind="inquiryItem.product.title || inquiryItem.prodTitle"></td>
+                                       <td ng-bind="inquiryItem.product.cmpCode || inquiryItem.cmpCode"></td>
+                                       <td ng-bind="inquiryItem.product.spec || inquiryItem.spec"></td>
                                        <td ng-bind="inquiryItem.needquantity"></td>
                                        <td ng-bind="inquiryItem.inquiry.enterprise.enName"><a></a></td>
                                        <td ng-bind="inquiryItem.inquiry.endDate| date: 'yyyy-MM-dd'"></td>