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

送货单详情图片更改,监督自查查询附带详情信息

Browse Source
This commit is contained in:
林华觞
2025-07-23 16:55:17 +08:00
parent 1e88d74090
commit 4d95e4c1b3
8 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,13 @@ public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements ID
@Override
public List<DishVO> queryDishVO(DishVO dishVO) {
List<DishVO> dishVOList = baseMapper.queryDishVO(dishVO);
// 查询详情数据并附带
if(!CollectionUtils.isEmpty(dishVOList)){
for(DishVO itemVO:dishVOList){
List<DishFoodRelationVO> relationVOList = dishFoodRelationService.detail(itemVO.getDishId());
itemVO.setDsFdVoList(relationVOList);
}
}
return dishVOList;
}

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

@@ -126,6 +126,14 @@ public class FoodBookServiceImpl extends ServiceImpl<FoodBookMapper, FoodBook> i
continue;
}
String[] split = ids.split(",");
List<Integer> dishIdList = new ArrayList<>();
if(split !=null && split.length > 0){
for(String id : split){
Integer intId = Integer.parseInt(id);
dishIdList.add(intId);
}
}
foodBookVO.setDishIdList(dishIdList);
LambdaQueryWrapper<Dish> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Dish::getDishId, split);
queryWrapper.last("or del_flag = 1");

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

@@ -46,6 +46,14 @@ public class SelfInspectionRecordServiceImpl extends ServiceImpl<SelfInspectionR
@Override
public List<SelfInspectionRecordVO> querySelfInspectionRecordVO(SelfInspectionRecordVO selfInspectionRecordVO) {
List<SelfInspectionRecordVO> list = baseMapper.querySelfInspectionRecordVO(selfInspectionRecordVO);
// 监督自查详情项补充
if(!CollectionUtils.isEmpty(list)){
for(SelfInspectionRecordVO recordVO : list){
// 查询监督自查详情
List<SelfInspectionDetailVO> detail = selfInspectionDetailService.getDetail(recordVO.getSelfRecordId());
recordVO.setSelfInspectionDetailVOList(detail);
}
}
return list;
}

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

@@ -14,6 +14,7 @@ import com.zf.foodpurchase.fdsafe.service.ISchoolOrderItemService;
import com.zf.foodpurchase.fdsafe.service.ISchoolOrderService;
import com.zf.foodpurchase.fdsafe.service.ISupplierDeliveryItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zf.foodpurchase.fdsafe.utils.ArrayStringUtils;
import com.zf.foodpurchase.fdsafe.utils.NoUtils;
import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemUpdateVO;
import com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemVO;
@@ -98,6 +99,8 @@ public class SupplierDeliveryItemServiceImpl extends ServiceImpl<SupplierDeliver
SupplierDeliveryItem supplierDeliveryItem = new SupplierDeliveryItem();
BeanUtils.copyProperties(supplierDeliveryItemUpdateVO,supplierDeliveryItem);
// 图片数据处理
supplierDeliveryItem.setCheckReportImage(ArrayStringUtils.arrayToString(supplierDeliveryItemUpdateVO.getCheckReportImage()));
supplierDeliveryItem.setOrderNo(null);
boolean flag = updateById(supplierDeliveryItem);
return flag ? AjaxResult.success("更新成功") : AjaxResult.error("更新失败");

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

@@ -3,10 +3,12 @@ package com.zf.foodpurchase.fdsafe.vo;
import com.zf.foodpurchase.common.valigroud.UpdateGroup;
import com.zf.foodpurchase.common.vo.CommonVO;
import lombok.Data;
import org.w3c.dom.stylesheets.LinkStyle;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -45,7 +47,9 @@ public class SupplierDeliveryItemUpdateVO extends CommonVO implements Serializab
/**
* 检测报告图片
*/
private String checkReportImage;
private String[] checkReportImage;
private String checkReportImageStr;
private List<WxImg> wxCheckReportImage;
/**

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

@@ -10,6 +10,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @author:lilj
@@ -54,11 +55,12 @@ public class SupplierDeliveryItemVO extends CommonVO implements Serializable {
* 入库照片
*/
private String inImage;
/**
* 检测报告图片
*/
private String checkReportImage;
private String[] checkReportImage;
private String checkReportImageStr;
private List<WxImg> wxCheckReportImage;
/**
* 创建时间

2
fp-system/src/main/resources/mapper/SupplierDeliveryItemMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
dei.delivery_item_no, dei.delivery_no, dei.order_no, dei.order_item_no, dei.product_time, dei.expire_time, dei.in_image, dei.check_report_image, dei.create_time, dei.update_time, dei.delivery_item_remark
dei.delivery_item_no, dei.delivery_no, dei.order_no, dei.order_item_no, dei.product_time, dei.expire_time, dei.in_image, dei.check_report_image as checkReportImageStr, dei.create_time, dei.update_time, dei.delivery_item_remark
</sql>
<select id="querySupplierDeliveryItemVO" resultType="com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryItemVO">
select