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

9
fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/SupplierDelivery.java
View File

@@ -1,10 +1,13 @@
package com.zf.foodpurchase.fdsafe.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
@@ -97,6 +100,8 @@ public class SupplierDelivery implements Serializable {
* 送货单备注
*/
private String deliveryRemark;
/**
* 签收状态:0 未签收 1 已签收
*/
private Integer signStatus;
}

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

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

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

@@ -155,6 +155,8 @@ public class SupplierDeliveryServiceImpl extends ServiceImpl<SupplierDeliveryMap
SupplierDelivery updateDelivery = new SupplierDelivery();
BeanUtils.copyProperties(schoolDeliveryVO, updateDelivery);
updateDelivery.setSignImage(ArrayStringUtils.arrayToString(schoolDeliveryVO.getSignImage()));
// 已签收
updateDelivery.setSignStatus(1);
try {
boolean update = this.updateById(updateDelivery);
if (!update) {

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

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

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

@@ -27,6 +27,11 @@ public class SupplierDeliveryVO extends CommonVO implements Serializable {
*/
private String orderNo;
/**
* 订单状态
*/
private Integer signStatus;
/**
* 学校id
*/

6
fp-system/src/main/resources/mapper/AccompanyMealMapper.xml
View File

@@ -9,8 +9,9 @@
<select id="queryAccompanyMealVO" resultType="com.zf.foodpurchase.fdsafe.vo.AccompanyMealVO">
select
<include refid="Base_Column_List"/>,
s.school_name
s.school_name,ed.edu_id
from accompany_meal am left join school s on am.school_id = s.school_id
left join edu ed on s.edu_id = ed.edu_id
<where>
<if test="accompanyMealId != null ">
and am.accompany_meal_id = #{accompanyMealId}
@@ -19,6 +20,9 @@
<if test="schoolId != null ">
and am.school_id = #{schoolId}
</if>
<if test="eduId != null ">
and ed.edu_id = #{eduId}
</if>
<if test="mealType != null ">
and am.meal_type = #{mealType}
</if>

6
fp-system/src/main/resources/mapper/CattenMapper.xml
View File

@@ -9,9 +9,10 @@
<select id="queryCattenVO" resultType="com.zf.foodpurchase.fdsafe.vo.CattenVO">
select
ca.catten_id, ca.school_id, ca.catten_name, ca.catten_type, ca.concat_name, ca.concat_phone, ca.license_img as license_img_str, ca.food_license_img as food_license_img_str, ca.remark, ca.create_time, ca.update_time, ca.del_flag,
sc.school_name
sc.school_name,ed.edu_id
from catten ca
left join school sc on ca.school_id = sc.school_id
left join edu ed on sc.edu_id = ed.edu_id
<where>
ca.del_flag = '0'
<if test="cattenId != null">
@@ -26,6 +27,9 @@
<if test="schoolId != null">
and ca.school_id = #{schoolId}
</if>
<if test="eduId != null">
and ed.edu_id = #{eduId}
</if>
</where>
</select>

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

@@ -11,6 +11,7 @@
select <include refid="Base_Column_List"/>,
s.school_name
from dish dh left join school s on dh.school_id = s.school_id
left join edu ed on ed.edu_id = s.edu_id
<where>
dh.del_flag = 0
<if test="dishId != null">
@@ -19,6 +20,9 @@
<if test="schoolId != null">
and dh.school_id = #{schoolId}
</if>
<if test="eduId != null">
and ed.edu_id = #{eduId}
</if>
<if test="schoolName != null and schoolName !=''">
and s.school_name like concat('%',#{schoolName},'%')
</if>

3
fp-system/src/main/resources/mapper/FoodProductMapper.xml
View File

@@ -32,6 +32,9 @@
<if test="supplierId != null">
and fp.supplier_id = #{supplierId}
</if>
<if test="eduId != null">
and fp.edu_id = #{eduId}
</if>
<if test="checkStatus != null">
and fp.check_status = #{checkStatus}
</if>

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

@@ -12,6 +12,7 @@
sa.remark, sa.create_time, sa.update_time
from food_sample sa
left join school sc on sc.school_id = sa.school_id
left join edu ed on ed.edu_id = sc.edu_id
<where>
<if test="sampleId != null">
and sa.sample_id = #{sampleId}
@@ -19,6 +20,9 @@
<if test="schoolId != null">
and sa.school_id = #{schoolId}
</if>
<if test="eduId != null">
and ed.edu_id = #{eduId}
</if>
<if test="schoolName != null and schoolName != ''">
and sc.school_name like concat('%',#{schoolName},'%')
</if>

3
fp-system/src/main/resources/mapper/FoodUnitMapper.xml
View File

@@ -21,6 +21,9 @@
<if test="delFlag != null">
and del_flag = #{delFlag}
</if>
<if test="status != null">
and status = #{status}
</if>
</where>
</select>

6
fp-system/src/main/resources/mapper/RubbishDealMapper.xml
View File

@@ -9,9 +9,10 @@
<select id="queryRubbishDealVO" resultType="com.zf.foodpurchase.fdsafe.vo.RubbishDealVO"
parameterType="com.zf.foodpurchase.fdsafe.vo.RubbishDealVO">
select <include refid="Base_Column_List"></include>,
sc.school_name
sc.school_name,ed.edu_id
from rubbish_deal rb
left join school sc on rb.school_id = sc.school_id
left join edu ed on sc.edu_id = ed.edu_id
<where>
<if test="dealId != null">
and rb.deal_id = #{dealId}
@@ -19,6 +20,9 @@
<if test="schoolId != null">
and rb.school_id = #{schoolId}
</if>
<if test="eduId != null">
and ed.edu_id = #{eduId}
</if>
<if test="schoolName != null and schoolName != ''">
and sc.schoolName like concat('%', #{schoolName}, '%')
</if>

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

@@ -28,7 +28,7 @@
<if test="eduId != null ">
and sc.edu_id =#{eduId}
</if>
<if test="eduName != null ">
<if test="eduName != null and eduName !='' ">
and ed.edu_name like concat('%', #{eduName}, '%')
</if>
order by sc.create_time desc

6
fp-system/src/main/resources/mapper/SchoolStaffMapper.xml
View File

@@ -10,15 +10,19 @@
<select id="querySchoolStaffVO" resultType="com.zf.foodpurchase.fdsafe.vo.SchoolStaffVO">
select
<include refid="Base_Column_List"/>,
s.school_name, c.catten_name
s.school_name, c.catten_name as canteenName,ed.edu_id
from school_staff sa
left join school s on sa.school_id = s.school_id
left join edu ed on s.edu_id = ed.edu_id
left join catten c on sa.catten_id = c.catten_id
<where>
sa.del_flag = 0
<if test="schoolId != null">
and sa.school_id = #{schoolId}
</if>
<if test="eduId != null">
and ed.edu_id = #{eduId}
</if>
<if test="staffType != null ">
and sa.staff_type = #{staffType}
</if>

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

@@ -20,7 +20,7 @@
<if test="schoolId != null and schoolId != ''">
and sl.school_id = #{schoolId}
</if>
<if test="eduId != null and eduId != ''">
<if test="eduId != null">
and sl.edu_id = #{eduId}
</if>
<if test="checkResult != null and checkResult != ''">

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

@@ -4,7 +4,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
de.delivery_no, de.order_no, de.school_id, de.edu_id, de.supplier_id, de.delivery_person, de.delivery_phone, de.delivery_car, de.delivery_status, de.create_time, de.update_time, de.receiver, de.sign_image as sign_image_str, de.delivery_remark
de.delivery_no, de.order_no, de.school_id, de.edu_id, de.supplier_id, de.delivery_person, de.delivery_phone, de.delivery_car, de.delivery_status, de.create_time, de.update_time, de.receiver, de.sign_image as sign_image_str, de.delivery_remark,de.sign_status
</sql>
<select id="querySupplierDeliveryVO" resultType="com.zf.foodpurchase.fdsafe.vo.SupplierDeliveryVO">
select