diff --git a/.gitignore b/.gitignore index a1c2a23..c774ab5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ # Mobile Tools for Java (J2ME) .mtj.tmp/ +*/target/ +fp-ui/ +sql/ # Package Files # *.jar diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java index 63541f9..913a3b6 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java @@ -2,6 +2,7 @@ package com.zf.foodpurchase.fdsafe.web.edu; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.model.LoginUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -27,6 +28,8 @@ public class EduController extends BaseController { @GetMapping("/list") public AjaxResult list(EduVO eduVO){ + // 填充学校id,教育局id等数据 + dealCommonVO(eduVO); List list = eduService.queryEduList(eduVO); return AjaxResult.success("查询成功",list); } @@ -34,6 +37,8 @@ public class EduController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(EduVO eduVO){ startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(eduVO); List list = eduService.queryEduList(eduVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java index 736a4e1..6303360 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java @@ -32,6 +32,8 @@ public class FoodController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(FoodVO foodVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(foodVO); foodVO.setDelFlag(0); List list = foodService.queryFoodVO(foodVO); return getDataTable(list); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/MorningInspectionContentController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/MorningInspectionContentController.java index bfb6d65..e221285 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/MorningInspectionContentController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/MorningInspectionContentController.java @@ -33,6 +33,8 @@ public class MorningInspectionContentController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(MorningInspectionContentVO morningInspectionContentVO){ startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(morningInspectionContentVO); List list = morningInspectionContentService.queryMorningInspectionContentVO(morningInspectionContentVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SelfInspectionContentController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SelfInspectionContentController.java index b6a08cd..7d3bf66 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SelfInspectionContentController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SelfInspectionContentController.java @@ -31,6 +31,8 @@ public class SelfInspectionContentController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SelfInspectionContentVO selfInspectionContentVO){ startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(selfInspectionContentVO); List list = selfInspectionContentService.querySelfInspectionContentVO(selfInspectionContentVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java index c39746a..b06b943 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java @@ -33,6 +33,8 @@ public class SupplierController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SupplierVO supplierVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(supplierVO); List list = supplierService.querySupplierVO(supplierVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java index da12dbd..d5ead7e 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java @@ -37,6 +37,8 @@ public class AccompanyMealController extends BaseController { @RequestMapping("/pageList") public TableDataInfo pageList(AccompanyMealVO accompanyMealVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(accompanyMealVO); List list = accompanyMealService.queryAccompanyMealVO(accompanyMealVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java index b40d024..cc49c28 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java @@ -34,6 +34,8 @@ public class CattenController extends BaseController { @RequestMapping("/pageList") public TableDataInfo pageList(CattenVO cattenVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(cattenVO); List list = cattenService.queryCattenVO(cattenVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java index dab875f..6dba5a2 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java @@ -42,6 +42,8 @@ public class DishController extends BaseController { // return getDataTable(list); // } startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(dishVO); List dishVOList = dishService.queryDishVO(dishVO); TableDataInfo tableDataInfo = getDataTable(dishVOList); return tableDataInfo; diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java index 1b23835..38856f9 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java @@ -32,6 +32,8 @@ public class FoodBookController extends BaseController { @RequestMapping("/pageList") public TableDataInfo pageList(FoodBookVO foodBookVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(foodBookVO); foodBookVO.setDelFlag(0); List list = foodBookService.queryFoodBookVO(foodBookVO); return getDataTable(list); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java index 816853a..74b8730 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java @@ -35,6 +35,8 @@ public class FoodSampleController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(FoodSampleVO foodSampleVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(foodSampleVO); List list = foodSampleService.queryFoodSampleVO(foodSampleVO); return getDataTable(list); } @@ -42,7 +44,7 @@ public class FoodSampleController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) FoodSampleVO foodSampleVO) { // wxImage形式 - List imageList = foodSampleVO.getWxSaveImage(); + List imageList = foodSampleVO.getWxSaveImg(); if(!CollectionUtils.isEmpty(imageList)){ foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(imageList)); } @@ -52,7 +54,7 @@ public class FoodSampleController extends BaseController { @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) FoodSampleVO foodSampleVO) { // wxImage形式 - List imageList = foodSampleVO.getWxSaveImage(); + List imageList = foodSampleVO.getWxSaveImg(); if(!CollectionUtils.isEmpty(imageList)){ foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(imageList)); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java index 55e2cfd..71b9838 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java @@ -32,6 +32,8 @@ public class MorningCheckInController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(MorningCheckInVO morningCheckInVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(morningCheckInVO); List list = morningCheckInService.queryMorningCheckInVO(morningCheckInVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java index af5e9ce..321c095 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java @@ -6,6 +6,7 @@ import com.zf.foodpurchase.common.core.domain.AjaxResult; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; +import com.zf.foodpurchase.common.vo.CommonVO; import com.zf.foodpurchase.fdsafe.entity.MorningInspectionDetail; import com.zf.foodpurchase.fdsafe.mapper.MorningCheckInMapper; import com.zf.foodpurchase.fdsafe.service.IMorningInspectionContentService; @@ -48,7 +49,10 @@ public class MorningInspectionDetailController extends BaseController { // Integer eduId = 1; List list =new ArrayList<>(); if(eduId == null){ - return success(list); + // 填充学校id,教育局id等数据 + CommonVO commonVO=new CommonVO(); + dealCommonVO(commonVO); + eduId = commonVO.getEduId(); } list =morningInspectionContentService.getTableHearder(eduId); return success(list); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java index dd0c09e..209e27b 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java @@ -35,6 +35,8 @@ public class RubbishDealController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(RubbishDealVO rubbishDealVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(rubbishDealVO); List list = rubbishDealService.queryRubbishDealVO(rubbishDealVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java index 6323470..43a4cbd 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java @@ -31,6 +31,8 @@ public class SchoolCartItemController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SchoolCartItemVO schoolCartItemVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolCartItemVO); List list = schoolCartItemService.querySchoolCartItemVO(schoolCartItemVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java index e9da240..8e8dfc7 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java @@ -30,6 +30,8 @@ public class SchoolController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SchoolVO schoolVO){ startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolVO); List list = schoolService.querySchoolList(schoolVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java index 4b3ae73..0042c2a 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java @@ -36,6 +36,8 @@ public class SchoolOrderController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SchoolOrderVO schoolOrderVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolOrderVO); List list = schoolOrderService.querySchoolOrderVO(schoolOrderVO); return getDataTable(list); } @@ -85,6 +87,8 @@ public class SchoolOrderController extends BaseController { */ @GetMapping("/supplierAcceptOrder") public AjaxResult supplierAcceptOrder(@Validated SupplierAcceptOrderVO supplierAcceptOrderVO) { + // 填充学校id,教育局id等数据 + dealCommonVO(supplierAcceptOrderVO); return schoolOrderService.supplierAcceptOrder(supplierAcceptOrderVO); } } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java index fb6dca5..f852a7a 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java @@ -31,6 +31,8 @@ public class SchoolOrderItemController extends BaseController { @GetMapping("/list") public AjaxResult list(SchoolOrderItemVO schoolOrderItemVO) { + // 填充学校id,教育局id等数据 + dealCommonVO(schoolOrderItemVO); List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO); return AjaxResult.success(list); } @@ -38,6 +40,8 @@ public class SchoolOrderItemController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SchoolOrderItemVO schoolOrderItemVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolOrderItemVO); List list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java index 8292156..35471e9 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java @@ -44,6 +44,8 @@ public class SchoolRefundController extends BaseController { @GetMapping("/querySchoolRefund") public TableDataInfo querySchoolRefund(SchoolRefundVO schoolRefundVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolRefundVO); List schoolRefunds = schoolRefundService.querySchoolRefund(schoolRefundVO); return getDataTable(schoolRefunds); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java index ab71804..6478d3f 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java @@ -41,6 +41,8 @@ public class SchoolSettleController extends BaseController { @GetMapping("/queryCanSettleOrder") public TableDataInfo queryCanSettleOrder(SchoolOrderVO schoolOrderVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolOrderVO); schoolOrderVO.setOrderSettleStatus(OrderStatusConstants.CAN_SETTLEMENT); List list = schoolOrderService.querySchoolOrderVO(schoolOrderVO); return getDataTable(list); @@ -90,6 +92,8 @@ public class SchoolSettleController extends BaseController { @GetMapping("/querySettleList") public TableDataInfo querySettleList(SchoolSettleVO settleVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(settleVO); List list = schoolSettleService.qeurySettleVO(settleVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java index cacdb99..0a91393 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java @@ -40,6 +40,8 @@ public class SchoolStaffController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SchoolStaffVO schoolStaffVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(schoolStaffVO); List list = schoolStaffService.querySchoolStaffVO(schoolStaffVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java index 077eb2a..0341170 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java @@ -36,6 +36,8 @@ public class SelfInspectionRecordController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SelfInspectionRecordVO selfInspectionRecordVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(selfInspectionRecordVO); List list = selfInspectionRecordService.querySelfInspectionRecordVO(selfInspectionRecordVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java index 85ca003..739ed82 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java @@ -35,6 +35,8 @@ public class FoodProductController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(FoodProductVO foodProductVO) { startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(foodProductVO); foodProductVO.setDelFlag(0); List list = foodProductService.queryFoodProductVO(foodProductVO); return getDataTable(list); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java index 5b90250..fc34977 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java @@ -36,6 +36,8 @@ public class SupplierDeliveryController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(SupplierDeliveryVO supplierDeliveryVO){ startPage(); + // 填充学校id,教育局id等数据 + dealCommonVO(supplierDeliveryVO); List list = supplierDeliveryService.querySupplierDeliveryVO(supplierDeliveryVO); return getDataTable(list); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java index b64f4ec..3f48036 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java @@ -49,14 +49,14 @@ public class WxAppFoodSampleController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } // 图片校验小程序与app使用图片字段不一样,不能同时为空 - if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ + if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ return error("留样照片不能为空"); } foodSampleVO.setSchoolId(userVO.getSchoolId()); // 图片处理 String[] images = foodSampleVO.getSaveImg(); if(images == null){ - foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); + foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg())); } return foodSampleService.saveVO(foodSampleVO); } @@ -68,14 +68,14 @@ public class WxAppFoodSampleController extends BaseController { return AjaxResult.error("非学校人员账号无法操作"); } // 图片校验小程序与app使用图片字段不一样,不能同时为空 - if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ + if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ return error("留样照片不能为空"); } foodSampleVO.setSchoolId(userVO.getSchoolId()); // 图片处理 String[] images = foodSampleVO.getSaveImg(); if(images == null){ - foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage())); + foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg())); } return foodSampleService.updateVO(foodSampleVO); } diff --git a/fp-common/src/main/java/com/zf/foodpurchase/common/core/controller/BaseController.java b/fp-common/src/main/java/com/zf/foodpurchase/common/core/controller/BaseController.java index 977c32f..3e2de0d 100644 --- a/fp-common/src/main/java/com/zf/foodpurchase/common/core/controller/BaseController.java +++ b/fp-common/src/main/java/com/zf/foodpurchase/common/core/controller/BaseController.java @@ -8,8 +8,10 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.zf.foodpurchase.common.core.domain.entity.LoginWxUser; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.domain.model.WxAppLoginUser; import com.zf.foodpurchase.common.exception.ServiceException; +import com.zf.foodpurchase.common.vo.CommonVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; @@ -249,4 +251,33 @@ public class BaseController logger.error("设置 schoolId 字段时出错", e); } } + + /** + * 统一处理参数设置 + */ + /** + * 获取用户缓存信息 + */ + public CommonVO dealCommonVO(CommonVO commonVO) + { + if(commonVO == null){ + return null; + } + else{ + LoginUser loginUser = getLoginUser(); + if(loginUser != null && loginUser.getUser() != null){ + // 判断登录用户 + SysUser user =loginUser.getUser(); + if(user.isAdmin()){ + return commonVO; + }else{ + commonVO.setSchoolId(user.getSchoolId()); + commonVO.setSupplierId(user.getSupplierId()); + commonVO.setEduId(user.getEduId()); + return commonVO; + } + } + } + return commonVO; + } } diff --git a/fp-common/src/main/java/com/zf/foodpurchase/common/core/domain/entity/SysUser.java b/fp-common/src/main/java/com/zf/foodpurchase/common/core/domain/entity/SysUser.java index c83afc2..cdeaff6 100644 --- a/fp-common/src/main/java/com/zf/foodpurchase/common/core/domain/entity/SysUser.java +++ b/fp-common/src/main/java/com/zf/foodpurchase/common/core/domain/entity/SysUser.java @@ -20,61 +20,85 @@ import com.zf.foodpurchase.common.xss.Xss; * * @author ruoyi */ -public class SysUser extends BaseEntity -{ +public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; - /** 用户ID */ + /** + * 用户ID + */ @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") private Long userId; - /** 部门ID */ + /** + * 部门ID + */ @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; - /** 用户账号 */ + /** + * 用户账号 + */ @Excel(name = "登录名称") private String userName; - /** 用户昵称 */ + /** + * 用户昵称 + */ @Excel(name = "用户名称") private String nickName; - /** 用户邮箱 */ + /** + * 用户邮箱 + */ @Excel(name = "用户邮箱") private String email; - /** 手机号码 */ + /** + * 手机号码 + */ @Excel(name = "手机号码", cellType = ColumnType.TEXT) private String phonenumber; - /** 用户性别 */ + /** + * 用户性别 + */ @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") private String sex; - /** 用户头像 */ + /** + * 用户头像 + */ private String avatar; - /** 密码 */ + /** + * 密码 + */ private String password; - /** 帐号状态（0正常 1停用） */ + /** + * 帐号状态（0正常 1停用） + */ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") private String status; - /** 删除标志（0代表存在 2代表删除） */ + /** + * 删除标志（0代表存在 2代表删除） + */ private String delFlag; - /** 最后登录IP */ + /** + * 最后登录IP + */ @Excel(name = "最后登录IP", type = Type.EXPORT) private String loginIp; - /** 最后登录时间 */ + /** + * 最后登录时间 + */ @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; /** - *账号类型:0 若依系统用户;1 学校;2 供货商;3 教育局;4 商户 - * + * 账号类型:0 若依系统用户;1 学校;2 供货商;3 教育局;4 商户 */ private Integer accountType; @@ -88,27 +112,76 @@ public class SysUser extends BaseEntity this.accountDeptId = accountDeptId; } - /** 部门对象 */ + /** + * 部门对象 + */ @Excels({ - @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) + @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) }) private SysDept dept; - /** 角色对象 */ + /** + * 角色对象 + */ private List roles; - /** 角色组 */ + /** + * 角色组 + */ private Long[] roleIds; - /** 岗位组 */ + /** + * 岗位组 + */ private Long[] postIds; - /** 角色ID */ + /** + * 角色ID + */ private Long roleId; - public SysUser() - { + /** + * 几个关键id + */ + private Integer schoolId; + private Integer supplierId; + private Integer eduId; + private String deptName; + + public Integer getSchoolId() { + return schoolId; + } + + public void setSchoolId(Integer schoolId) { + this.schoolId = schoolId; + } + + public Integer getSupplierId() { + return supplierId; + } + + public void setSupplierId(Integer supplierId) { + this.supplierId = supplierId; + } + + public Integer getEduId() { + return eduId; + } + + public void setEduId(Integer eduId) { + this.eduId = eduId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public SysUser() { } @@ -120,32 +193,27 @@ public class SysUser extends BaseEntity this.accountType = accountType; } - public SysUser(Long userId) - { + public SysUser(Long userId) { this.userId = userId; } - public Long getUserId() - { + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.userId); } - public boolean isMerchant() - { - AtomicBoolean flag= new AtomicBoolean(false); - if(this.getRoles()!=null && this.getRoles().size()>0){ - this.getRoles().forEach(role->{ - if(Constants.MERCHANT_ROLE.equals(role.getRoleId())){ + public boolean isMerchant() { + AtomicBoolean flag = new AtomicBoolean(false); + if (this.getRoles() != null && this.getRoles().size() > 0) { + this.getRoles().forEach(role -> { + if (Constants.MERCHANT_ROLE.equals(role.getRoleId())) { flag.set(true); } }); @@ -153,212 +221,177 @@ public class SysUser extends BaseEntity return flag.get(); } - public static boolean isAdmin(Long userId) - { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - public String getNickName() - { + public String getNickName() { return nickName; } - public void setNickName(String nickName) - { + public void setNickName(String nickName) { this.nickName = nickName; } @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - public String getPhonenumber() - { + public String getPhonenumber() { return phonenumber; } - public void setPhonenumber(String phonenumber) - { + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - public String getSex() - { + public String getSex() { return sex; } - public void setSex(String sex) - { + public void setSex(String sex) { this.sex = sex; } - public String getAvatar() - { + public String getAvatar() { return avatar; } - public void setAvatar(String avatar) - { + public void setAvatar(String avatar) { this.avatar = avatar; } - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getLoginIp() - { + public String getLoginIp() { return loginIp; } - public void setLoginIp(String loginIp) - { + public void setLoginIp(String loginIp) { this.loginIp = loginIp; } - public Date getLoginDate() - { + public Date getLoginDate() { return loginDate; } - public void setLoginDate(Date loginDate) - { + public void setLoginDate(Date loginDate) { this.loginDate = loginDate; } - public SysDept getDept() - { + public SysDept getDept() { return dept; } - public void setDept(SysDept dept) - { + public void setDept(SysDept dept) { this.dept = dept; } - public List getRoles() - { + public List getRoles() { return roles; } - public void setRoles(List roles) - { + public void setRoles(List roles) { this.roles = roles; } - public Long[] getRoleIds() - { + public Long[] getRoleIds() { return roleIds; } - public void setRoleIds(Long[] roleIds) - { + public void setRoleIds(Long[] roleIds) { this.roleIds = roleIds; } - public Long[] getPostIds() - { + public Long[] getPostIds() { return postIds; } - public void setPostIds(Long[] postIds) - { + public void setPostIds(Long[] postIds) { this.postIds = postIds; } - public Long getRoleId() - { + public Long getRoleId() { return roleId; } - public void setRoleId(Long roleId) - { + public void setRoleId(Long roleId) { this.roleId = roleId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("accountType", getAccountType()) - .append("dept", getDept()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("accountType", getAccountType()) + .append("dept", getDept()) + .toString(); } } diff --git a/fp-common/src/main/java/com/zf/foodpurchase/common/vo/CommonVO.java b/fp-common/src/main/java/com/zf/foodpurchase/common/vo/CommonVO.java index 808aef6..8cff450 100644 --- a/fp-common/src/main/java/com/zf/foodpurchase/common/vo/CommonVO.java +++ b/fp-common/src/main/java/com/zf/foodpurchase/common/vo/CommonVO.java @@ -24,4 +24,10 @@ public class CommonVO { * 时间筛选条件 */ private Date endTime; + + private Integer eduId; + + private Integer schoolId; + + private Integer supplierId; } diff --git a/fp-framework/src/main/java/com/zf/foodpurchase/framework/web/service/UserDetailsServiceImpl.java b/fp-framework/src/main/java/com/zf/foodpurchase/framework/web/service/UserDetailsServiceImpl.java index d5621c6..0f0502a 100644 --- a/fp-framework/src/main/java/com/zf/foodpurchase/framework/web/service/UserDetailsServiceImpl.java +++ b/fp-framework/src/main/java/com/zf/foodpurchase/framework/web/service/UserDetailsServiceImpl.java @@ -1,7 +1,15 @@ package com.zf.foodpurchase.framework.web.service; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; +import com.zf.foodpurchase.fdsafe.entity.Edu; +import com.zf.foodpurchase.fdsafe.entity.School; +import com.zf.foodpurchase.fdsafe.entity.Supplier; +import com.zf.foodpurchase.fdsafe.service.IEduService; +import com.zf.foodpurchase.fdsafe.service.ISchoolService; +import com.zf.foodpurchase.fdsafe.service.ISupplierService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -34,6 +42,16 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private SysPermissionService permissionService; + @Autowired + private ISchoolService schoolService; + + @Autowired + private IEduService eduService; + + @Autowired + private ISupplierService supplierService; + + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { @@ -55,8 +73,42 @@ public class UserDetailsServiceImpl implements UserDetailsService } passwordService.validate(user); + SysUser detailUser= new SysUser(); + BeanUtils.copyProperties(user,detailUser); + Integer accountDeptId = user.getAccountDeptId(); + if(accountDeptId != null){ + String deptName = ""; - return createLoginUser(user); + + if(WxAPPAccountConstants.SCHOOL.equals(user.getAccountType())){ + School byId = schoolService.getById(accountDeptId); + detailUser.setSchoolId(accountDeptId); + if(byId != null){ + deptName = byId.getSchoolName(); + detailUser.setEduId(byId.getEduId()); + } + } + else if(WxAPPAccountConstants.SUPPLIER.equals(user.getAccountType())){ + detailUser.setSupplierId(accountDeptId); + Supplier supplier = supplierService.getById(accountDeptId); + if(supplier != null){ + deptName = supplier.getSupplierName(); + detailUser.setEduId(supplier.getEduId()); + } + } + else if(WxAPPAccountConstants.EDU.equals(user.getAccountType())){ + detailUser.setEduId(accountDeptId); + Edu edu = eduService.getById(accountDeptId); + if(edu != null){ + deptName = edu.getEduName(); + } + } + detailUser.setDeptName(deptName); + } + + + // return createLoginUser(user); + return createLoginUser(detailUser); } public UserDetails createLoginUser(SysUser user) diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/SupplierDelivery.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/SupplierDelivery.java index 5c50acc..b44a3ad 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/SupplierDelivery.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/SupplierDelivery.java @@ -1,10 +1,13 @@ package com.zf.foodpurchase.fdsafe.entity; import com.baomidou.mybatisplus.annotation.IdType; + import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; import java.util.Date; @@ -97,6 +100,8 @@ public class SupplierDelivery implements Serializable { * 送货单备注 */ private String deliveryRemark; - - + /** + * 签收状态:0 未签收 1 已签收 + */ + private Integer signStatus; } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java index 99370b2..3f20588 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java @@ -38,7 +38,7 @@ public class FoodSampleServiceImpl extends ServiceImpl { item.setSaveImg(ArrayStringUtils.stringToArray(item.getSaveImgStr())); - item.setWxSaveImage(ArrayStringUtils.arrayToWxImgList(item.getSaveImg())); + item.setWxSaveImg(ArrayStringUtils.arrayToWxImgList(item.getSaveImg())); // FoodBookVO foodBookVO = this.getFoodBookVOById(item.getBookId()); // if(foodBookVO != null){ // item.setDishNames(foodBookVO.getDishNames()); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SupplierDeliveryServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SupplierDeliveryServiceImpl.java index d7962f3..3a26c23 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SupplierDeliveryServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SupplierDeliveryServiceImpl.java @@ -155,6 +155,8 @@ public class SupplierDeliveryServiceImpl extends ServiceImpl wxSaveImage; + private List wxSaveImg; /** * 目测状态:0 异常 1 良好 diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java index 844a3bf..e541aa3 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java @@ -27,6 +27,11 @@ public class SupplierDeliveryVO extends CommonVO implements Serializable { */ private String orderNo; + /** + * 订单状态 + */ + private Integer signStatus; + /** * 学校id */ diff --git a/fp-system/src/main/resources/mapper/AccompanyMealMapper.xml b/fp-system/src/main/resources/mapper/AccompanyMealMapper.xml index 5db9cae..3a5e16e 100644 --- a/fp-system/src/main/resources/mapper/AccompanyMealMapper.xml +++ b/fp-system/src/main/resources/mapper/AccompanyMealMapper.xml @@ -9,8 +9,9 @@ select ca.catten_id, ca.school_id, ca.catten_name, ca.catten_type, ca.concat_name, ca.concat_phone, ca.license_img as license_img_str, ca.food_license_img as food_license_img_str, ca.remark, ca.create_time, ca.update_time, ca.del_flag, - sc.school_name + sc.school_name,ed.edu_id from catten ca left join school sc on ca.school_id = sc.school_id + left join edu ed on sc.edu_id = ed.edu_id ca.del_flag = '0' @@ -26,6 +27,9 @@ and ca.school_id = #{schoolId} + + and ed.edu_id = #{eduId} + diff --git a/fp-system/src/main/resources/mapper/DishMapper.xml b/fp-system/src/main/resources/mapper/DishMapper.xml index 4b391ed..3449a99 100644 --- a/fp-system/src/main/resources/mapper/DishMapper.xml +++ b/fp-system/src/main/resources/mapper/DishMapper.xml @@ -11,6 +11,7 @@ select , s.school_name from dish dh left join school s on dh.school_id = s.school_id + left join edu ed on ed.edu_id = s.edu_id dh.del_flag = 0 @@ -19,6 +20,9 @@ and dh.school_id = #{schoolId} + + and ed.edu_id = #{eduId} + and s.school_name like concat('%',#{schoolName},'%') diff --git a/fp-system/src/main/resources/mapper/FoodProductMapper.xml b/fp-system/src/main/resources/mapper/FoodProductMapper.xml index 43df074..76ebc33 100644 --- a/fp-system/src/main/resources/mapper/FoodProductMapper.xml +++ b/fp-system/src/main/resources/mapper/FoodProductMapper.xml @@ -32,6 +32,9 @@ and fp.supplier_id = #{supplierId} + + and fp.edu_id = #{eduId} + and fp.check_status = #{checkStatus} diff --git a/fp-system/src/main/resources/mapper/FoodSampleMapper.xml b/fp-system/src/main/resources/mapper/FoodSampleMapper.xml index 693eeb1..acfcc63 100644 --- a/fp-system/src/main/resources/mapper/FoodSampleMapper.xml +++ b/fp-system/src/main/resources/mapper/FoodSampleMapper.xml @@ -12,6 +12,7 @@ sa.remark, sa.create_time, sa.update_time from food_sample sa left join school sc on sc.school_id = sa.school_id + left join edu ed on ed.edu_id = sc.edu_id and sa.sample_id = #{sampleId} @@ -19,6 +20,9 @@ and sa.school_id = #{schoolId} + + and ed.edu_id = #{eduId} + and sc.school_name like concat('%',#{schoolName},'%') diff --git a/fp-system/src/main/resources/mapper/FoodUnitMapper.xml b/fp-system/src/main/resources/mapper/FoodUnitMapper.xml index 97749cb..f0fb1e7 100644 --- a/fp-system/src/main/resources/mapper/FoodUnitMapper.xml +++ b/fp-system/src/main/resources/mapper/FoodUnitMapper.xml @@ -21,6 +21,9 @@ and del_flag = #{delFlag} + + and status = #{status} + diff --git a/fp-system/src/main/resources/mapper/RubbishDealMapper.xml b/fp-system/src/main/resources/mapper/RubbishDealMapper.xml index da4eedb..4cc9212 100644 --- a/fp-system/src/main/resources/mapper/RubbishDealMapper.xml +++ b/fp-system/src/main/resources/mapper/RubbishDealMapper.xml @@ -9,9 +9,10 @@ select , - s.school_name, c.catten_name + s.school_name, c.catten_name as canteenName,ed.edu_id from school_staff sa left join school s on sa.school_id = s.school_id + left join edu ed on s.edu_id = ed.edu_id left join catten c on sa.catten_id = c.catten_id sa.del_flag = 0 and sa.school_id = #{schoolId} + + and ed.edu_id = #{eduId} + and sa.staff_type = #{staffType} diff --git a/fp-system/src/main/resources/mapper/SelfInspectionRecordMapper.xml b/fp-system/src/main/resources/mapper/SelfInspectionRecordMapper.xml index cc61b08..a07efaa 100644 --- a/fp-system/src/main/resources/mapper/SelfInspectionRecordMapper.xml +++ b/fp-system/src/main/resources/mapper/SelfInspectionRecordMapper.xml @@ -20,7 +20,7 @@ and sl.school_id = #{schoolId} - + and sl.edu_id = #{eduId} diff --git a/fp-system/src/main/resources/mapper/SupplierDeliveryMapper.xml b/fp-system/src/main/resources/mapper/SupplierDeliveryMapper.xml index 19dbfe3..e9d2158 100644 --- a/fp-system/src/main/resources/mapper/SupplierDeliveryMapper.xml +++ b/fp-system/src/main/resources/mapper/SupplierDeliveryMapper.xml @@ -4,7 +4,7 @@ - de.delivery_no, de.order_no, de.school_id, de.edu_id, de.supplier_id, de.delivery_person, de.delivery_phone, de.delivery_car, de.delivery_status, de.create_time, de.update_time, de.receiver, de.sign_image as sign_image_str, de.delivery_remark + de.delivery_no, de.order_no, de.school_id, de.edu_id, de.supplier_id, de.delivery_person, de.delivery_phone, de.delivery_car, de.delivery_status, de.create_time, de.update_time, de.receiver, de.sign_image as sign_image_str, de.delivery_remark,de.sign_status