Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java

@@ -3,11 +3,11 @@ package com.cool.store.controller.webb;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.request.OpenAcceptanceRequest;
 import com.cool.store.request.ShopAcceptanceRequest;
+import com.cool.store.request.ShopStageAcceptanceRequest;
 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.cool.store.vo.ShopStageAcceptanceVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @Author byd
@@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController {
         return ResponseResult.success(Boolean.TRUE);
     }
 
+    @ApiOperation("开业验收-单项")
+    @PostMapping(path = "/acceptanceOne")
+    public ResponseResult<Boolean> acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
+        openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest);
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java

@@ -44,7 +44,7 @@ public class PCApplyLicenseController {
      * @param status 0通过 1不通过
      * @return
      */
-    @PostMapping(path = "/examine")
+    @GetMapping(path = "/examine")
     @ApiOperation("证照审批列表")
     public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
                                          @RequestParam("status") Integer status,

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

@@ -0,0 +1,33 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.CoolStoreStartFlowService;
+import com.cool.store.service.YlfService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/28/下午4:19
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/pc/decoration")
+@Api(tags = "PC装修阶段")
+@Slf4j
+public class PCDecorationController {
+    @Resource
+    private YlfService ylfService;
+    @GetMapping("/get")
+    private ResponseResult get(){
+        String shopCode = "31310383";
+        return new ResponseResult<>(200,ylfService.getProjectList(shopCode)) ;
+
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java

@@ -42,7 +42,7 @@ public class ApplyLicenseController {
      * @param status 0通过 1不通过
      * @return
      */
-    @PostMapping(path = "/examine")
+    @GetMapping(path = "/examine")
     @ApiOperation("证照审批列表")
     public ResponseResult licenseExamine(@RequestParam("id") Long shopId,
                                          @RequestParam("status") Integer status,

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniAssessmentTemplateController.java

@@ -0,0 +1,29 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.AssessmentTemplateService;
+import com.cool.store.vo.AssessmentTemplateVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2024/4/28 16:29
+ * @Version 1.0
+ */
+public class MiniAssessmentTemplateController {
+
+    @Resource
+    AssessmentTemplateService assessmentTemplateService;
+
+    @ApiOperation("检查项模板列表type 0 1 2 3")
+    @GetMapping("/listByType")
+    public ResponseResult<List<AssessmentTemplateVO>> intendPendingList(@RequestParam(value = "type",required = true)Integer type) {
+        return ResponseResult.success(assessmentTemplateService.listByType(type));
+    }
+
+}