zjk/SchoolFood
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

留样管理图片字段修正为wxSaveImg

Browse Source
This commit is contained in:
林华觞
2025-07-25 10:09:40 +08:00
parent 4d95e4c1b3
commit b849879a4b
45 changed files with 375 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java
View File

@@ -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<EduVO> 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<EduVO> list = eduService.queryEduList(eduVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/FoodController.java
View File

@@ -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<FoodVO> list = foodService.queryFoodVO(foodVO);
return getDataTable(list);

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/MorningInspectionContentController.java
View File

@@ -33,6 +33,8 @@ public class MorningInspectionContentController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(MorningInspectionContentVO morningInspectionContentVO){
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(morningInspectionContentVO);
List<MorningInspectionContentVO> list = morningInspectionContentService.queryMorningInspectionContentVO(morningInspectionContentVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SelfInspectionContentController.java
View File

@@ -31,6 +31,8 @@ public class SelfInspectionContentController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SelfInspectionContentVO selfInspectionContentVO){
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(selfInspectionContentVO);
List<SelfInspectionContentVO> list = selfInspectionContentService.querySelfInspectionContentVO(selfInspectionContentVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java
View File

@@ -33,6 +33,8 @@ public class SupplierController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SupplierVO supplierVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(supplierVO);
List<SupplierVO> list = supplierService.querySupplierVO(supplierVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/AccompanyMealController.java
View File

@@ -37,6 +37,8 @@ public class AccompanyMealController extends BaseController {
@RequestMapping("/pageList")
public TableDataInfo pageList(AccompanyMealVO accompanyMealVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(accompanyMealVO);
List<AccompanyMealVO> list = accompanyMealService.queryAccompanyMealVO(accompanyMealVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/CattenController.java
View File

@@ -34,6 +34,8 @@ public class CattenController extends BaseController {
@RequestMapping("/pageList")
public TableDataInfo pageList(CattenVO cattenVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(cattenVO);
List<CattenVO> list = cattenService.queryCattenVO(cattenVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/DishController.java
View File

@@ -42,6 +42,8 @@ public class DishController extends BaseController {
// return getDataTable(list);
// }
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(dishVO);
List<DishVO> dishVOList = dishService.queryDishVO(dishVO);
TableDataInfo tableDataInfo = getDataTable(dishVOList);
return tableDataInfo;

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodBookController.java
View File

@@ -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<FoodBookVO> list = foodBookService.queryFoodBookVO(foodBookVO);
return getDataTable(list);

6
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/FoodSampleController.java
View File

@@ -35,6 +35,8 @@ public class FoodSampleController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(FoodSampleVO foodSampleVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(foodSampleVO);
List<FoodSampleVO> 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<WxImg> imageList = foodSampleVO.getWxSaveImage();
List<WxImg> 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<WxImg> imageList = foodSampleVO.getWxSaveImage();
List<WxImg> imageList = foodSampleVO.getWxSaveImg();
if(!CollectionUtils.isEmpty(imageList)){
foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(imageList));
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningCheckInController.java
View File

@@ -32,6 +32,8 @@ public class MorningCheckInController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(MorningCheckInVO morningCheckInVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(morningCheckInVO);
List<MorningCheckInVO> list = morningCheckInService.queryMorningCheckInVO(morningCheckInVO);
return getDataTable(list);
}

6
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/MorningInspectionDetailController.java
View File

@@ -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<MorningTableHeaderVO> 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);

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/RubbishDealController.java
View File

@@ -35,6 +35,8 @@ public class RubbishDealController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(RubbishDealVO rubbishDealVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(rubbishDealVO);
List<RubbishDealVO> list = rubbishDealService.queryRubbishDealVO(rubbishDealVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolCartItemController.java
View File

@@ -31,6 +31,8 @@ public class SchoolCartItemController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SchoolCartItemVO schoolCartItemVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(schoolCartItemVO);
List<SchoolCartItemVO> list = schoolCartItemService.querySchoolCartItemVO(schoolCartItemVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java
View File

@@ -30,6 +30,8 @@ public class SchoolController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SchoolVO schoolVO){
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(schoolVO);
List<SchoolVO> list = schoolService.querySchoolList(schoolVO);
return getDataTable(list);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java
View File

@@ -36,6 +36,8 @@ public class SchoolOrderController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SchoolOrderVO schoolOrderVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(schoolOrderVO);
List<SchoolOrderVO> 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);
}
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderItemController.java
View File

@@ -31,6 +31,8 @@ public class SchoolOrderItemController extends BaseController {
@GetMapping("/list")
public AjaxResult list(SchoolOrderItemVO schoolOrderItemVO) {
// 填充学校id,教育局id等数据
dealCommonVO(schoolOrderItemVO);
List<SchoolOrderItemVO> 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<SchoolOrderItemVO> list = schoolOrderItemService.querySchoolOrderItemVO(schoolOrderItemVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolRefundController.java
View File

@@ -44,6 +44,8 @@ public class SchoolRefundController extends BaseController {
@GetMapping("/querySchoolRefund")
public TableDataInfo querySchoolRefund(SchoolRefundVO schoolRefundVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(schoolRefundVO);
List<SchoolRefundVO> schoolRefunds = schoolRefundService.querySchoolRefund(schoolRefundVO);
return getDataTable(schoolRefunds);
}

4
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java
View File

@@ -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<SchoolOrderVO> 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<SchoolSettleVO> list = schoolSettleService.qeurySettleVO(settleVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolStaffController.java
View File

@@ -40,6 +40,8 @@ public class SchoolStaffController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SchoolStaffVO schoolStaffVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(schoolStaffVO);
List<SchoolStaffVO> list = schoolStaffService.querySchoolStaffVO(schoolStaffVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SelfInspectionRecordController.java
View File

@@ -36,6 +36,8 @@ public class SelfInspectionRecordController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SelfInspectionRecordVO selfInspectionRecordVO) {
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(selfInspectionRecordVO);
List<SelfInspectionRecordVO> list = selfInspectionRecordService.querySelfInspectionRecordVO(selfInspectionRecordVO);
return getDataTable(list);
}

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java
View File

@@ -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<FoodProductVO> list = foodProductService.queryFoodProductVO(foodProductVO);
return getDataTable(list);

2
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/SupplierDeliveryController.java
View File

@@ -36,6 +36,8 @@ public class SupplierDeliveryController extends BaseController {
@GetMapping("/pageList")
public TableDataInfo pageList(SupplierDeliveryVO supplierDeliveryVO){
startPage();
// 填充学校id,教育局id等数据
dealCommonVO(supplierDeliveryVO);
List<SupplierDeliveryVO> list = supplierDeliveryService.querySupplierDeliveryVO(supplierDeliveryVO);
return getDataTable(list);
}

8
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
View File

@@ -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);
}