Merge branch 'feature/relation_type_item' into feature/push_invoice

sp-admin/sa-view/tb-partner/tb-business-item-list.html

@@ -21,7 +21,7 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-
+					<sa-item type="text" name="业务单号" v-model="p.businessNo"></sa-item>
 					<sa-item type="text" name="项目名称" v-model="p.itemName"></sa-item>
 					<sa-item type="text" name="越南车" v-model="p.cardNo"></sa-item>
 					<sa-item type="text" name="中国车" v-model="p.chinaCarNo"></sa-item>
@@ -114,6 +114,7 @@
 						businessType: '',
 						goodsId: '',
 						goodsName: '',
+						businessNo: '',
 						pageNo: 1, // 当前页 
 						pageSize: 10, // 页大小 
 						sortType: 10 // 排序方式

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -1016,4 +1016,10 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         ew.eq("date_format(pay_time,'%Y-%m-%d')", day).orderByDesc("id");
         return this.list(ew);
     }
+
+    public TbBusiness findByNo(String no) {
+        QueryWrapper<TbBusiness> ew = new QueryWrapper<>();
+        ew.eq("no", no);
+        return this.getOne(ew);
+    }
 }

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemService.java

@@ -102,6 +102,13 @@ public class TbBusinessItemService extends ServiceImpl<TbBusinessItemMapper, TbB
      * 查集合 - 根据条件（参数为空时代表忽略指定条件）
      */
     public List<TbBusinessItem> getList(SoMap so) {
+        String businessNo = so.getString("businessNo");
+        if(StrUtil.isNotEmpty(businessNo)){
+            TbBusiness business = tbBusinessService.findByNo(businessNo);
+            if(business != null){
+                so.put("businessId", business.getId());
+            }
+        }
         return tbBusinessItemMapper.getList(so);
     }