处理求购验收问题

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseOfferController.java

@@ -119,7 +119,7 @@ public class SeekPurchaseOfferController {
      */
     @RequestMapping(value = "/getSeekPurchaseOfferList", method = RequestMethod.GET)
     @ResponseBody
-    public List<SeekPurchaseOffer> getSeekPurchaseOfferList(List<Long> spIds) {
+    public List<SeekPurchaseOffer> getSeekPurchaseOfferList(String spIds) {
         User user = SystemSession.getUser();
         logger.log("求购", "获取用户求购列表的报价状态，uu为" + user.getUserUU());
         return seekPurchaseOfferService.getSeekPurchaseOfferList(spIds, user);

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOfferGoods.java

@@ -79,12 +79,24 @@ public class SeekPurchaseOfferGoods {
     private Long enUu;
 
     /**
-     * 企业的详细信息
+     * 买家企业uu号
+     */
+    @Column(name = "sp_en_uu")
+    private Long spEnUu;
+
+    /**
+     * 买家求购的详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "of_enuu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_en_uu", insertable = false, updatable = false)
     private Enterprise enterprise;
 
+    /**
+     * 买家uu号
+     */
+    @Column(name = "sp_uu")
+    private Long spUu;
+
     /**
      * 卖家uu号
      */
@@ -95,7 +107,7 @@ public class SeekPurchaseOfferGoods {
      * 用户详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "of_uu", insertable = false, updatable = false)
+    @JoinColumn(name = "sp_uu", insertable = false, updatable = false)
     private User user;
 
     /**
@@ -265,6 +277,8 @@ public class SeekPurchaseOfferGoods {
     public String getUserName() {
         if (enterprise != null) {
             userName = enterprise.getEnName();
+        } else {
+            userName = user.getUserName();
         }
         return userName;
     }
@@ -319,4 +333,20 @@ public class SeekPurchaseOfferGoods {
     public Long getRemainingTime() {
         return deadline.getTime() - System.currentTimeMillis();
     }
+
+    public Long getSpEnUu() {
+        return spEnUu;
+    }
+
+    public void setSpEnUu(Long spEnUu) {
+        this.spEnUu = spEnUu;
+    }
+
+    public Long getSpUu() {
+        return spUu;
+    }
+
+    public void setSpUu(Long spUu) {
+        this.spUu = spUu;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseOfferService.java

@@ -70,5 +70,5 @@ public interface SeekPurchaseOfferService {
      * @param user
      * @return
      */
-    List<SeekPurchaseOffer> getSeekPurchaseOfferList(List<Long> spIds, User user);
+    List<SeekPurchaseOffer> getSeekPurchaseOfferList(String spIds, User user);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseOfferServiceImpl.java

@@ -18,6 +18,8 @@ import com.uas.platform.core.persistence.criteria.CriterionExpression.Operator;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -108,7 +110,7 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
     public Map<String, Object> getSeekPurchaseRate(final Long uu) {
         // sql语句
         String sql =
-                "select offerAmount,IFNULL(acceptedAmount,0) as acceptedAmount,ifnull(FORMAT(acceptedAmount/offerAmount,2)*100,0) "
+                "select offerAmount,CONVERT(IFNULL(acceptedAmount, 0),SIGNED) AS acceptedAmount,ifnull(FORMAT(acceptedAmount/offerAmount,4)*100,0) "
                         + "as rate from(select count(1) as offerAmount,sum(of_status=?) as acceptedAmount "
                         + "from trade$seek_purchase_offer where of_enuu=?) a";
         return jdbcTemplate.queryForMap(sql, new Object[]{Status.ACCEPTED.getValue(), uu});
@@ -227,9 +229,15 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
     }
 
     @Override
-    public List<SeekPurchaseOffer> getSeekPurchaseOfferList(List<Long> spIds, User user) {
+    public List<SeekPurchaseOffer> getSeekPurchaseOfferList(String spIds, User user) {
         if (user != null && user.getEnterprise() != null) {
-            List<SeekPurchaseOffer> seekPurchaseOfferList = seekPurchaseOfferDao.getSeekPurchaseOfferList(spIds, user.getEnterprise().getUu());
+            String[] spIdArr = spIds.split(",");
+            List<Long> spIdList = new ArrayList<>();
+            for (int i = 0; i < spIdArr.length; i++) {
+                spIdList.add(Long.valueOf(spIdArr[i]));
+            }
+            List<SeekPurchaseOffer> seekPurchaseOfferList = seekPurchaseOfferDao.getSeekPurchaseOfferList(
+                    spIdList, user.getEnterprise().getUu());
             return seekPurchaseOfferList;
         }
         return null;

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -445,9 +445,9 @@
                     <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>
                     <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                     <div class="seek-status">
-                        <div ng-show="!seek.goodsEnuu" class="no-grounding">未上架</div>
-                        <a ng-show="!seek.goodsEnuu" href="vendor#/vendor_material">产品管理>></a>
-                        <div ng-show="seek.goodsEnuu">已上架</div>
+                        <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
+                        <a ng-show="!seek.goodsEnuu" href="vendor#/vendor_upload">产品导入>></a>
+                        <div ng-show="seek.goodsEnuu">已在库</div>
                     </div>
                 </td>
                 <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -392,7 +392,7 @@
                         <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>
                         <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                         <div class="seek-status">
-                            <div>已上架</div>
+                            <div>已在库</div>
                         </div>
                     </td>
                     <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>