suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 装修测量阶段+设计阶段流程优化

Browse Source
This commit is contained in:
ryan.xu
2025-04-24 09:36:12 +08:00
parent c75523cd80
commit 3edcd3b4a2
31 changed files with 1039 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
View File

@@ -205,5 +205,11 @@ public class DeskController {
return ResponseResult.success(deskService.buildInformationPendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-测量阶段")
@GetMapping("/measurePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> measurePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.measurePendingList(pageNumber,pageSize,userInfo));
}
}

109
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
View File

@@ -2,21 +2,17 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.request.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.DecorationMeasureService;
import com.cool.store.service.DecorationService;
import com.cool.store.service.PreparationService;
import com.cool.store.service.SeeAcceptanceService;
import com.cool.store.vo.ConstructionDataVO;
import com.cool.store.vo.DecorationDesignVO;
import com.cool.store.vo.*;
import com.cool.store.vo.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO;
import com.cool.store.vo.fitmentCheckVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -44,116 +40,157 @@ public class PCDecorationController {
private PreparationService preparationService;
@Resource
private SeeAcceptanceService seeAcceptanceService;
@Resource
private DecorationMeasureService decorationMeasureService;
@ApiOperation("获取新店装修flush")
@GetMapping("/flush")
public ResponseResult<Boolean> getFitmentSub(@RequestParam Long shopId) {
return ResponseResult.success(preparationService.decorationFlush(shopId));
}
@ApiOperation("获取设计子阶段信息")
@GetMapping("/designSub")
public ResponseResult<DesignInfoVo> getDesignSub(@RequestParam Long shopId){
return ResponseResult.success( decorationService.DesignInfo(shopId)) ;
public ResponseResult<DesignInfoVo> getDesignSub(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.DesignInfo(shopId));
}
@ApiOperation("获取施工子阶段信息")
@GetMapping("/getConstructionSub")
public ResponseResult<List<ConstructionScheduleDTO>> getConstructionSub(@RequestParam Long shopId){
return ResponseResult.success(decorationService.getConstruction(shopId)) ;
public ResponseResult<List<ConstructionScheduleDTO>> getConstructionSub(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getConstruction(shopId));
}
@ApiOperation("获取装修款信息")
@GetMapping("/getDecorationModelInfo")
public ResponseResult<LinePayVO> getDecorationModelInfo(@RequestParam Long shopId){
return ResponseResult.success(decorationService.getDecorationModel(shopId,null));
public ResponseResult<LinePayVO> getDecorationModelInfo(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getDecorationModel(shopId, null));
}
@ApiOperation("获取验收列表：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过")
@PostMapping("/getAcceptanceList")
public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestBody AcceptanceListRequest request){
public ResponseResult<PageInfo<fitmentCheckVO>> getAcceptanceList(@RequestBody AcceptanceListRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user));
return ResponseResult.success(decorationService.getFitmentAcceptanceList(request, user));
}
@ApiOperation("获取三方验收列表详情")
@GetMapping("/getAcceptanceDetail")
public ResponseResult<fitmentCheckVO> getAcceptanceDetail(@RequestParam("shopId") Long shopId){
public ResponseResult<fitmentCheckVO> getAcceptanceDetail(@RequestParam("shopId") Long shopId) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.getAcceptanceDetail(shopId,user));
return ResponseResult.success(decorationService.getAcceptanceDetail(shopId, user));
}
@ApiOperation("预约三方验收")
@PostMapping("/bookingAcceptance")
public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){
public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.bookingAcceptance(response,user));
return ResponseResult.success(decorationService.bookingAcceptance(response, user));
}
@ApiOperation("获取三方验收检查项")
@GetMapping("/getAcceptanceChecks")
public ResponseResult<ThreeAcceptanceCheckRequest> getAcceptanceChecks(@RequestParam Long shopId){
public ResponseResult<ThreeAcceptanceCheckRequest> getAcceptanceChecks(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getThreeChecks(shopId));
}
@ApiOperation("提交三方验收签字")
@PostMapping("/submitThreeAcceptanceSign")
public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request){
public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request) {
return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
}
@ApiOperation("查看三方验收签字")
@GetMapping("/getThreeSign")
public ResponseResult<ThreeSignResponse> getThreeAcceptance(@RequestParam Long shopId){
public ResponseResult<ThreeSignResponse> getThreeAcceptance(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getThreeAcceptanceSign(shopId));
}
@ApiOperation("获取视觉验收撤场数据")
@GetMapping("/getSeeAcceptanceWithdrawal")
public ResponseResult<ConstructionScheduleDTO> getSeeAcceptanceWithdrawal(@RequestParam Long shopId){
public ResponseResult<ConstructionScheduleDTO> getSeeAcceptanceWithdrawal(@RequestParam Long shopId) {
return ResponseResult.success(seeAcceptanceService.getWithdrawal(shopId));
}
@ApiOperation("视觉验收列表")
@PostMapping("/getSeeAcceptanceList")
public ResponseResult< PageInfo<fitmentCheckVO>> getSeeAcceptanceList(@RequestBody AcceptanceListRequest request){
public ResponseResult<PageInfo<fitmentCheckVO>> getSeeAcceptanceList(@RequestBody AcceptanceListRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(seeAcceptanceService.getAcceptanceList(request,user));
return ResponseResult.success(seeAcceptanceService.getAcceptanceList(request, user));
}
@ApiOperation("获取撤场数据")
@GetMapping("/getWithdrawal")
public ResponseResult<ConstructionScheduleDTO> getWithdrawal(@RequestParam Long shopId){
public ResponseResult<ConstructionScheduleDTO> getWithdrawal(@RequestParam Long shopId) {
return ResponseResult.success(seeAcceptanceService.getWithdrawal(shopId));
}
@ApiOperation("获取视觉验收审核数据")
@GetMapping("/getSeeAuditInfo")
public ResponseResult< List<ShopAuditInfoDO> > getAuditInfo(@RequestParam Long shopId){
public ResponseResult<List<ShopAuditInfoDO>> getAuditInfo(@RequestParam Long shopId) {
return ResponseResult.success(seeAcceptanceService.getAuditInfo(shopId));
}
@ApiOperation("验收视觉验收")
@PostMapping("/auditSee")
public ResponseResult<Boolean> auditSee(@RequestBody SeeAcceptanceRequest request){
public ResponseResult<Boolean> auditSee(@RequestBody SeeAcceptanceRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(seeAcceptanceService.auditSeeAcceptance(request,user));
return ResponseResult.success(seeAcceptanceService.auditSeeAcceptance(request, user));
}
@ApiOperation("提交设计方案")
@PostMapping("/submitDecorationDesign")
public ResponseResult<Boolean> submitDecorationDesign(@RequestBody DecorationDesignRequest request){
return ResponseResult.success(decorationService.submitDecorationDesign(request,CurrentUserHolder.getUser()));
public ResponseResult<Boolean> submitDecorationDesign(@RequestBody DecorationDesignRequest request) {
return ResponseResult.success(decorationService.submitDecorationDesign(request, CurrentUserHolder.getUser()));
}
@ApiOperation("查询设计方案")
@GetMapping("/getDecorationDesign")
public ResponseResult<DecorationDesignVO> getDecorationDesign(@RequestParam Long shopId){
public ResponseResult<DecorationDesignVO> getDecorationDesign(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getDecorationDesign(shopId));
}
@ApiOperation("提交施工方案")
@PostMapping("/submitConstructionData")
public ResponseResult<Boolean> submitConstructionData(@RequestBody ConstructionRequest request){
return ResponseResult.success(decorationService.submitConstructionData(request,CurrentUserHolder.getUser()));
public ResponseResult<Boolean> submitConstructionData(@RequestBody ConstructionRequest request) {
return ResponseResult.success(decorationService.submitConstructionData(request, CurrentUserHolder.getUser()));
}
@ApiOperation("查询施工方案")
@GetMapping("/getConstructionData")
public ResponseResult<ConstructionDataVO> getConstructionData(@RequestParam Long shopId){
public ResponseResult<ConstructionDataVO> getConstructionData(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getConstructionData(shopId));
}
@ApiOperation("装修阶段完成")
@PostMapping("/confirmComplete")
public ResponseResult<Boolean> confirmComplete(@RequestBody DecorationDesignRequest request){
return ResponseResult.success(decorationService.confirmComplete(request.getShopId(),CurrentUserHolder.getUser()));
public ResponseResult<Boolean> confirmComplete(@RequestBody DecorationDesignRequest request) {
return ResponseResult.success(decorationService.confirmComplete(request.getShopId(), CurrentUserHolder.getUser()));
}
@ApiOperation("查询测量方案")
@GetMapping("/getDecorationMeasure/{shopId}")
public ResponseResult<DecorationMeasureVO> getDecorationMeasure(@PathVariable Long shopId) {
return ResponseResult.success(decorationMeasureService.getDecorationMeasureByShopId(shopId));
}
@ApiOperation("保存测量方案")
@PostMapping("/saveDecorationMeasure")
public ResponseResult<Boolean> saveDecorationMeasure(@Validated @RequestBody DecorationMeasureRequest request) {
return ResponseResult.success(decorationMeasureService.saveDecorationMeasure(request));
}
@ApiOperation("提交测量方案")
@PostMapping("/submitDecorationMeasure")
public ResponseResult<Boolean> submitDecorationMeasure(@Validated @RequestBody DecorationMeasureRequest request) {
return ResponseResult.success(decorationMeasureService.submitDecorationMeasure(request));
}
@ApiOperation("保存设计方案")
@PostMapping("/saveDecorationDesign")
public ResponseResult<Boolean> saveDecorationDesign(@Validated @RequestBody DecorationDesignRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.saveDecorationDesign(request, user));
}
}

12
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.controller.webb;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.request.SysRoleRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.SysRoleService;
import com.cool.store.service.UserAuthMappingService;
@@ -9,10 +10,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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 org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Arrays;
@@ -47,4 +45,10 @@ public class SysRoleController {
UserRoleEnum userRoleEnum = UserRoleEnum.getByDesc(roleName);
return ResponseResult.success(userAuthMappingService.getUserByRoleEnumAndRegionId(userRoleEnum, regionId));
}
@PostMapping(path = "/findUserListByRole")
@ApiOperation("根据角色获取用户")
public ResponseResult<List<EnterpriseUserDO>> findUserListByRole(@RequestBody SysRoleRequest request) {
return ResponseResult.success(userAuthMappingService.findUserListByRole(request));
}
}

9
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
View File

@@ -14,6 +14,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.AssessmentTemplateService;
import com.cool.store.service.DecorationMeasureService;
import com.cool.store.service.DecorationService;
import com.cool.store.service.SeeAcceptanceService;
import com.cool.store.vo.*;
@@ -45,6 +46,8 @@ public class MiniDecorationController {
private AssessmentTemplateService assessmentTemplateService;
@Resource
private SeeAcceptanceService seeAcceptanceService;
@Resource
private DecorationMeasureService decorationMeasureService;
@ApiOperation("获取设计阶段子阶段信息")
@GetMapping("/designSub")
public ResponseResult<DesignInfoVo> getDesign(@RequestParam Long shopId){
@@ -131,5 +134,9 @@ public class MiniDecorationController {
return ResponseResult.success(decorationService.confirmDesign(request,CurrentUserHolder.getUser()));
}
@ApiOperation("查询测量方案")
@GetMapping("/getDecorationMeasure")
public ResponseResult<DecorationMeasureVO> getDecorationMeasure(@RequestParam Long shopId){
return ResponseResult.success(decorationMeasureService.getDecorationMeasureByShopId(shopId));
}
}