feats

pom.xml

@@ -75,6 +75,14 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!--excel start-->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+		<!--excel end-->
+
 		<!--swagger start-->
 		<dependency>
 			<groupId>io.springfox</groupId>

src/main/java/com/yunzhi/inte/common/ExcelUtils.java

@@ -0,0 +1,27 @@
+package com.yunzhi.inte.common;
+
+import com.alibaba.excel.EasyExcel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+public class ExcelUtils {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment;filename="+StringUtils.urlEncode(fileName)+".xlsx");
+
+        EasyExcel.write(response.getOutputStream(), dataClass).sheet("sheet1").doWrite(data);
+    }
+}

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

@@ -8,6 +8,10 @@ import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
 
 import com.yunzhi.inte.common.StringUtils;
+import com.yunzhi.inte.entity.FoodIngredients;
+import com.yunzhi.inte.entity.Package;
+import com.yunzhi.inte.entity.StoreType;
+import com.yunzhi.inte.service.FoodIngredientsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,6 +33,9 @@ public class DishesController extends BaseController {
     @Autowired
     private DishesService dishesService;
 
+    @Autowired
+    private FoodIngredientsService foodIngredientsService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -38,7 +45,13 @@ public class DishesController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/dishes/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
-        return ResponseBean.success(dishesService.getById(id));
+        Dishes dishes = dishesService.getById(id);
+
+        // 获取详情列表
+        List<Integer> list = foodIngredientsService.getItemListByDish(id);
+        dishes.setIngredientsIdList(list);
+
+        return ResponseBean.success(dishes);
     }
 
     /**
@@ -72,9 +85,32 @@ public class DishesController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/dishes")
-    public ResponseBean add(Dishes dishes) throws Exception {
-        dishes.setStatus(1);
-        dishesService.save(dishes);
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody Dishes dishes) throws Exception {
+        Dishes origin = dishesService.getExistBy("name", dishes.getName(), false, true);
+
+        List<Integer> ingredientsList = dishes.getIngredientsIdList();
+        Integer foodNum = null == ingredientsList ? 0 : ingredientsList.size();
+        dishes.setFoodNum(foodNum);
+
+        Integer dishId = dishes.getId();
+        if (dishId == null) {
+            if (null != origin) {
+                return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+            dishes.setStatus(1);
+            dishesService.save(dishes);
+            dishId = dishes.getId();
+        } else {
+            if (null != origin && !dishId.equals(origin.getId())) {
+                return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+            dishesService.updateById(dishes);
+        }
+
+        foodIngredientsService.addOrUpdate(dishId, ingredientsList);
+
         return ResponseBean.success(dishes);
     }
 
@@ -86,7 +122,13 @@ public class DishesController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/dishes/{id}")
-    public ResponseBean edit(Dishes dishes) throws Exception {
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id,
+                             @ApiParam("对象实体") @RequestBody Dishes dishes) throws Exception {
+        Dishes origin = dishesService.getExistBy("name", dishes.getName(), false, true);
+        if (null != origin && !id.equals(origin.getId())) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         dishes.setStatus(1);
         dishesService.updateById(dishes);
         return ResponseBean.success(dishes);

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.entity.Store;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +51,11 @@ public class FoodIngredientsController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/foodIngredients")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("食材ID") @RequestParam(value ="dishId") Integer dishId) throws Exception {
 
-        IPage<FoodIngredients> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<FoodIngredients> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<FoodIngredients> result = foodIngredientsService.page(pg);
+        IPage<Store> pg = new Page<>(pageNum, pageSize);
+        IPage<Store> result = foodIngredientsService.getByDish(pg, dishId);
 
         return ResponseBean.success(result);
     }
@@ -67,23 +68,21 @@ public class FoodIngredientsController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/foodIngredients")
-    public ResponseBean add(FoodIngredients foodIngredients) throws Exception {
+    public ResponseBean add(@ApiParam("实例对象") @RequestBody FoodIngredients foodIngredients) throws Exception {
+
+        QueryWrapper<FoodIngredients> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dish_id", foodIngredients.getDishId());
+        queryWrapper.eq("item_id", foodIngredients.getItemId());
+        int count = foodIngredientsService.count(queryWrapper);
+
+        if (count > 0) {
+            return ResponseBean.error("当前菜肴已存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         foodIngredientsService.save(foodIngredients);
         return ResponseBean.success(foodIngredients);
     }
 
-    /**
-     * 更新数据
-     *
-     * @param foodIngredients 实例对象
-     * @return 实例对象
-     */
-    @ApiOperation("更新数据")
-    @PutMapping("/foodIngredients/{id}")
-    public ResponseBean edit(FoodIngredients foodIngredients) throws Exception {
-        foodIngredientsService.updateById(foodIngredients);
-        return ResponseBean.success(foodIngredients);
-    }
 
     /**
      * 通过主键删除数据
@@ -94,7 +93,7 @@ public class FoodIngredientsController extends BaseController {
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/foodIngredients/{id}")
     public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        foodIngredientsService.removeLogicById(id);
+        foodIngredientsService.removeById(id);
         return ResponseBean.success("success");
     }
 }

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

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -41,6 +45,12 @@ public class GuaranteeTaskController extends BaseController {
         return ResponseBean.success(guaranteeTaskService.getById(id));
     }
 
+    private Date toDate(String str) throws ParseException {
+        String format = "yyyy-MM-dd HH:mm:ss";
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        return sdf.parse(str);
+    }
+
     /**
      * 分页查询
      *
@@ -51,12 +61,31 @@ public class GuaranteeTaskController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/guaranteeTask")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("保障序号") @RequestParam(value ="guaranteeNo", required = false) String guaranteeNo,
+                             @ApiParam("受领人") @RequestParam(value ="receiver", required = false) String receiver,
+                             @ApiParam(value = "开始时间", example = "2022-09-01") @RequestParam(value ="startDate", required = false) String startDate,
+                             @ApiParam(value = "结束时间", example = "2022-09-30") @RequestParam(value ="endDate", required = false) String endDate) throws Exception {
 
         IPage<GuaranteeTask> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<GuaranteeTask> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<GuaranteeTask> result = guaranteeTaskService.page(pg);
+        QueryWrapper<GuaranteeTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(guaranteeNo), "guarantee_no", guaranteeNo);
+        queryWrapper.like(!StringUtils.isEmpty(receiver), "receiver", receiver);
+
+        if (!StringUtils.isEmpty(startDate)) {
+            Date start = toDate(startDate + " 00:00:00");
+            Date end = toDate(endDate + " 23:59:59");
+            queryWrapper.le("start_date", end.getTime());
+            queryWrapper.ge("end_date", start.getTime());
+        }
+//        if (!StringUtils.isEmpty(endDate)) {
+//            Date end = toDate(endDate + " 23:59:59");
+//            queryWrapper.le("end_date", end.getTime());
+//        }
+
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByDesc("id");
+        IPage<GuaranteeTask> result = guaranteeTaskService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }

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

@@ -8,6 +8,8 @@ import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
 
 import com.yunzhi.inte.common.StringUtils;
+import com.yunzhi.inte.entity.Dishes;
+import com.yunzhi.inte.entity.Store;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -73,6 +75,11 @@ public class PackageController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/package")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody Package pkg) throws Exception {
+        Package origin = packageService.getExistBy("name", pkg.getName(), false, true);
+        if (null != origin) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         packageService.save(pkg);
         return ResponseBean.success(pkg);
     }
@@ -85,7 +92,13 @@ public class PackageController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/package/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody Package pkg) throws Exception {
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id,
+                             @ApiParam("对象实体") @RequestBody Package pkg) throws Exception {
+        Package origin = packageService.getExistBy("name", pkg.getName(), false, true);
+        if (null != origin && !id.equals(origin.getId())) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         packageService.updateById(pkg);
         return ResponseBean.success(pkg);
     }

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

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
+import com.yunzhi.inte.common.ExcelUtils;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.Store;
 import com.yunzhi.inte.service.StoreService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 库存表;(store)表控制层
  * @author : http://njyunzhi.com
@@ -49,16 +54,38 @@ public class StoreController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/store")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                             @ApiParam("分类ID") @RequestParam(value ="typeId", required = false) String typeId,
+                             @ApiParam("是否食材") @RequestParam(value ="isDish", required = false) Integer isDish) throws Exception {
 
         IPage<Store> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<Store> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<Store> result = storeService.page(pg);
+        IPage<Store> result = storeService.getPageBy(pg, name, typeId, isDish);
 
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 导出
+     *
+     * @param name 名称
+     * @param typeId 分类ID
+     * @return 导出
+     */
+    @ApiOperation("导出")
+    @GetMapping("/store/export")
+    public ResponseBean export(@ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                               @ApiParam("分类ID") @RequestParam(value ="typeId", required = false) String typeId,
+                               HttpServletResponse response) throws Exception {
+
+        List<Store> result = storeService.getListBy(name, typeId);
+
+        ExcelUtils.flush(response, Store.class, result, "库存列表");
+
+        return null;
+    }
+
     /**
      * 新增数据
      *
@@ -67,7 +94,13 @@ public class StoreController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/store")
-    public ResponseBean add(Store store) throws Exception {
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody Store store) throws Exception {
+        Store origin = storeService.getExistBy("name", store.getName(), false, true);
+        if (null != origin) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        store.setStatus(1);
         storeService.save(store);
         return ResponseBean.success(store);
     }
@@ -80,7 +113,14 @@ public class StoreController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/store/{id}")
-    public ResponseBean edit(Store store) throws Exception {
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id,
+                             @ApiParam("对象实体") @RequestBody Store store) throws Exception {
+        Store origin = storeService.getExistBy("name", store.getName(), false, true);
+        if (null != origin && !id.equals(origin.getId())) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        store.setId(id);
         storeService.updateById(store);
         return ResponseBean.success(store);
     }

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

@@ -4,8 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
+import com.yunzhi.inte.common.ExcelUtils;
 import com.yunzhi.inte.common.ResponseBean;
+
+import java.util.Date;
 import java.util.List;
+
+import com.yunzhi.inte.entity.Store;
+import com.yunzhi.inte.service.StoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,6 +20,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.StoreLog;
 import com.yunzhi.inte.service.StoreLogService;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 库存日志;(store_log)表控制层
  * @author : http://njyunzhi.com
@@ -27,17 +35,20 @@ public class StoreLogController extends BaseController {
     @Autowired
     private StoreLogService storeLogService;
 
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param id 主键
-     * @return 实例对象
-     */
-    @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/storeLog/{id}")
-    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
-        return ResponseBean.success(storeLogService.getById(id));
-    }
+    @Autowired
+    private StoreService storeService;
+
+//    /**
+//     * 通过ID查询单条数据
+//     *
+//     * @param id 主键
+//     * @return 实例对象
+//     */
+//    @ApiOperation("通过ID查询单条数据")
+//    @GetMapping("/storeLog/{id}")
+//    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+//        return ResponseBean.success(storeLogService.getById(id));
+//    }
 
     /**
      * 分页查询
@@ -49,52 +60,136 @@ public class StoreLogController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/storeLog")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("库存ID") @RequestParam(value ="storeId", required = false) Integer storeId,
+                             @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                             @ApiParam("分类ID") @RequestParam(value ="typeId", required = false) Integer typeId) throws Exception {
 
         IPage<StoreLog> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<StoreLog> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<StoreLog> result = storeLogService.page(pg);
+        IPage<StoreLog> result = storeLogService.getPageBy(pg, storeId, name, typeId);
 
         return ResponseBean.success(result);
     }
 
+
     /**
-     * 新增数据
+     * 导出
      *
-     * @param storeLog 实例对象
-     * @return 实例对象
+     * @param storeId 库存ID
+     * @return 查询结果
      */
