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

晨检,垃圾处理,自检,食堂,留样管理改进

Browse Source
This commit is contained in:
林华觞
2025-06-26 15:09:09 +08:00
parent 906fbfd389
commit ec34635a82
17 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ public class CattenServiceImpl extends ServiceImpl<CattenMapper, Catten> impleme
list.forEach(vo -> {
vo.setLicenseImg(ArrayStringUtils.stringToArray(vo.getLicenseImgStr()));
vo.setFoodLicenseImg(ArrayStringUtils.stringToArray(vo.getFoodLicenseImgStr()));
vo.setWxLicenseImg(ArrayStringUtils.arrayToWxImgList(vo.getLicenseImg()));
vo.setWxFoodLicenseImg(ArrayStringUtils.arrayToWxImgList(vo.getFoodLicenseImg()));
});
}
return list;

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

@@ -49,6 +49,7 @@ public class MorningInspectionDetailServiceImpl extends ServiceImpl<MorningInspe
if(!CollectionUtils.isEmpty(list)){
list.forEach(item -> {
item.setAbnormalImg(ArrayStringUtils.stringToArray(item.getAbnormalImgStr()));
item.setWxAbnormalImg(ArrayStringUtils.arrayToWxImgList(item.getAbnormalImg()));
});
}
return list;

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

@@ -39,7 +39,7 @@ public class RubbishDealServiceImpl extends ServiceImpl<RubbishDealMapper, Rubbi
if(!CollectionUtils.isEmpty(list)){
list.forEach(item ->{
item.setDealImg(ArrayStringUtils.stringToArray(item.getDealImgStr()));
item.setWxDealImage(ArrayStringUtils.arrayToWxImgList(item.getDealImg()));
item.setWxDealImg(ArrayStringUtils.arrayToWxImgList(item.getDealImg()));
});
}
return list;

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

@@ -66,6 +66,7 @@ public class SelfInspectionDetailServiceImpl extends ServiceImpl<SelfInspectionD
if(!CollectionUtils.isEmpty(list)){
for (SelfInspectionDetailVO selfInspectionDetailVO : list) {
selfInspectionDetailVO.setAbnormalImg(ArrayStringUtils.stringToArray(selfInspectionDetailVO.getAbnormalImgStr()));
selfInspectionDetailVO.setWxAbnormalImg(ArrayStringUtils.arrayToWxImgList(selfInspectionDetailVO.getAbnormalImg()));
}
}
return list;

