【管理平台】--调整品牌-供应商审核申请列表前端代码

src/main/java/com/uas/platform/b2c/prod/product/brand/modal/VendorListSubmit.java

@@ -108,6 +108,9 @@ public class VendorListSubmit implements Serializable {
     @Column(name = "vls_branduuid")
     private String branduuid;
 
+    @Transient
+    private BrandInfo brand;
+
     /**
      * 审核状态
      * SUBMITTED(101, "已提交"),
@@ -267,6 +270,14 @@ public class VendorListSubmit implements Serializable {
         this.branduuid = branduuid;
     }
 
+    public BrandInfo getBrand() {
+        return brand;
+    }
+
+    public void setBrand(BrandInfo brand) {
+        this.brand = brand;
+    }
+
     public Integer getStatus() {
         return status;
     }

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/VendorListSubmitServiceImpl.java

@@ -1,11 +1,14 @@
 package com.uas.platform.b2c.prod.product.brand.service.impl;
 
+import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.product.brand.dao.BrandDao;
 import com.uas.platform.b2c.prod.product.brand.dao.VendorListDao;
 import com.uas.platform.b2c.prod.product.brand.dao.VendorListSubmitDao;
 import com.uas.platform.b2c.prod.product.brand.modal.Brand;
+import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
 import com.uas.platform.b2c.prod.product.brand.modal.VendorList;
 import com.uas.platform.b2c.prod.product.brand.modal.VendorListSubmit;
 import com.uas.platform.b2c.prod.product.brand.service.VendorListSubmitService;
@@ -22,6 +25,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -50,12 +54,15 @@ public class VendorListSubmitServiceImpl implements VendorListSubmitService {
 
     private final StoreInDao storeInDao;
 
+    private final UserBaseInfoDao userBaseInfoDao;
+
     @Autowired
-    public VendorListSubmitServiceImpl(VendorListDao vendorListDao, VendorListSubmitDao vendorListSubmitDao, BrandDao brandDao, StoreInDao storeInDao){
+    public VendorListSubmitServiceImpl(VendorListDao vendorListDao, VendorListSubmitDao vendorListSubmitDao, BrandDao brandDao, StoreInDao storeInDao, UserBaseInfoDao userBaseInfoDao){
         this.vendorListDao = vendorListDao;
         this.vendorListSubmitDao = vendorListSubmitDao;
         this.brandDao = brandDao;
         this.storeInDao = storeInDao;
+        this.userBaseInfoDao = userBaseInfoDao;
     }
 
     @Override
@@ -298,13 +305,35 @@ public class VendorListSubmitServiceImpl implements VendorListSubmitService {
             pageInfo.expression(vendorName);
         }
 
-        return vendorListSubmitDao.findAll(new Specification<VendorListSubmit>() {
+        Page<VendorListSubmit> vendorListSubmitPage = vendorListSubmitDao.findAll(new Specification<VendorListSubmit>() {
             @Override
             public Predicate toPredicate(Root<VendorListSubmit> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 query.where(pageInfo.getPredicates(root, query, cb));
                 return null;
             }
         }, pageInfo);
+
+        List<VendorListSubmit> vendorListSubmits = vendorListSubmitPage.getContent();
+        for (VendorListSubmit vendorListSubmit : vendorListSubmits) {// 设置品牌信息、提交人、审核人
+            Brand brand = brandDao.findByUuid(vendorListSubmit.getBranduuid());
+            if (brand == null)
+                throw new IllegalOperatorException("供应商申请:" + vendorListSubmit.getVendorName() + " 所属品牌不存在");
+            vendorListSubmit.setBrand(new BrandInfo(brand));
+
+            UserBaseInfo updater = userBaseInfoDao.findUserByUserUU(vendorListSubmit.getUpdateruu());
+            if (updater == null)
+                throw new IllegalOperatorException("供应商申请:" + vendorListSubmit.getVendorName() + " 提交人不存在");
+            vendorListSubmit.setUpdater(updater);
+
+            if (vendorListSubmit.getAuditeruu() != null) {
+                UserBaseInfo auditer = userBaseInfoDao.findUserByUserUU(vendorListSubmit.getUpdateruu());
+                if (auditer == null)
+                    throw new IllegalOperatorException("供应商申请:" + vendorListSubmit.getVendorName() + " 审核人不存在");
+                vendorListSubmit.setAuditer(auditer);
+            }
+        }
+        return new PageImpl<VendorListSubmit>(vendorListSubmits, pageInfo, vendorListSubmitPage.getTotalElements());
+
     }
 
     /**

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -131,6 +131,8 @@
 			<li class="nav-header">审批</li>
 			<li class="nav-node"><a href="#audit/brand"><i
 					class="fa fa-bullhorn"></i><span> 品牌</span></a></li>
+			<li class="nav-node"><a href="#supplierSubmitList"><i
+					class="fa fa-bullhorn"></i><span> 品牌供应商</span></a></li>
 			<!--<li class="nav-node"><a href="#brandmaintenance"><i-->
 					<!--class="fa fa-bullhorn"></i><span> 品牌维护</span></a></li>-->
 			<li class="nav-node"><a href="#audit/component"><i

src/main/webapp/resources/view/admin/supplier_submit_list.html

@@ -20,7 +20,7 @@
                 <div class="col-sm-6">
                     <div class="input-group" style="float: right">
                         <input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="keyword"
-                               ng-search="onSearch()" placeholder="搜索">
+                               ng-search="onSearch()" placeholder="按供应商名称搜索">
                         <div class="input-group-btn">
                             <button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
                         </div>
@@ -42,18 +42,17 @@
                 <tbody>
                 <tr ng-repeat="supplier in $data">
                     <td class="text-center">{{($index + 1)}}</td>
-                    <td width="150" style="word-break: break-all">{{supplier.nameEn}}
-                        <span class="label label-success f12" ng-if="supplier.isUpdate == 0">新增</span>
-                        <span class="label label-warning f12" ng-if="supplier.isUpdate == 1">更新</span>
+                    <td width="150" style="word-break: break-all">{{supplier.brand.nameEn}}
+                        <span class="label label-success f12" ng-if="!supplier.vendorid">新增</span>
+                        <span class="label label-warning f12" ng-if="supplier.vendorid">更新</span>
                     </td>
-                    <td>{{supplier.application}}</td>
-                    <td>{{supplier.userModify.userName}}</td>
-                    <td>{{supplier.lastModifyDate | date: "yyyy-MM-dd HH:mm"}}</td>
-                    <td>{{supplier.status | statusAndTypeFilter}}</td>
+                    <td ng-bind="supplier.vendorName"></td>
+                    <td ng-bind="supplier.updater.userName"></td>
+                    <td ng-bind="supplier.updatetime | date: 'yyyy-MM-dd HH:mm'"></td>
+                    <td ng-bind="supplier.status | statusAndTypeFilter"></td>
                     <td>
-                        <a ng-href="#/audit/brand/{{brand.id}}" target="_blank">
-                            <button type="button" class="btn btn-default btn-sm"
-                            >查 看</button>
+                        <a ng-href="#" target="_blank">
+                            <button type="button" class="btn btn-default btn-sm">查 看</button>
                         </a>
 
                     </td>