From 3dd6e5b6cb2705330b60c747a860fdf37a7bbd8d Mon Sep 17 00:00:00 2001 From: bianyadong Date: Mon, 22 Apr 2024 19:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E4=B8=9A=E9=AA=8C=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/OpenAcceptanceInfoDAO.java | 27 ++++++++ .../mapper/OpenAcceptanceInfoMapper.java | 8 +++ .../mapper/OpenAcceptanceInfoMapper.xml | 43 +++++++++++++ .../store/entity/OpenAcceptanceInfoDO.java | 6 ++ .../store/request/OpenAcceptanceRequest.java | 36 +++++++++++ .../store/vo/OpenAcceptanceInfoListVO.java | 61 +++++++++++++++++++ .../service/OpenAcceptanceInfoService.java | 14 +++++ .../impl/OpenAcceptanceInfoServiceImpl.java | 30 +++++++++ .../webb/OpenAcceptanceInfoController.java | 35 +++++++++++ 9 files changed, 260 insertions(+) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/OpenAcceptanceInfoDAO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/OpenAcceptanceRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpenAcceptanceInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpenAcceptanceInfoDAO.java new file mode 100644 index 000000000..b3e432a6a --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OpenAcceptanceInfoDAO.java @@ -0,0 +1,27 @@ +package com.cool.store.dao; + +import com.cool.store.mapper.OpenAcceptanceInfoMapper; +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author byd + * @date 2024-04-22 14:48 + */ +@Repository +public class OpenAcceptanceInfoDAO { + @Resource + private OpenAcceptanceInfoMapper openAcceptanceInfoMapper; + + + public List openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest){ + return openAcceptanceInfoMapper.openAcceptanceList(openAcceptanceRequest); + } + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpenAcceptanceInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpenAcceptanceInfoMapper.java index da6b50814..3f7219256 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpenAcceptanceInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OpenAcceptanceInfoMapper.java @@ -1,7 +1,15 @@ package com.cool.store.mapper; import com.cool.store.entity.OpenAcceptanceInfoDO; +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface OpenAcceptanceInfoMapper extends Mapper { + + + List openAcceptanceList(@Param("openAcceptance") OpenAcceptanceRequest openAcceptanceRequest); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml index 0428b5649..50825af76 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpenAcceptanceInfoMapper.xml @@ -10,6 +10,7 @@ + @@ -26,4 +27,46 @@ + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/OpenAcceptanceInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/OpenAcceptanceInfoDO.java index 28a909e1d..7d8df5d92 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/OpenAcceptanceInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/OpenAcceptanceInfoDO.java @@ -27,6 +27,12 @@ public class OpenAcceptanceInfoDO { @Column(name = "acceptance_status") private Byte acceptanceStatus; + /** + * 验收人 + */ + @Column(name = "acceptance_user_id") + private String acceptanceUserId; + /** * 验收时间 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAcceptanceRequest.java new file mode 100644 index 000000000..bc1dcfa7b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAcceptanceRequest.java @@ -0,0 +1,36 @@ +package com.cool.store.request; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * @author byd + */ +@Data +@ApiModel +public class OpenAcceptanceRequest extends PageBasicInfo { + + @ApiModelProperty("门店名称") + private String storeName; + + @ApiModelProperty("区域") + private Long regionId; + + @ApiModelProperty("验收状态 0:未验收 1:已验收") + private Integer acceptanceStatus; + + @ApiModelProperty("计划开业时间-开始") + private Long planOpenTimeBegin; + + @ApiModelProperty("计划开业时间-结束") + private Long planOpenTimeEnd; + + @ApiModelProperty("招商经理") + private String investmentManager; + + @ApiModelProperty("督导") + private String supervisorUserId; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java new file mode 100644 index 000000000..832248d74 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java @@ -0,0 +1,61 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author byd + * @date 2024-04-22 17:34 + */ +@Data +public class OpenAcceptanceInfoListVO { + + @ApiModelProperty("开业验收id") + private Long openAcceptanceInfoId; + @ApiModelProperty("店铺id") + private Long shopId; + @ApiModelProperty("门店名称") + private String shopName; + @ApiModelProperty("门店代码") + private String shopCode; + @ApiModelProperty("开店负责人id") + private String shopManagerUserId; + @ApiModelProperty("开店负责人名称") + private String shopManagerUserName; + @ApiModelProperty("督导id") + private String supervisorUserId; + @ApiModelProperty("督导名称") + private String supervisorUserName; + @ApiModelProperty("加盟商姓名") + private String partnerName; + @ApiModelProperty("手机号码") + private String partnerMobile; + + @ApiModelProperty("战区Id") + private Long regionId; + + @ApiModelProperty("战区名称") + private String regionName; + + @ApiModelProperty("大区ID") + private Long largeRegionId; + + @ApiModelProperty("大区名称") + private Long largeRegionName; + @ApiModelProperty("计划开业时间") + private Date planOpenTime; + @ApiModelProperty("验收状态 0:未验收 1:已验收") + private String acceptanceStatus; + @ApiModelProperty("招商经理id") + private String investmentManager; + @ApiModelProperty("招商经理名称") + private String investmentManagerName; + @ApiModelProperty("验收时间") + private Date acceptanceTime; + @ApiModelProperty("验收人id") + private String acceptanceUserId; + @ApiModelProperty("验收人名称") + private String acceptanceUserName; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java new file mode 100644 index 000000000..5e2f50fde --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java @@ -0,0 +1,14 @@ +package com.cool.store.service; + +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import com.github.pagehelper.PageInfo; + +/** + * @author byd + * @date 2024-04-22 14:41 + */ +public interface OpenAcceptanceInfoService { + + PageInfo openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java new file mode 100644 index 000000000..7c0a65b5f --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java @@ -0,0 +1,30 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.OpenAcceptanceInfoDAO; +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.service.OpenAcceptanceInfoService; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author byd + * @date 2024-04-22 14:41 + */ +@Service +public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService { + + @Resource + private OpenAcceptanceInfoDAO openAcceptanceInfoDAO; + + @Override + public PageInfo openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) { + PageHelper.startPage(openAcceptanceRequest.getPageNum(), openAcceptanceRequest.getPageSize()); + List resultList = openAcceptanceInfoDAO.openAcceptanceList(openAcceptanceRequest); + return new PageInfo<>(resultList); + } +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java new file mode 100644 index 000000000..eea463889 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java @@ -0,0 +1,35 @@ +package com.cool.store.controller.webb; + +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.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +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.RestController; + +import javax.annotation.Resource; + +/** + * @Author byd + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("pc/openAcceptanceInfo") +@Api(tags = "PC开业验收") +public class OpenAcceptanceInfoController { + + @Resource + OpenAcceptanceInfoService openAcceptanceInfoService; + + @GetMapping(path = "/openAcceptanceList") + @ApiOperation("开业验收列表") + public ResponseResult> openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) { + return ResponseResult.success(openAcceptanceInfoService.openAcceptanceList(openAcceptanceRequest)); + } + +}