diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml index bbb6175b0..d450a43a1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml @@ -49,23 +49,23 @@ LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id LEFT JOIN xfsg_line_info l ON l.id = s.line_id - - s.shop_name LIKE CONCAT('%',#{shopName},'%') + + s.shop_name LIKE CONCAT('%',#{openAcceptance.storeName},'%') - s.supervisor_user_id = #{supervisorUserId} + s.supervisor_user_id = #{openAcceptance.supervisorUserId} - l.investment_manager =#{investmentManager} + l.investment_manager =#{openAcceptance.investmentManager} - o.acceptance_status = #{acceptanceStatus} + o.acceptance_status = #{openAcceptance.acceptanceStatus} - AND o.plan_open_time >= #{planOpenTimeBegin} + AND o.plan_open_time >= #{openAcceptance.planOpenTimeBegin} - AND o.plan_open_time <= #{planOpenTimeEnd} + AND o.plan_open_time <= #{openAcceptance.planOpenTimeEnd} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java new file mode 100644 index 000000000..d51a4e7e8 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java @@ -0,0 +1,42 @@ +package com.cool.store.controller.webc; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.NewStoreOpeningService; +import com.cool.store.vo.NewStoreOpeningVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author byd + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/mini//newStoreOpening") +@Api(tags = "mini新店开业") +public class MiniNewStoreOpeningController { + + + @Resource + NewStoreOpeningService newStoreOpeningService; + + + @GetMapping(path = "/storeTodoList") + @ApiOperation("新店开业待办列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopId", value = "店铺id", required = true) + }) + public ResponseResult> storeTodoList(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(newStoreOpeningService.storeTodoList(shopId)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java new file mode 100644 index 000000000..8040e5175 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java @@ -0,0 +1,49 @@ +package com.cool.store.controller.webc; + +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OpenAcceptanceInfoService; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import com.cool.store.vo.ShopAcceptanceVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Author byd + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/mini/openAcceptanceInfo") +@Api(tags = "mini开业验收") +public class MiniOpenAcceptanceInfoController { + + @Resource + OpenAcceptanceInfoService openAcceptanceInfoService; + + @GetMapping(path = "/openAcceptanceList") + @ApiOperation("开业验收列表") + public ResponseResult> openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) { + return ResponseResult.success(openAcceptanceInfoService.openAcceptanceList(openAcceptanceRequest)); + } + + @GetMapping(path = "/acceptanceStageList") + @ApiOperation("开业验收阶段结果列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopId", value = "店铺id", required = true) + }) + public ResponseResult acceptanceStageList(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(openAcceptanceInfoService.acceptanceStageList(shopId)); + } + + +}