bom求购列表搜索

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

@@ -8,6 +8,7 @@ import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBom;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseBomList;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseByBatch;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseGoods;
@@ -201,11 +202,11 @@ public class SeekPurchaseController {
      * @return
      */
     @RequestMapping(value = "/getSeekPurchaseBomListPage", method = RequestMethod.GET)
-    public Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageParams params) {
+    public Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageParams params, String minReleaseDate, String maxReleaseDate, String name) {
         User user = SystemSession.getUser();
         PageInfo pageInfo = new PageInfo(params);
         logger.log("求购", "获取bom求购列表，uu:" + user.getUserUU());
-        return seekPurchaseService.getSeekPurchaseBomListPage(pageInfo, user);
+        return seekPurchaseService.getSeekPurchaseBomListPage(pageInfo, user, minReleaseDate, maxReleaseDate, name);
     }
 
     // 根据bomId获取当前bom单的情况
@@ -231,4 +232,9 @@ public class SeekPurchaseController {
     public SeekPurchaseBomList findOneBom(Long bomId) {
         return seekPurchaseService.findOneBom(bomId);
     }
+
+    @RequestMapping(value = "/updateSeekPurchaseBom", method = RequestMethod.PUT)
+    public ResultMap updateSeekPurchaseBom(@RequestBody SeekPurchaseBom seekPurchaseBom){
+        return seekPurchaseService.updateSeekPurchaseBom(seekPurchaseBom);
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/dao/SeekPurchaseByBatchDao.java

@@ -19,4 +19,8 @@ public interface SeekPurchaseByBatchDao extends JpaSpecificationExecutor<SeekPur
 
 
     List<SeekPurchaseByBatch> findByBomId(Long bomId);
+
+    @Query( value = "select * from trade$seek_purchase_by_batch where sp_id in (:spIds)", nativeQuery = true)
+    List<SeekPurchaseByBatch> findBySpids(@Param("spIds") List<String> spIds);
+
 }

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

@@ -115,7 +115,7 @@ public interface SeekPurchaseService {
      * @param user
      * @return
      */
-    Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageInfo pageInfo, User user);
+    Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageInfo pageInfo, User user, String minReleaseDate, String maxReleaseDate, String name);
 
     Map<String, Object> getImportBomInfo(Long bomId);
 

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

@@ -35,6 +35,7 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -487,9 +488,7 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         List<SeekPurchaseByBatch> seekPurchaseByBatchList = null;
         if (!StringUtils.isEmpty(spIds)) {
             // 保存选中
-            String sql = "select * from trade$seek_purchase_by_batch where bom_id = :bomId and sp_id in (:spIds)";
-            Map<String, Object> params = new HashMap<>();
-            seekPurchaseByBatchList = namedParameterJdbcTemplate.queryForList(sql, params, SeekPurchaseByBatch.class);
+            seekPurchaseByBatchList = seekPurchaseByBatchDao.findBySpids(Arrays.asList(spIds.split(",")));
         } else {
             // 保存所有
             seekPurchaseByBatchList = seekPurchaseByBatchDao.findByBomId(bomId);
@@ -520,7 +519,7 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
             }
         }
         seekPurchaseList = seekPurchasedao.save(seekPurchaseList);
-        seekPurchaseBom.setAmount(seekPurchaseBom.getAmount() == null ? 0 : seekPurchaseBom.getAmount() + seekPurchaseList.size());
+        seekPurchaseBom.setAmount((seekPurchaseBom.getAmount() == null ? 0 : seekPurchaseBom.getAmount()) + seekPurchaseList.size());
         seekPurchaseBom.setStatus(1);
         seekPurchaseBomDao.save(seekPurchaseBom);
         seekPurchaseByBatchDao.delete(deleteBatchList);
@@ -528,12 +527,24 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
     }
 
     @Override
