|
@@ -26,7 +26,7 @@
|
|
|
principal,
|
|
|
complaint_phone,
|
|
|
takeout_phone,
|
|
|
- workerId,
|
|
|
+ worker_id,
|
|
|
create_time,
|
|
|
update_time,
|
|
|
isdel
|
|
@@ -50,7 +50,7 @@
|
|
|
<select id="pageList" resultType="java.util.Map">
|
|
|
SELECT
|
|
|
s_canteen.id, canteen_name, canteen_photo_path, supply_time_id, u.user_name founder, s_canteen.principal,
|
|
|
- complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,workerId,
|
|
|
+ complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,worker_id,
|
|
|
s_canteen.isdel
|
|
|
FROM s_canteen
|
|
|
LEFT JOIN p_user u
|
|
@@ -77,7 +77,7 @@
|
|
|
<!--新增所有列-->
|
|
|
<insert id="addSCanteen">
|
|
|
INSERT INTO s_canteen(id, canteen_name, canteen_photo_path, supply_time_id, founder, principal,
|
|
|
- complaint_phone, takeout_phone, create_time, update_time, isdel,workerId)
|
|
|
+ complaint_phone, takeout_phone, create_time, update_time, isdel,worker_id)
|
|
|
VALUES (#{id}, #{canteenName}, #{canteenPhotoPath}, #{supplyTimeId}, #{founder}, #{principal},
|
|
|
#{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel},#{workerId})
|
|
|
</insert>
|
|
@@ -108,7 +108,7 @@
|
|
|
update_time = #{updateTime},
|
|
|
</if>
|
|
|
<if test="workerId !=null and workerId !=''">
|
|
|
- workerId = #{workerId}
|
|
|
+ worker_id = #{workerId},
|
|
|
</if>
|
|
|
<if test="isdel != null">
|
|
|
isdel = #{isdel},
|
|
@@ -146,18 +146,19 @@
|
|
|
|
|
|
<select id="getAllCanteen" resultType="com.example.nngkxxdp.entity.CanteenNeDO">
|
|
|
SELECT canteen_name,
|
|
|
- id,
|
|
|
- supply_time_id,
|
|
|
- founder,
|
|
|
- principal,
|
|
|
- complaint_phone,
|
|
|
- takeout_phone,
|
|
|
- canteen_photo_path,
|
|
|
- workerId
|
|
|
- FROM s_canteen
|
|
|
- WHERE isdel = 0
|
|
|
+ sc.id,
|
|
|
+ sc.supply_time_id,
|
|
|
+ sc.founder,
|
|
|
+ sc.principal,
|
|
|
+ sc.complaint_phone,
|
|
|
+ sc.takeout_phone,
|
|
|
+ sc.canteen_photo_path,
|
|
|
+ sc.worker_id
|
|
|
+ FROM s_canteen sc
|
|
|
+ left join s_worker sw on sc.worker_id = sw.id
|
|
|
+ WHERE sc.isdel = 0
|
|
|
<if test="userId != null and userId != ''">
|
|
|
- AND principal = #{userId}
|
|
|
+ AND sw.wx_user_id = #{userId}
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="getAllDeliciousByDishesId" resultType="java.util.Map">
|