feats

src/main/java/com/yunzhi/inte/controller/StoreController.java

@@ -79,7 +79,7 @@ public class StoreController extends BaseController {
                                @ApiParam("分类ID") @RequestParam(value ="typeId", required = false) String typeId,
                                HttpServletResponse response) throws Exception {
 
-        List<Store> result = storeService.getListBy(name, typeId);
+        List<Store> result = storeService.getListBy(name, typeId, null);
 
         ExcelUtils.flush(response, Store.class, result, "库存列表");
 

src/main/java/com/yunzhi/inte/mapper/StoreMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface StoreMapper  extends BaseMapper<Store>{
 
-    IPage<Store> getPageBy(IPage<Store> pg, @Param("name") String name, @Param("typeId") String typeId, @Param("isDish")  Integer isDish);
+    IPage<Store> getPageBy(IPage<Store> pg, @Param("name") String name, @Param("typeId") String typeId, @Param("isDish") Integer isDish);
 
-    List<Store> getListBy(@Param("name") String name, @Param("typeId") String typeId);
+    List<Store> getListBy(@Param("name") String name, @Param("typeId") String typeId, @Param("isDish") Integer isDish);
 }

src/main/java/com/yunzhi/inte/service/StoreService.java

@@ -14,5 +14,5 @@ public interface StoreService extends IBaseService<Store> {
 
     IPage<Store> getPageBy(IPage<Store> pg, String name, String typeId, Integer isDish);
 
-    List<Store> getListBy(String name, String typeId);
+    List<Store> getListBy(String name, String typeId, Integer isDish);
 }

src/main/java/com/yunzhi/inte/service/impl/StoreServiceImpl.java

@@ -29,13 +29,13 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store> implem
     }
 
     @Override
-    public List<Store> getListBy(String name, String typeId) {
+    public List<Store> getListBy(String name, String typeId, Integer isDish) {
         if (StringUtils.isEmpty(name)) {
             name = null;
         } else {
             name = "%" + name + "%";
         }
 
-        return baseMapper.getListBy(name, typeId);
+        return baseMapper.getListBy(name, typeId, isDish);
     }
 }

src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 spring:
   datasource:
     driver-class-name: org.sqlite.JDBC
-    url: jdbc:sqlite:E:\work\jungongzhang\service\db\ybai.db
+    url: jdbc:sqlite:E:\work\jgz\service\db\ybai.db
     username:
     password:
   application: