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

小程序、app图片优化。根据String【】 是否为空判断是来自于小程序还是app。并做出相应的处理

Browse Source
This commit is contained in:
linhuashang
2025-07-21 20:08:33 +08:00
parent 6f930fc318
commit f146dd686c
13 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,16 @@
package com.zf.foodpurchase.fdsafe.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zf.foodpurchase.common.core.domain.AjaxResult;
import com.zf.foodpurchase.common.utils.bean.BeanUtils;
import com.zf.foodpurchase.fdsafe.entity.SchoolStaff;
import com.zf.foodpurchase.fdsafe.mapper.SchoolStaffMapper;
import com.zf.foodpurchase.fdsafe.service.ISchoolStaffService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -32,6 +31,7 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
if(!CollectionUtils.isEmpty(list)){
list.forEach(item->{
item.setHealthCertImg(ArrayStringUtils.stringToArray(item.getHealthCertImgStr()));
item.setWxHealthCertImg(ArrayStringUtils.arrayToWxImgList(item.getHealthCertImg()));
});
}
return list;

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

@@ -180,6 +180,7 @@ public class SupplierDeliveryServiceImpl extends ServiceImpl<SupplierDeliveryMap
if(!CollectionUtils.isEmpty(list)){
list.forEach(item -> {
item.setSignImage(ArrayStringUtils.stringToArray(item.getSignImageStr()));
item.setWxSignImage(ArrayStringUtils.arrayToWxImgList(item.getSignImage()));
});
}
return list;

2
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolDeliveryVO.java
View File

@@ -7,6 +7,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @author:lilj
@@ -33,6 +34,7 @@ public class SchoolDeliveryVO extends CommonVO implements Serializable {
*/
private String[] signImage;
private String signImageStr;
private List<WxImg> wxSignImage;
/**
* 学校id

11
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolStaffVO.java
View File

@@ -1,22 +1,16 @@
package com.zf.foodpurchase.fdsafe.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.vo.CommonVO;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -92,9 +86,10 @@ public class SchoolStaffVO extends CommonVO implements Serializable {
*
* 健康证照片
*/
@NotEmpty(message = "健康证照片不能为空", groups={AddGroup.class, UpdateGroup.class})
// @NotEmpty(message = "健康证照片不能为空", groups={AddGroup.class, UpdateGroup.class})
private String[] healthCertImg;
private String healthCertImgStr;
List<WxImg> wxHealthCertImg;
/**
* 备注

6
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SupplierDeliveryVO.java
View File

@@ -1,15 +1,12 @@
package com.zf.foodpurchase.fdsafe.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.zf.foodpurchase.common.vo.CommonVO;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -87,6 +84,7 @@ public class SupplierDeliveryVO extends CommonVO implements Serializable {
*/
private String[] signImage;
private String signImageStr;
List<WxImg> wxSignImage;
/**
* 送货单备注