21
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/CattenVO.java
View File

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.zf.foodpurchase.common.annotation.Phone;
import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.valigroud.WxAddGroup;
import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
import com.zf.foodpurchase.common.vo.CommonVO;
import lombok.Data;
@@ -16,6 +18,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -28,13 +31,13 @@ public class CattenVO extends CommonVO implements Serializable {
/**
* 食堂id
*/
@NotNull(message = "食堂id不能为空", groups = { UpdateGroup.class})
@NotNull(message = "食堂id不能为空", groups = { UpdateGroup.class, WxUpdateGroup.class})
private Integer cattenId;
/**
* 学校id
*/
@NotNull(message = "学校id不能为空", groups = { AddGroup.class, UpdateGroup.class})
@NotNull(message = "学校id不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private Integer schoolId;
private String schoolName;
@@ -42,13 +45,13 @@ public class CattenVO extends CommonVO implements Serializable {
/**
* 食堂名称
*/
@NotBlank(message = "食堂名称不能为空", groups = { AddGroup.class, UpdateGroup.class})
@NotBlank(message = "食堂名称不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private String cattenName;
/**
* 食堂类型:0 自主经营 1 委托经营
*/
@NotNull(message = "食堂类型不能为空", groups = { AddGroup.class, UpdateGroup.class})
@NotNull(message = "食堂类型不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private Integer cattenType;
/**
@@ -59,22 +62,26 @@ public class CattenVO extends CommonVO implements Serializable {
/**
* 联系人电话
*/
@Phone(message = "联系人电话格式不正确")
@Phone(message = "联系人电话格式不正确",groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private String concatPhone;
/**
* 营业执照
*/
@NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class})
@NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private String[] licenseImg;
private String licenseImgStr;
@NotEmpty(message = "营业执照图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private List<WxImg> wxLicenseImg;
/**
* 食品许可证
*/
@NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class})
@NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private String[] foodLicenseImg;
private String foodLicenseImgStr;
@NotEmpty(message = "食品许可证图片不能为空", groups = { AddGroup.class, UpdateGroup.class, WxAddGroup.class, WxUpdateGroup.class})
private List<WxImg> wxFoodLicenseImg;
/**
* 备注

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.zf.foodpurchase.common.valigroud.AddGroup;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.valigroud.WxAddGroup;
import com.zf.foodpurchase.common.valigroud.WxUpdateGroup;
import com.zf.foodpurchase.common.vo.CommonVO;
import lombok.Data;
@@ -27,7 +29,7 @@ public class FoodSampleVO extends CommonVO implements Serializable {
/**
* 留样id
*/
@NotNull(message = "留样id不能为空", groups = {UpdateGroup.class})
@NotNull(message = "留样id不能为空", groups = {UpdateGroup.class, WxUpdateGroup.class})
private Long sampleId;
/**
@@ -49,19 +51,19 @@ public class FoodSampleVO extends CommonVO implements Serializable {
/**
* 餐次
*/
@NotNull(message = "餐次不能为空", groups = {UpdateGroup.class, AddGroup.class})
@NotNull(message = "餐次不能为空", groups = {UpdateGroup.class, AddGroup.class, WxUpdateGroup.class, WxAddGroup.class})
private Integer mealType;
/**
* 留样人员
*/
@NotBlank(message = "留样人员不能为空", groups = {UpdateGroup.class, AddGroup.class})
@NotBlank(message = "留样人员不能为空", groups = {UpdateGroup.class, AddGroup.class, WxUpdateGroup.class, WxAddGroup.class})
private String savePerson;
/**
* 学校
*/
@NotNull(message = "学校id不能为空", groups = {UpdateGroup.class, AddGroup.class})
@NotNull(message = "学校id不能为空", groups = {UpdateGroup.class, AddGroup.class, WxUpdateGroup.class, WxAddGroup.class})
private Integer schoolId;
private String schoolName;
@@ -72,12 +74,13 @@ public class FoodSampleVO extends CommonVO implements Serializable {
@NotEmpty(message = "留样照片不能为空", groups = {UpdateGroup.class, AddGroup.class})
private String[] saveImg;
private String saveImgStr;
@NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class})
private List<WxImg> wxSaveImage;
/**
* 目测状态:0 异常 1 良好
*/
@NotNull(message = "目测状态不能为空", groups = {UpdateGroup.class, AddGroup.class})
@NotNull(message = "目测状态不能为空", groups = {UpdateGroup.class, AddGroup.class, WxUpdateGroup.class, WxAddGroup.class})
private Integer status;
/**

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

@@ -67,6 +67,8 @@ public class MorningInspectionDetailVO extends CommonVO implements Serializable
private String abnormalImgStr;
private List<WxImg> wxAbnormalImg;
/**
* 创建时间
*/

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

@@ -76,7 +76,7 @@ public class RubbishDealVO extends CommonVO implements Serializable {
*/
private String[] dealImg;
private String dealImgStr;
private List<WxImg> wxDealImage;
private List<WxImg> wxDealImg;
/**
* 创建时间

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

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -60,6 +61,8 @@ public class SelfInspectionDetailVO extends CommonVO implements Serializable {
private String abnormalImgStr;
private List<WxImg> wxAbnormalImg;
/**
* 创建时间
*/

4
fp-system/src/main/resources/mapper/FoodSampleMapper.xml
View File

@@ -23,10 +23,10 @@
and sc.school_name like concat('%',#{schoolName},'%')
</if>
<if test="beginTime !=null">
AND date_format(sc.create_time,'%Y%m%d') &lt;= date_format(#{beginTime},'%Y%m%d')
AND date_format(sa.create_time,'%Y%m%d') &gt;= date_format(#{beginTime},'%Y%m%d')
</if>
<if test="endTime !=null">
AND date_format(sc.create_time,'%Y%m%d') &gt;= date_format(#{endTime})
AND date_format(sa.create_time,'%Y%m%d') &lt;= date_format(#{endTime},'%Y%m%d')
</if>
</where>
order by sa.create_time desc