This commit is contained in:
bianyadong
2024-04-25 19:10:36 +08:00
parent 425474d5c5
commit 9825dbc1bd
3 changed files with 98 additions and 7 deletions

View File

@@ -49,23 +49,23 @@
LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id
LEFT JOIN xfsg_line_info l ON l.id = s.line_id LEFT JOIN xfsg_line_info l ON l.id = s.line_id
<where> <where>
<if test="openAcceptance.shopName != null and openAcceptance.shopName != ''"> <if test="openAcceptance.storeName != null and openAcceptance.storeName != ''">
s.shop_name LIKE CONCAT('%',#{shopName},'%') s.shop_name LIKE CONCAT('%',#{openAcceptance.storeName},'%')
</if> </if>
<if test="openAcceptance.supervisorUserId != null and openAcceptance.supervisorUserId != ''"> <if test="openAcceptance.supervisorUserId != null and openAcceptance.supervisorUserId != ''">
s.supervisor_user_id = #{supervisorUserId} s.supervisor_user_id = #{openAcceptance.supervisorUserId}
</if> </if>
<if test="openAcceptance.investmentManager != null and openAcceptance.investmentManager != ''"> <if test="openAcceptance.investmentManager != null and openAcceptance.investmentManager != ''">
l.investment_manager =#{investmentManager} l.investment_manager =#{openAcceptance.investmentManager}
</if> </if>
<if test="openAcceptance.acceptanceStatus != null"> <if test="openAcceptance.acceptanceStatus != null">
o.acceptance_status = #{acceptanceStatus} o.acceptance_status = #{openAcceptance.acceptanceStatus}
</if> </if>
<if test="openAcceptance.planOpenTimeBegin != null"> <if test="openAcceptance.planOpenTimeBegin != null">
AND o.plan_open_time &gt;= #{planOpenTimeBegin} AND o.plan_open_time &gt;= #{openAcceptance.planOpenTimeBegin}
</if> </if>
<if test="openAcceptance.planOpenTimeEnd != null"> <if test="openAcceptance.planOpenTimeEnd != null">
AND o.plan_open_time &lt;= #{planOpenTimeEnd} AND o.plan_open_time &lt;= #{openAcceptance.planOpenTimeEnd}
</if> </if>
</where> </where>
</select> </select>

View File

@@ -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<List<NewStoreOpeningVO>> storeTodoList(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(newStoreOpeningService.storeTodoList(shopId));
}
}

View File

@@ -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<PageInfo<OpenAcceptanceInfoListVO>> openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) {
return ResponseResult.success(openAcceptanceInfoService.openAcceptanceList(openAcceptanceRequest));
}
@GetMapping(path = "/acceptanceStageList")
@ApiOperation("开业验收阶段结果列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "shopId", value = "店铺id", required = true)
})
public ResponseResult<ShopAcceptanceVO> acceptanceStageList(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(openAcceptanceInfoService.acceptanceStageList(shopId));
}
}