suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250701_decoration' into 'master'

Browse Source 
Cc 20250701 decoration

See merge request hangzhou/java/custom_zxjp!126
This commit is contained in:
苏竹红
2025-07-07 09:42:48 +00:00
parent 497feb114d df9651b2e9
commit 6e92279ecc
10 changed files with 153 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml
View File

@@ -27,6 +27,10 @@
<result column="shop_location_screenshots" jdbcType="VARCHAR" property="shopLocationScreenshots"/>
<result column="shop_doorway_photo" jdbcType="VARCHAR" property="shopDoorwayPhoto"/>
<result column="shop_interior_photo" jdbcType="VARCHAR" property="shopInteriorPhoto"/>
<result column="satisfaction" jdbcType="INTEGER" property="satisfaction"/>
<result column="acceptance_attachment" jdbcType="VARCHAR" property="acceptanceAttachment"/>
<result column="is_network_cable" jdbcType="BIT" property="isNetworkCable"/>
<result column="back_kitchen_photo" jdbcType="VARCHAR" property="backKitchenPhoto"/>
</resultMap>
<sql id="baseColumn">
id
@@ -34,7 +38,8 @@
decoration_planned_start_time,construction_completion_time,engineering_acceptance_signatures,
operations_acceptance_signatures,partner_acceptance_signatures,
create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user,plan_exit_time,
ks_account,verification_mobile,shop_location_screenshots,shop_doorway_photo,shop_interior_photo
ks_account,verification_mobile,shop_location_screenshots,shop_doorway_photo,shop_interior_photo,
satisfaction,acceptance_attachment,is_network_cable,back_kitchen_photo
</sql>
<insert id="initAcceptanceInfo">
<foreach collection="list" index="index" item="item" separator=";">
@@ -103,7 +108,19 @@
shop_doorway_photo =#{shopDoorwayPhoto},
</if>
<if test="shopInteriorPhoto !=null">
shop_interior_photo =#{shopInteriorPhoto}
shop_interior_photo =#{shopInteriorPhoto},
</if>
<if test="satisfaction !=null">
satisfaction = #{satisfaction},
</if>
<if test="isNetworkCable !=null">
is_network_cable = #{isNetworkCable},
</if>
<if test="acceptanceAttachment!=null and acceptanceAttachment!= ''">
acceptance_attachment = #{acceptanceAttachment},
</if>
<if test="backKitchenPhoto !=null and backKitchenPhoto!=''">
back_kitchen_photo = #{backKitchenPhoto}
</if>
</set>
where shop_id = #{shopId}

1
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -212,6 +212,7 @@
<if test="keyWord != null and keyWord != '' ">
and xsi.shop_name Like concat("%",#{keyWord},"%") or xsi.store_num Like concat("%",#{keyWord},"%")
</if>
order by xsi.update_time desc
</select>
<select id="platformBuildList" resultType="com.cool.store.response.PlatformBuildListResponse">
select