diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index 2d4393148..43e2cb4c6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -71,8 +71,8 @@ public enum ShopSubStageStatusEnum { SHOP_SUB_STAGE_STATUS_112(ShopSubStageEnum.SHOP_STAGE_11, 1120, "已完成", Boolean.TRUE), //三方验收 (待预约去掉) - SHOP_SUB_STAGE_STATUS_121(ShopSubStageEnum.SHOP_STAGE_12, 1210, "待验收", Boolean.FALSE), - SHOP_SUB_STAGE_STATUS_122(ShopSubStageEnum.SHOP_STAGE_12, 1220, "验收中", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_121(ShopSubStageEnum.SHOP_STAGE_12, 1210, "待加盟商验收", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_122(ShopSubStageEnum.SHOP_STAGE_12, 1220, "待立规内勤验收", Boolean.FALSE), SHOP_SUB_STAGE_STATUS_123(ShopSubStageEnum.SHOP_STAGE_12, 1230, "已验收", Boolean.TRUE), //开业运营方案 diff --git a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml index 084d77448..438ad36d3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml @@ -27,6 +27,10 @@ + + + + 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 @@ -103,7 +108,19 @@ shop_doorway_photo =#{shopDoorwayPhoto}, - shop_interior_photo =#{shopInteriorPhoto} + shop_interior_photo =#{shopInteriorPhoto}, + + + satisfaction = #{satisfaction}, + + + is_network_cable = #{isNetworkCable}, + + + acceptance_attachment = #{acceptanceAttachment}, + + + back_kitchen_photo = #{backKitchenPhoto} where shop_id = #{shopId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index aa7e2fe99..b79075117 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -212,6 +212,7 @@ and xsi.shop_name Like concat("%",#{keyWord},"%") or xsi.store_num Like concat("%",#{keyWord},"%") + order by xsi.update_time desc