-    public Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(final PageInfo pageInfo, User user) {
+    public Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(final PageInfo pageInfo, User user, String minReleaseDate, String maxReleaseDate, String name) {
         if (user.getEnterprise() != null) {
             pageInfo.filter("enUu", user.getEnterprise().getUu());
         } else {
             pageInfo.filter("uu", user.getUserUU());
         }
+        // 发布时间
+        if (!StringUtils.isEmpty(minReleaseDate)) {
+            pageInfo.expression(PredicateUtils.gte("releaseDate", new Date(Long.valueOf(minReleaseDate)), false));
+        }
+        if (!StringUtils.isEmpty(maxReleaseDate)) {
+            pageInfo.expression(PredicateUtils.lte("releaseDate", new Date(Long.valueOf(maxReleaseDate)), false));
+        }
+        // Bom名称
+        if (!StringUtils.isEmpty(name)) {
+            pageInfo.filter("name", name);
+        }
+        pageInfo.sorting("releaseDate", Direction.DESC);
         Page<SeekPurchaseBomList> pageSeeks = seekPurchaseBomListDao.findAll(new Specification<SeekPurchaseBomList>() {
             public Predicate toPredicate(Root<SeekPurchaseBomList> root, CriteriaQuery<?> query,
                     CriteriaBuilder builder) {
@@ -562,7 +573,7 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         //seekPurchaseByBatchDao.batchDelete(Arrays.asList(spIds.split(",")));
         String sql = "delete from trade$seek_purchase_by_batch where sp_id in (:spIds)";
         Map<String, Object> param = new HashMap<>();
-        param.put("spIds", spIds);
+        param.put("spIds", spIds.contains(",") ? Arrays.asList(spIds.split(",")) : spIds);
         namedParameterJdbcTemplate.update(sql, param);
         return ResultMap.success(null);
     }

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -611,7 +611,7 @@ define(['app/app'], function (app) {
             }).error(function(response) {
             });
           };
-
+          $scope.bomSearch = {};
           $scope.bomTableParams = new ngTableParams({
             page: 1,
             count: 10
@@ -619,6 +619,11 @@ define(['app/app'], function (app) {
             total: 0,
             getData: function ($defer, params) {
               const param = BaseService.parseParams(params.url());
+              param.minReleaseDate = $scope.bomSearch.startDate
+                  ? $scope.bomSearch.startDate.getTime() : null;
+              param.maxReleaseDate = $scope.bomSearch.endDate ? $scope.bomSearch.endDate.getTime()
+                  : null;
+              param.name = $scope.bomSearch.name;
               seekPurchase.getSeekPurchaseBomListPage(param, function (data) {
                 params.total(data.totalElements);
                 $scope.bomTotal = data.totalElements;
@@ -628,7 +633,10 @@ define(['app/app'], function (app) {
               });
             }
           });
-
+          // 搜索
+          $scope.onBomSearch = function () {
+            $scope.bomTableParams.reload();
+          }
 
         }]);
 });

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

@@ -840,7 +840,7 @@
                 <span>发布时间&nbsp;</span>
                 <div class="date fl">
                     <div class="data-input">
-                        <input type="text" ng-model="startDate"
+                        <input type="text" ng-model="bomSearch.startDate"
                                class="form-control select-adder" placeholder="起始时间"
                                datepicker-popup="yyyy-MM-dd"
                                is-open="condition.startDateOpen"
@@ -853,7 +853,7 @@
                     </div>
                     <em>–</em>
                     <div class="data-input">
-                        <input type="text" ng-model="endDate"
+                        <input type="text" ng-model="bomSearch.endDate"
                                class="form-control select-adder" placeholder="结束时间"
                                datepicker-popup="yyyy-MM-dd"
                                is-open="condition.endDateOpen"
@@ -866,8 +866,8 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="BOM名称" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
-                    <a class="seek" href="javascript:void(0)">搜索</a>
+                    <input type="search" placeholder="BOM名称" class="form-control" ng-model="bomSearch.name" />
+                    <a class="seek" href="javascript:void(0)" ng-click="onBomSearch()">搜索</a>
                 </div>
             </div>
         </div>