diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 050cad791..a118170ed 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -360,8 +360,8 @@ public class ShopStageInfoDAO { } public List getOperationsConsultantStageInfo(List shopIds, Integer shopSubStage, - List shopSubStageStatusList, - String investmentUserId, DeskRequest deskRequest) { + List shopSubStageStatusList, + String investmentUserId, DeskRequest deskRequest) { return shopStageInfoMapper.getOperationsConsultantStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, deskRequest); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 93e61b417..63e5bf60c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -52,15 +52,15 @@ public interface ShopStageInfoMapper extends Mapper { Integer getCompletionCount(@Param("shopId") Long shopId); - /** - * 跟新店铺阶段信息 - * @param shopId - * @param shopSubStage - * @param shopSubStageStatus - * @param isTerminated - * @param remark - * @return - */ + /** + * 跟新店铺阶段信息 + * @param shopId + * @param shopSubStage + * @param shopSubStageStatus + * @param isTerminated + * @param remark + * @return + */ Integer updateShopStageInfo(@Param("shopId") Long shopId, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, @Param("isTerminated")boolean isTerminated, @Param("remark") String remark); @@ -88,7 +88,7 @@ public interface ShopStageInfoMapper extends Mapper { * @return */ Integer updateShopStageAndAuditInfo(@Param("shopId") Long shopId, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, - @Param("isTerminated")boolean isTerminated, @Param("remark") String remark, @Param("auditId")Long auditId); + @Param("isTerminated")boolean isTerminated, @Param("remark") String remark, @Param("auditId")Long auditId); /** * 获取子阶段信息 @@ -167,10 +167,10 @@ public interface ShopStageInfoMapper extends Mapper { * @return */ List getOperationsConsultantStageInfo(@Param("shopIds") List shopIds, - @Param("shopSubStage") Integer shopSubStage, - @Param("shopSubStageStatusList") List shopSubStageStatusList, - @Param("operationsConsultant") String operationsConsultant, - @Param("request") DeskRequest deskRequest); + @Param("shopSubStage") Integer shopSubStage, + @Param("shopSubStageStatusList") List shopSubStageStatusList, + @Param("operationsConsultant") String operationsConsultant, + @Param("request") DeskRequest deskRequest); @@ -206,9 +206,9 @@ public interface ShopStageInfoMapper extends Mapper { List getShopSubStages(@Param("shopIds") List shopIds); Integer dataUpdateStatus(@Param("list") List list, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, - @Param("isTerminated")boolean isTerminated, @Param("remark") String remark); - - Integer dataUpdateAcceptanceStatus(@Param("list") List list, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, @Param("isTerminated")boolean isTerminated, @Param("remark") String remark); + Integer dataUpdateAcceptanceStatus(@Param("list") List list, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus, + @Param("isTerminated")boolean isTerminated, @Param("remark") String remark); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index cf1efb325..4c7c5e01c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -63,31 +63,31 @@ update - xfsg_shop_stage_info + xfsg_shop_stage_info set - shop_sub_stage_status = #{shopSubStageStatus}, - is_terminated = #{isTerminated}, - remark = #{remark}, - actual_complete_time = if(is_terminated, now(), null) + shop_sub_stage_status = #{shopSubStageStatus}, + is_terminated = #{isTerminated}, + remark = #{remark}, + actual_complete_time = if(is_terminated, now(), null) where - shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} + shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} @@ -116,28 +116,28 @@ update - xfsg_shop_stage_info + xfsg_shop_stage_info set - shop_sub_stage_status = #{shopSubStageStatus}, - is_terminated = #{isTerminated}, - remark = #{remark}, - actual_complete_time = if(is_terminated, now(), null), - audit_id = #{auditId} + shop_sub_stage_status = #{shopSubStageStatus}, + is_terminated = #{isTerminated}, + remark = #{remark}, + actual_complete_time = if(is_terminated, now(), null), + audit_id = #{auditId} where - shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} + shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} update - xfsg_shop_stage_info + xfsg_shop_stage_info set - shop_sub_stage_status = -100, - is_terminated = 0, - remark = '未开始', - actual_complete_time = null, - audit_id = null + shop_sub_stage_status = -100, + is_terminated = 0, + remark = '未开始', + actual_complete_time = null, + audit_id = null where - shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} + shop_id = #{shopId} and shop_sub_stage = #{shopSubStage} update xfsg_shop_stage_info @@ -244,9 +244,9 @@ inner join xfsg_line_info b on a.line_id = b.id left join xfsg_shop_info c on a.shop_id = c.id where c.deleted=0 - and a.shop_sub_stage = #{shopSubStage} - and a.deleted = 0 - and b.deleted = 0 + and a.shop_sub_stage = #{shopSubStage} + and a.deleted = 0 + and b.deleted = 0 and a.shop_sub_stage_status in @@ -307,12 +307,12 @@ @@ -320,7 +320,7 @@ select * from xfsg_shop_stage_info a - left join xfsg_shop_info si on a.shop_id = si.id + left join xfsg_shop_info si on a.shop_id = si.id left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id @@ -334,9 +334,9 @@ and a.shop_sub_stage = #{shopSubStage} - - and (si.hqt_shop_id is null or si.hqt_shop_id = '') - + + and (si.hqt_shop_id is null or si.hqt_shop_id = '') + and a.shop_sub_stage_status in @@ -510,7 +510,7 @@