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

留样管理保留小程序端的wxSaveImage字段

Browse Source
This commit is contained in:
林华觞
2025-07-25 10:14:23 +08:00
parent b849879a4b
commit 714bbb83ef
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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("非学校人员账号无法操作"); return AjaxResult.error("非学校人员账号无法操作");
} }
// 图片校验小程序与app使用图片字段不一样,不能同时为空 // 图片校验小程序与app使用图片字段不一样,不能同时为空
if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
return error("留样照片不能为空"); return error("留样照片不能为空");
} }
foodSampleVO.setSchoolId(userVO.getSchoolId()); foodSampleVO.setSchoolId(userVO.getSchoolId());
// 图片处理 // 图片处理
String[] images = foodSampleVO.getSaveImg(); String[] images = foodSampleVO.getSaveImg();
if(images == null){ if(images == null){
foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg())); foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
} }
return foodSampleService.saveVO(foodSampleVO); return foodSampleService.saveVO(foodSampleVO);
} }
@@ -68,14 +68,14 @@ public class WxAppFoodSampleController extends BaseController {
return AjaxResult.error("非学校人员账号无法操作"); return AjaxResult.error("非学校人员账号无法操作");
} }
// 图片校验小程序与app使用图片字段不一样,不能同时为空 // 图片校验小程序与app使用图片字段不一样,不能同时为空
if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){ if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
return error("留样照片不能为空"); return error("留样照片不能为空");
} }
foodSampleVO.setSchoolId(userVO.getSchoolId()); foodSampleVO.setSchoolId(userVO.getSchoolId());
// 图片处理 // 图片处理
String[] images = foodSampleVO.getSaveImg(); String[] images = foodSampleVO.getSaveImg();
if(images == null){ if(images == null){
foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg())); foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
} }
return foodSampleService.updateVO(foodSampleVO); return foodSampleService.updateVO(foodSampleVO);
} }

1
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java
View File

@@ -39,6 +39,7 @@ public class FoodSampleServiceImpl extends ServiceImpl<FoodSampleMapper, FoodSam
list.forEach(item -> { list.forEach(item -> {
item.setSaveImg(ArrayStringUtils.stringToArray(item.getSaveImgStr())); item.setSaveImg(ArrayStringUtils.stringToArray(item.getSaveImgStr()));
item.setWxSaveImg(ArrayStringUtils.arrayToWxImgList(item.getSaveImg())); item.setWxSaveImg(ArrayStringUtils.arrayToWxImgList(item.getSaveImg()));
item.setWxSaveImage(ArrayStringUtils.arrayToWxImgList(item.getSaveImg()));
// FoodBookVO foodBookVO = this.getFoodBookVOById(item.getBookId()); // FoodBookVO foodBookVO = this.getFoodBookVOById(item.getBookId());
// if(foodBookVO != null){ // if(foodBookVO != null){
// item.setDishNames(foodBookVO.getDishNames()); // item.setDishNames(foodBookVO.getDishNames());

3
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java
View File

@@ -75,7 +75,10 @@ public class FoodSampleVO extends CommonVO implements Serializable {
private String[] saveImg; private String[] saveImg;
private String saveImgStr; private String saveImgStr;
// @NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class}) // @NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class})
// web端使用字段
private List<WxImg> wxSaveImg; private List<WxImg> wxSaveImg;
// 小程序端使用字段
private List<WxImg> wxSaveImage;
/** /**
* 目测状态:0 异常 1 良好 * 目测状态:0 异常 1 良好