-    @ApiOperation("新增数据")
-    @PostMapping("/storeLog")
-    public ResponseBean add(StoreLog storeLog) throws Exception {
-        storeLogService.save(storeLog);
-        return ResponseBean.success(storeLog);
+    @ApiOperation("导出")
+    @GetMapping("/storeLog/export")
+    public ResponseBean export(@ApiParam("库存ID") @RequestParam(value ="storeId", required = false) Integer storeId,
+                               @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
+                               @ApiParam("分类ID") @RequestParam(value ="typeId", required = false) Integer typeId,
+                               HttpServletResponse response) throws Exception {
+
+        List<StoreLog> result = storeLogService.getListBy(storeId, name, typeId);
+        if (null != result && result.size() > 0) {
+            for(StoreLog log : result) {
+                String optType = "";
+                switch (log.getOptType()) {
+                    case "in":
+                        optType = "入库";
+                        break;
+                    case "out":
+                        optType = "出库";
+                        break;
+                    case "fix":
+                    default:
+                        optType = "盘点";
+                        break;
+                }
+
+                log.setOptType(optType);
+            }
+        }
+
+        ExcelUtils.flush(response, StoreLog.class, result, "出入库日志");
+        return null;
     }
 
     /**
-     * 更新数据
+     * 新增数据
      *
      * @param storeLog 实例对象
      * @return 实例对象
      */
-    @ApiOperation("更新数据")
-    @PutMapping("/storeLog/{id}")
-    public ResponseBean edit(StoreLog storeLog) throws Exception {
-        storeLogService.updateById(storeLog);
-        return ResponseBean.success(storeLog);
-    }
+    @ApiOperation("新增数据")
+    @PostMapping("/storeLog")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody StoreLog storeLog) throws Exception {
 
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
-    @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/storeLog/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        storeLogService.removeLogicById(id);
-        return ResponseBean.success("success");
+        if (storeLog.getStoreId() == null) {
+            return ResponseBean.error("未找到对应库存", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null == storeLog.getAmount()) {
+            return ResponseBean.error("请设置出入数量", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 因为只有一个人用, 不用考虑并发问题
+        Store store = storeService.getById(storeLog.getStoreId());
+        Integer preAmount = null == store.getAmount() ? 0 : store.getAmount();
+        Integer amount = storeLog.getAmount();
+        Integer leftAmount = preAmount;
+
+        // 如果是盘点
+        if ("fix".equals(storeLog.getOptType())) {
+            if (amount < 0) {
+                return ResponseBean.error("盘点库存不能为负", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+            leftAmount = amount;
+        } else {
+            if ("out".equals(storeLog.getOptType())) {
+                // 如果是出库
+                if (amount > 0) {
+                    amount = 0 - amount;
+                }
+            }
+
+            leftAmount = amount + preAmount;
+
+            if (leftAmount < 0) {
+                return ResponseBean.error("库存不足", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+        }
+
+        storeLog.setPreAmount(preAmount);
+        storeLog.setAftAmount(leftAmount);
+        storeLog.setCreateDate(new Date());
+        storeLogService.save(storeLog);
+
+        store.setAmount(leftAmount);
+        storeService.updateById(store);
+
+        return ResponseBean.success(storeLog);
     }
+//
+//    /**
+//     * 更新数据
+//     *
+//     * @param storeLog 实例对象
+//     * @return 实例对象
+//     */
+//    @ApiOperation("更新数据")
+//    @PutMapping("/storeLog/{id}")
+//    public ResponseBean edit(@ApiParam("对象实体") @RequestBody StoreLog storeLog) throws Exception {
+//        storeLogService.updateById(storeLog);
+//        return ResponseBean.success(storeLog);
+//    }
+//
+//    /**
+//     * 通过主键删除数据
+//     *
+//     * @param id 主键
+//     * @return 是否成功
+//     */
+//    @ApiOperation("通过主键删除数据")
+//    @DeleteMapping("/storeLog/{id}")
+//    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
+//        storeLogService.removeLogicById(id);
+//        return ResponseBean.success("success");
+//    }
 }

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

@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
+import com.yunzhi.inte.entity.Package;
+import com.yunzhi.inte.entity.Store;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +53,15 @@ public class StoreTypeController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/storeType")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                             @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception {
 
         IPage<StoreType> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<StoreType> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<StoreType> result = storeTypeService.page(pg);
+        QueryWrapper<StoreType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByDesc("create_date");
+        IPage<StoreType> result = storeTypeService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
@@ -67,7 +74,13 @@ public class StoreTypeController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/storeType")
-    public ResponseBean add(StoreType storeType) throws Exception {
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody StoreType storeType) throws Exception {
+        StoreType origin = storeTypeService.getExistBy("name", storeType.getName(), false, true);
+        if (null != origin) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        storeType.setStatus(1);
         storeTypeService.save(storeType);
         return ResponseBean.success(storeType);
     }
@@ -75,12 +88,20 @@ public class StoreTypeController extends BaseController {
     /**
      * 更新数据
      *
+     * @param id 对象ID
      * @param storeType 实例对象
      * @return 实例对象
      */
     @ApiOperation("更新数据")
     @PutMapping("/storeType/{id}")
-    public ResponseBean edit(StoreType storeType) throws Exception {
+    public ResponseBean edit(@ApiParam("对象ID") @PathVariable Integer id,
+                             @ApiParam("对象实体") @RequestBody StoreType storeType) throws Exception {
+        StoreType origin = storeTypeService.getExistBy("name", storeType.getName(), false, true);
+        if (null != origin && !id.equals(origin.getId())) {
+            return ResponseBean.error("当前名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        storeType.setId(id);
         storeTypeService.updateById(storeType);
         return ResponseBean.success(storeType);
     }

src/main/java/com/yunzhi/inte/entity/Dishes.java

@@ -1,5 +1,6 @@
 package com.yunzhi.inte.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,7 +27,7 @@ import lombok.experimental.Accessors;
 public class Dishes implements Serializable,Cloneable{
     /** 菜肴ID */
     @ApiModelProperty(name = "菜肴ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 菜肴名称 */
     @ApiModelProperty(name = "菜肴名称",notes = "")
@@ -32,6 +35,9 @@ public class Dishes implements Serializable,Cloneable{
     /** 菜肴单位 */
     @ApiModelProperty(name = "菜肴单位",notes = "")
     private String unit ;
+    /** 食材数量 */
+    @ApiModelProperty(name = "食材数量",notes = "")
+    private Integer foodNum;
     /** 状态 */
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;
@@ -39,4 +45,7 @@ public class Dishes implements Serializable,Cloneable{
     @ApiModelProperty(name = "创建时间",notes = "")
     private Date createDate ;
 
+    @TableField(exist = false)
+    @ApiModelProperty(name = "菜肴列表", notes = "")
+    private List<Integer> ingredientsIdList;
 }

src/main/java/com/yunzhi/inte/entity/Store.java

@@ -1,5 +1,8 @@
 package com.yunzhi.inte.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -23,22 +26,44 @@ import lombok.experimental.Accessors;
 @TableName("store")
 public class Store implements Serializable,Cloneable{
     /** ID */
+    @ExcelIgnore
     @ApiModelProperty(name = "ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 物品名称 */
+    @ExcelProperty(value = "名称", index = 0)
     @ApiModelProperty(name = "物品名称",notes = "")
     private String name ;
     /** 所属分类 */
+    @ExcelIgnore
     @ApiModelProperty(name = "所属分类",notes = "")
     private Integer typeId ;
+
+    @ExcelProperty(value = "分类", index = 2)
+    @TableField(exist = false)
+    private String typeName;
+
     /** 库存量 */
+    @ExcelProperty(value = "库存量", index = 3)
     @ApiModelProperty(name = "库存量",notes = "")
     private Integer amount ;
+    /** 单位 */
+    @ExcelProperty(value = "单位", index = 1)
+    @ApiModelProperty(name = "单位",notes = "")
+    private String unit ;
+
+
+    /** 是否食材 */
+    @ExcelIgnore
+    @ApiModelProperty(name = "是否食材",notes = "")
+    private Integer isDish;
+
     /** 状态 */
+    @ExcelIgnore
     @ApiModelProperty(name = "状态",notes = "")
     private Integer status ;
     /** 创建时间 */
+    @ExcelIgnore
     @ApiModelProperty(name = "创建时间",notes = "")
     private Date createDate ;
 

src/main/java/com/yunzhi/inte/entity/StoreLog.java

@@ -1,5 +1,8 @@
 package com.yunzhi.inte.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -23,23 +26,47 @@ import lombok.experimental.Accessors;
 @TableName("store_log")
 public class StoreLog implements Serializable,Cloneable{
     /** 日志ID */
+    @ExcelIgnore
     @ApiModelProperty(name = "日志ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 操作类型;in入库out出库fix盘点 */
+    @ExcelProperty(value = "操作", index = 2)
     @ApiModelProperty(name = "操作类型",notes = "in入库out出库fix盘点")
     private String optType ;
     /** 物品ID */
+    @ExcelIgnore
     @ApiModelProperty(name = "物品ID",notes = "")
     private String storeId ;
     /** 数量 */
+    @ExcelProperty(value = "数量", index = 3)
     @ApiModelProperty(name = "数量",notes = "")
     private Integer amount ;
     /** 操作前数量 */
+    @ExcelIgnore
     @ApiModelProperty(name = "操作前数量",notes = "")
     private Integer preAmount ;
+    /** 操作后数量 */
+    @ExcelProperty(value = "操作后库存", index = 4)
+    @ApiModelProperty(name = "操作后数量",notes = "")
+    private Integer aftAmount ;
     /** 操作时间 */
+    @ExcelProperty(value = "操作时间", index = 5)
     @ApiModelProperty(name = "操作时间",notes = "")
     private Date createDate ;
 
+    @ExcelProperty(value = "名称", index = 0)
+    @TableField(exist = false)
+    @ApiModelProperty(name = "物品名称",notes = "")
+    private String storeName ;
+
+    @ExcelIgnore
+    @TableField(exist = false)
+    @ApiModelProperty(name = "物品分类ID",notes = "")
+    private Integer typeId ;
+
+    @ExcelProperty(value = "分类", index = 1)
+    @TableField(exist = false)
+    @ApiModelProperty(name = "物品分类名称",notes = "")
+    private String typeName ;
 }

src/main/java/com/yunzhi/inte/entity/StoreType.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class StoreType implements Serializable,Cloneable{
     /** 分类ID */
     @ApiModelProperty(name = "分类ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 名称 */
     @ApiModelProperty(name = "名称",notes = "")

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

@@ -1,10 +1,14 @@
 package com.yunzhi.inte.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.entity.Store;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.FoodIngredients;
 
+import java.util.List;
+
 /**
  * 菜肴食材;(food_ingredients)表数据库访问层
  * @author : http://njyunzhi.com
@@ -13,4 +17,13 @@ import com.yunzhi.inte.entity.FoodIngredients;
 @Mapper
 public interface FoodIngredientsMapper  extends BaseMapper<FoodIngredients>{
 
+    IPage<Store> getByDish(IPage<Store> pg, @Param("dishId") Integer dishId);
+
+    List<FoodIngredients> getListByDish(@Param("dishId") Integer dishId);
+
+    int deleteNotExist(@Param("idList") List<Integer> idList);
+
+    FoodIngredients getByDishAndItem(@Param("dishId") Integer dishId,@Param("itemId") Integer itemId);
+
+    List<Integer> getItemListByDish(@Param("dishId") Integer dishId);
 }

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

@@ -1,10 +1,13 @@
 package com.yunzhi.inte.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.StoreLog;
 
+import java.util.List;
+
 /**
  * 库存日志;(store_log)表数据库访问层
  * @author : http://njyunzhi.com
@@ -13,4 +16,7 @@ import com.yunzhi.inte.entity.StoreLog;
 @Mapper
 public interface StoreLogMapper  extends BaseMapper<StoreLog>{
 
+    IPage<StoreLog> getPageBy(IPage<StoreLog> pg, @Param("storeId") Integer storeId, @Param("storeName") String storeName, @Param("typeId") Integer typeId);
+
+    List<StoreLog> getListBy(@Param("storeId") Integer storeId, @Param("storeName") String storeName, @Param("typeId") Integer typeId);
 }

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

@@ -1,10 +1,13 @@
 package com.yunzhi.inte.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.Store;
 
+import java.util.List;
+
 /**
  * 库存表;(store)表数据库访问层
  * @author : http://njyunzhi.com
@@ -13,4 +16,7 @@ import com.yunzhi.inte.entity.Store;
 @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);
+
+    List<Store> getListBy(@Param("name") String name, @Param("typeId") String typeId);
 }

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

@@ -1,7 +1,11 @@
 package com.yunzhi.inte.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.inte.entity.FoodIngredients;
+import com.yunzhi.inte.entity.Store;
+
+import java.util.List;
 
 /**
  * 菜肴食材;(food_ingredients)表服务接口
@@ -10,4 +14,9 @@ import com.yunzhi.inte.entity.FoodIngredients;
  */
 public interface FoodIngredientsService extends IBaseService<FoodIngredients> {
 
+    IPage<Store> getByDish(IPage<Store> pg, Integer dishId);
+
+    void addOrUpdate(Integer dishId, List<Integer> ingredientsList);
+
+    List<Integer> getItemListByDish(Integer dishId);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.inte.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.inte.entity.StoreLog;
 
+import java.util.List;
+
 /**
  * 库存日志;(store_log)表服务接口
  * @author : http://njyunzhi.com
@@ -10,4 +12,7 @@ import com.yunzhi.inte.entity.StoreLog;
  */
 public interface StoreLogService extends IBaseService<StoreLog> {
 
+    IPage<StoreLog> getPageBy(IPage<StoreLog> pg, Integer storeId, String name, Integer typeId);
+
+    List<StoreLog> getListBy(Integer storeId, String name, Integer typeId);
 }

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

@@ -1,8 +1,10 @@
 package com.yunzhi.inte.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.inte.entity.Store;
 
+import java.util.List;
+
 /**
  * 库存表;(store)表服务接口
  * @author : http://njyunzhi.com
@@ -10,4 +12,7 @@ import com.yunzhi.inte.entity.Store;
  */
 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);
 }

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

@@ -1,10 +1,16 @@
 package com.yunzhi.inte.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.entity.Store;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.FoodIngredients;
 import com.yunzhi.inte.mapper.FoodIngredientsMapper;
 import com.yunzhi.inte.service.FoodIngredientsService;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 菜肴食材;(food_ingredients)表服务实现类
  * @author : http://www.chiner.pro
@@ -13,4 +19,42 @@ import com.yunzhi.inte.service.FoodIngredientsService;
 @Service
 public class FoodIngredientsServiceImpl extends BaseServiceImpl<FoodIngredientsMapper, FoodIngredients> implements FoodIngredientsService {
 
+    @Override
+    public IPage<Store> getByDish(IPage<Store> pg, Integer dishId) {
+        return baseMapper.getByDish(pg, dishId);
+    }
+
+    @Override
+    public void addOrUpdate(Integer dishId, List<Integer> ingredientsList) {
+        // 查询已有 list
+        List<Integer> idList = new ArrayList<>();
+        if (null != ingredientsList && ingredientsList.size() > 0) {
+            //
+            for (Integer itemId: ingredientsList) {
+                FoodIngredients item = baseMapper.getByDishAndItem(dishId, itemId);
+
+                if (item != null) {
+                    // 有就更新
+                    updateById(item);
+                } else {
+                    // 没有就插入
+                    item = new FoodIngredients();
+                    item.setItemId(itemId);
+                    item.setDishId(dishId);
+                    save(item);
+                }
+                Integer id = item.getId();
+                idList.add(id);
+            }
+        } else {
+            idList.add(-1);
+        }
+        // 删除剩余的
+        baseMapper.deleteNotExist(idList);
+    }
+
+    @Override
+    public List<Integer> getItemListByDish(Integer dishId) {
+        return baseMapper.getItemListByDish(dishId);
+    }
 }

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

@@ -1,10 +1,14 @@
 package com.yunzhi.inte.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.common.StringUtils;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.StoreLog;
 import com.yunzhi.inte.mapper.StoreLogMapper;
 import com.yunzhi.inte.service.StoreLogService;
+
+import java.util.List;
+
 /**
  * 库存日志;(store_log)表服务实现类
  * @author : http://www.chiner.pro
@@ -13,4 +17,25 @@ import com.yunzhi.inte.service.StoreLogService;
 @Service
 public class StoreLogServiceImpl extends BaseServiceImpl<StoreLogMapper, StoreLog> implements StoreLogService {
 
+    @Override
+    public IPage<StoreLog> getPageBy(IPage<StoreLog> pg, Integer storeId, String name, Integer typeId) {
+        if (StringUtils.isEmpty(name)) {
+            name = null;
+        } else {
+            name = "%" + name + "%";
+        }
+
+        return baseMapper.getPageBy(pg, storeId, name, typeId);
+    }
+
+    @Override
+    public List<StoreLog> getListBy(Integer storeId, String name, Integer typeId) {
+        if (StringUtils.isEmpty(name)) {
+            name = null;
+        } else {
+            name = "%" + name + "%";
+        }
+
+        return baseMapper.getListBy(storeId, name, typeId);
+    }
 }

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

@@ -1,10 +1,14 @@
 package com.yunzhi.inte.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.common.StringUtils;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.Store;
 import com.yunzhi.inte.mapper.StoreMapper;
 import com.yunzhi.inte.service.StoreService;
+
+import java.util.List;
+
 /**
  * 库存表;(store)表服务实现类
  * @author : http://www.chiner.pro
@@ -13,4 +17,25 @@ import com.yunzhi.inte.service.StoreService;
 @Service
 public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store> implements StoreService {
 
+    @Override
+    public IPage<Store> getPageBy(IPage<Store> pg, String name, String typeId, Integer isDish) {
+        if (StringUtils.isEmpty(name)) {
+            name = null;
+        } else {
+            name = "%" + name + "%";
+        }
+
+        return baseMapper.getPageBy(pg, name, typeId, isDish);
+    }
+
+    @Override
+    public List<Store> getListBy(String name, String typeId) {
+        if (StringUtils.isEmpty(name)) {
+            name = null;
+        } else {
+            name = "%" + name + "%";
+        }
+
+        return baseMapper.getListBy(name, typeId);
+    }
 }

src/main/resources/mapper/FoodIngredientsMapper.xml

@@ -3,4 +3,32 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.FoodIngredientsMapper">
 
+    <sql id="getFoodIngredientsList">
+        SELECT
+            t.*
+        FROM
+            store t
+                INNER JOIN food_ingredients s ON s.item_id = t.id
+        WHERE
+            s.dish_id = #{dishId}
+    </sql>
+    <delete id="deleteNotExist">
+        delete from food_ingredients where id not in
+        <foreach item="id" collection="idList" separator="," open="(" close=")" index="">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getByDish" resultType="com.yunzhi.inte.entity.Store">
+        <include refid="getFoodIngredientsList"></include>
+    </select>
+    <select id="getListByDish" resultType="com.yunzhi.inte.entity.FoodIngredients">
+        <include refid="getFoodIngredientsList"></include>
+    </select>
+    <select id="getByDishAndItem" resultType="com.yunzhi.inte.entity.FoodIngredients">
+        select * from food_ingredients where dish_id = #{dishId} and item_id = #{itemId}
+    </select>
+    <select id="getItemListByDish" resultType="java.lang.Integer">
+        select item_id from food_ingredients where dish_id = #{dishId}
+    </select>
 </mapper>

src/main/resources/mapper/StoreLogMapper.xml

@@ -2,5 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.yunzhi.inte.mapper.StoreLogMapper">
+    <sql id="getStoreLogList">
+        SELECT
+            t.*,
+            s.name AS store_name,
+            s.type_id,
+            m.name AS type_name
+        FROM
+            store_log t
+                INNER JOIN store s ON t.store_id = s.id
+                LEFT JOIN store_type m ON s.type_id = m.id
+        WHERE
+            s.status = 1
+          <if test="storeId != null">
+              AND s.id = #{storeId}
+          </if>
+        <if test="storeName != null and storeName != ''">
+            AND s.name like #{storeName}
+        </if>
+        <if test="typeId != null">
+            AND s.type_id = #{typeId}
+        </if>
+        ORDER BY
+            t.id DESC
+    </sql>
 
+    <select id="getPageBy" resultType="com.yunzhi.inte.entity.StoreLog">
+        <include refid="getStoreLogList"></include>
+    </select>
+    <select id="getListBy" resultType="com.yunzhi.inte.entity.StoreLog">
+        <include refid="getStoreLogList"></include>
+    </select>
 </mapper>

src/main/resources/mapper/StoreMapper.xml

@@ -3,4 +3,32 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.StoreMapper">
 
+    <sql id="getStoreList">
+        SELECT
+            t.*,
+            s.name AS type_name
+        FROM
+            store t
+                LEFT JOIN store_type s ON t.type_id = s.id
+        WHERE
+            t.status = 1
+          <if test="name != null and name != ''">
+              AND t.name LIKE #{name}
+          </if>
+          <if test="typeId != null">
+              AND t.type_id = #{typeId}
+          </if>
+        <if test="isDish != null">
+            AND s.is_food = #{isDish}
+        </if>
+        ORDER BY
+            t.id DESC
+    </sql>
+
+    <select id="getPageBy" resultType="com.yunzhi.inte.entity.Store">
+        <include refid="getStoreList"></include>
+    </select>
+    <select id="getListBy" resultType="com.yunzhi.inte.entity.Store">
+        <include refid="getStoreList"></include>
+    </select>
 </mapper>