公共询价取数更新

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

@@ -776,7 +776,7 @@ public class SaleInquiryController {
 	 */
 	@RequestMapping(value = "/messageList", method = RequestMethod.GET)
 	@ResponseBody
-	private List<InquiryMessage> getMessageList() {
+	private List<InquiryMessage> getMessageList() throws Exception {
 		return purchaseInquiryService.getMessageList();
 	}
 

src/main/java/com/uas/platform/b2b/dao/UserDao.java

@@ -67,7 +67,7 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 	 * @return
 	 */
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU like %:userUU%")
+	@Query("select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userUU = :userUU")
 	public List<User> findByEnUUAndUserUU(@Param("enUU") long enUU, @Param("userUU") long userUU);
 
 	/**

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.parser.Feature;
 import com.uas.account.support.Page;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
+import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -24,7 +25,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://218.17.158.219:24000";
+    private static String url = "http://192.168.253.192:8080";
 
     /**
      * 传递数据到公共询价接口方法
@@ -152,8 +153,9 @@ public class InquiryUtils {
      * @throws Exception
      */
     public static void decide(Long id, Short status) throws Exception {
-        JSONObject formData = JSON.parseObject(JSON.toJSONString(id));
-        formData.putAll(JSON.parseObject(JSON.toJSONString(status)));
+        JSONObject formData = new JSONObject();
+        formData.put("id", id);
+        formData.put("status", status);
         HttpUtil.Response res = HttpUtil.sendPostRequest(url + "/inquiry/buyer/decide", formData);
         if (res.getStatusCode() != 200) {
             throw new Exception("审核失败");
@@ -237,8 +239,8 @@ public class InquiryUtils {
      */
     public static InquiryDetailInfo getQutation(Long id, Long enuu) throws Exception {
         JSONObject formData = new JSONObject();
-        formData.put("id", FlexJsonUtils.toJsonDeep(id));
-        formData.put("enuu", FlexJsonUtils.toJsonDeep(enuu));
+        formData.put("id", id);
+        formData.put("enuu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/buyer/detail", formData);
         if (res.getStatusCode() == 200) {
             if (null != res.getResponseText()) {
@@ -249,4 +251,27 @@ public class InquiryUtils {
         }
         return null;
     }
+
+    /**
+     * 查询最新询价数据
+     *
+     * @param enuu 企业UU
+     * @param size 大小
+     * @return
+     * @throws Exception
+     */
+    public static List<InquiryMessage> getQutation(Long enuu, Integer size) throws Exception {
+        JSONObject formData = new JSONObject();
+        formData.put("enuu", enuu);
+        formData.put("size", size);
+        HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/public/messageList", formData);
+        if (res.getStatusCode() == 200) {
+            if (null != res.getResponseText()) {
+                return JSONObject.parseArray(res.getResponseText(), InquiryMessage.class);
+            }
+        } else {
+            throw new Exception("数据查询失败： " + res.getStatusCode());
+        }
+        return null;
+    }
 }

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryService.java

@@ -222,7 +222,7 @@ public interface PurchaseInquiryService {
 	 * 
 	 * @return
 	 */
-	public List<InquiryMessage> getMessageList();
+	public List<InquiryMessage> getMessageList() throws Exception;
 
 	/**
 	 *  修改作废状态

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

@@ -11,6 +11,7 @@ import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.exception.NotFoundException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
+import com.uas.ps.core.util.exception.FlexJsonUtils;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -24,6 +24,7 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import com.uas.ps.core.util.exception.FlexJsonUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import org.apache.commons.collections.CollectionUtils;

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

@@ -13,6 +13,7 @@ import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.ps.InquiryUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.ProductUsersService;
@@ -758,8 +759,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	}
 
 	@Override
-	public List<InquiryMessage> getMessageList() {
-		String sql = "select * from (select p.id_id id, p.id_prid productId, p.id_date as \"date\", i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
+	public List<InquiryMessage> getMessageList() throws Exception {
+		/*String sql = "select * from (select p.id_id id, p.id_prid productId, p.id_date as \"date\", i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
 				+ SystemSession.getUser().getEnterprise().getUu()
 				+ "and i.in_enddate > trunc(sysdate) and nvl(p.id_overdue, 0) <> 1 order by id_id desc) where rownum <= 7";
 		List<PurcInquiryItem> items = commonDao.query(sql, PurcInquiryItem.class);
@@ -779,8 +780,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				message.setLastest(isToday(item.getDate()));
 				messages.add(message);
 			}
-		}
-		return messages;
+		}*/
+		return InquiryUtils.getQutation(SystemSession.getUser().getEnterprise().getUu(), 7);
 	}
 
 	/**

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

@@ -5412,7 +5412,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 转客户询价
         $scope.transtoInquiry = function (inquiryItem) {
             publicInquiry.quotationInfo({id: inquiryItem.id}, function(data) {
-                console.log(data);
                 if (data.inquiryItem) { //存在已报价的就不进行报价操作
                     toaster.pop('error', '该询价单已已经报价');
                 } else {
@@ -5490,27 +5489,26 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 保存报价信息
         $scope.save = function(inquiryItem, method) {
-            console.log(inquiryItem);
-            // var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
-            // $upload.upload({
-            //     url: 'pubInquiry/turnToQuotation',
-            //     file: file,
-            //     method: 'POST',
-            //     data: {
-            //         item: inquiryItem,
-            //         method: method
-            //     }
-            // }).success(function (data) {
-            //     if (data.item) {
-            //         item = data.item;
-            //     }
-            //     $scope.loading = false;
-            //     toaster.pop('info', '提示', '报价成功');
-            //     $modalInstance.close();
-            // }).error(function (data) {
-            //     $scope.loading = false;
-            //     toaster.pop('error', '附件上传失败');
-            // });
+            var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
+            $upload.upload({
+                url: 'pubInquiry/turnToQuotation',
+                file: file,
+                method: 'POST',
+                data: {
+                    item: inquiryItem,
+                    method: method
+                }
+            }).success(function (data) {
+                if (data.item) {
+                    item = data.item;
+                }
+                $scope.loading = false;
+                toaster.pop('info', '提示', '报价成功');
+                $modalInstance.close();
+            }).error(function (data) {
+                $scope.loading = false;
+                toaster.pop('error', '附件上传失败');
+            });
         }
 
         $scope.previewShow = false;
@@ -5562,7 +5560,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * 公共询价详情
      */
-    app.controller('PublicInquiryListDetailCtrl', ['$scope', '$stateParams', 'PurchaseInquiry', '$filter', 'toaster', 'BaseService', 'ngTableParams', 'AccountEnterprise', 'publicInquiry', 'publicInquiryList', function ($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, AccountEnterprise, publicInquiry, publicInquiryList) {
+    app.controller('PublicInquiryListDetailCtrl', ['$scope', '$stateParams', 'PurchaseInquiry', '$filter', 'toaster', 'BaseService', 'ngTableParams', 'AccountEnterprise', 'publicInquiry', 'publicInquiryList', '$modal', function ($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, AccountEnterprise, publicInquiry, publicInquiryList, $modal) {
         BaseService.scrollBackToTop();
         $scope.currentHasBid = false;
         var loadData = function () {
@@ -5603,6 +5601,33 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('error', '提示', response.data);
             });
         }
+
+        // 转客户询价
+        $scope.transtoInquiry = function (inquiryItem) {
+            publicInquiry.quotationInfo({id: inquiryItem.id}, function(data) {
+                if (data.inquiryItem) { //存在已报价的就不进行报价操作
+                    toaster.pop('error', '该询价单已已经报价');
+                } else {
+                    var modalInstance = $modal.open({
+                        templateUrl: 'static/tpl/index/baseInfo/modal/quotation_modal.html',
+                        controller: 'QuoteCtrl',
+                        size: 'lg',
+                        resolve: {
+                            inquiryItem: function () {
+                                return inquiryItem
+                            }
+                        }
+                    });
+
+                    modalInstance.result.then(function (data) {
+                        $scope.tableParams.reload();
+                    }, function () {
+
+                    });
+                }
+            });
+
+        }
     }]);
 
     // 询价单明细

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

@@ -753,7 +753,7 @@ input[type="radio"], input[type="checkbox"] {
         <tbody>
         <tr>
             <td><span ng-bind="::inquiryItem.product.title"></span></td>
-            <td><span ng-bind="::inquiryItem.product.code"></span></td>
+            <td><span ng-bind="::inquiryItem.product.cmpCode"></span></td>
             <td><span ng-bind="::inquiryItem.product.brand"></span></td>
             <td><span ng-bind="::inquiryItem.product.spec"></span></td>
             <td><span ng-bind="::inquiryItem.product.unit"></span></td>
@@ -766,6 +766,6 @@ input[type="radio"], input[type="checkbox"] {
         </tbody>
     </table>
     <div class="footer">
-        <button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
+        <button class="btn" ng-click="transtoInquiry(inquiryItem)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
     </div>
 </div>