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

coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentDataDAO.java

@@ -68,4 +68,7 @@ public class AssessmentDataDAO {
         return assessmentDataMapper.selectByPrimaryKey(id);
     }
 
+    public List<AssessmentDataDO> selectListByShopId(Long shopId) {
+        return assessmentDataMapper.selectListByShopId(shopId);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentDataMapper.java

@@ -8,5 +8,7 @@ import tk.mybatis.mapper.common.Mapper;
 import java.util.List;
 
 public interface AssessmentDataMapper extends Mapper<AssessmentDataDO> {
-    Integer batchUpdate( List<AssessmentDataDO> AssessmentDataDOS);
+    Integer batchUpdate(List<AssessmentDataDO> AssessmentDataDOS);
+
+    List<AssessmentDataDO> selectListByShopId(@Param("shopId") Long shopId);
 }

coolstore-partner-dao/src/main/resources/mapper/AssessmentDataMapper.xml

@@ -41,4 +41,9 @@
     </foreach>
     )
   </update>
+  <select id="selectListByShopId" resultType="com.cool.store.entity.AssessmentDataDO">
+    select *
+    from xfsg_assessment_data
+    where shop_id = #{shopId}
+  </select>
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java

@@ -17,22 +17,19 @@ import javax.persistence.Id;
 @Data
 public class AssessmentDataDTO {
 
+
     @ApiModelProperty("模板id")
     private Long templateId;
-
-    private Long shopId;
     /**
      * 店铺是否合格
      */
     @ApiModelProperty("店铺是否合格，0合格1不合格")
     private Boolean qualified;
-
     /**
      * 原因
      */
     @ApiModelProperty("不合格原因")
     private String reason;
-
     /**
      * 评语
      */

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java

@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 public class ThreeAcceptanceDTO {
     @ApiModelProperty("验收签名 ")
-    private String AcceptanceSignatures;
+    private String acceptanceSignatures;
     @ApiModelProperty("验收评语")
-    private String Comments;
+    private String comments;
     @ApiModelProperty("0通过，1不通过")
-    private Integer ResultType;
+    private Integer resultType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java

@@ -22,6 +22,4 @@ public class ThreeAcceptanceRequest {
     private ThreeAcceptanceDTO operationsAcceptance;
     @ApiModelProperty("加盟商验收")
     private ThreeAcceptanceDTO partnerAcceptance;
-    @ApiModelProperty("检查项")
-    private List<AssessmentDataDO> assessmentDataDOS;
 }

coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentDataService.java

@@ -15,4 +15,6 @@ public interface AssessmentDataService {
     Boolean batchInsert(List<AssessmentDataDO> assessmentDataDOS);
 
     Integer batchUpdate(List<AssessmentDataDO> assessmentDataDOS);
+
+
 }

coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java

@@ -3,6 +3,7 @@ package com.cool.store.service;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.dto.decoration.DecorationModelDTO;
+import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
 import com.cool.store.request.LinePaySubmitRequest;
 import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
@@ -88,7 +89,30 @@ public interface DecorationService {
      * @description:提交三方验收检查项
      */
     Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request);
-    Boolean submitAcceptance(ThreeAcceptanceRequest request,PartnerUserInfoVO minUser, LoginUserInfo pcUser );
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/6
+     * @description:查看三方验收检查项
+     */
+    ThreeAcceptanceCheckRequest getThreeChecks(Long shopId);
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/6
+     * @description:mini提交三方验收检签字
+     */
+    Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request);
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/6
+     * @description:pc提交三方验收检签字
+     */
+    Boolean pcSubmitAcceptanceSign(ThreeAcceptanceRequest request);
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/6
+     * @description:查看三方验收签字
+     */
+    List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId);
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java

@@ -58,7 +58,7 @@ public class DecorationServiceImpl implements DecorationService {
 
     private static final Logger log = LoggerFactory.getLogger(DecorationServiceImpl.class);
     @Resource
-    private ShopAuditInfoDAO shopAuditInfoDAO;
+    private AssessmentDataDAO assessmentDataDAO;
     @Resource
     private SysRoleService sysRoleService;
     @Resource
@@ -412,9 +412,11 @@ public class DecorationServiceImpl implements DecorationService {
     public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) {
         log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request));
         List<AssessmentDataDO> assessmentDataDOS = new ArrayList<>();
-        BeanUtil.copyProperties(request.getAssessmentDataDTOS(),assessmentDataDOS);
+        for (AssessmentDataDTO assessmentDataDTO : request.getAssessmentDataDTOS()) {
-        for(AssessmentDataDO assessmentDataDO : assessmentDataDOS){
+            AssessmentDataDO assessmentDataDO = new AssessmentDataDO();
+            BeanUtil.copyProperties(assessmentDataDTO, assessmentDataDO);
             assessmentDataDO.setShopId(request.getShopId());
+            assessmentDataDOS.add(assessmentDataDO);
         }
         Boolean assessment = assessmentDataService.batchInsert(assessmentDataDOS);
         if (assessment == Boolean.FALSE) {
@@ -424,6 +426,53 @@ public class DecorationServiceImpl implements DecorationService {
         return assessment;
     }
 
+    @Override
+    public ThreeAcceptanceCheckRequest getThreeChecks(Long shopId) {
+        List<AssessmentDataDO> assessmentDataDOS = assessmentDataDAO.selectListByShopId(shopId);
+        List<AssessmentDataDTO> assessmentDataDTOS = new ArrayList<>();
+        for (AssessmentDataDO assessmentDataDO : assessmentDataDOS) {
+            AssessmentDataDTO assessmentDataDTO = new AssessmentDataDTO();
+            BeanUtil.copyProperties(assessmentDataDO, assessmentDataDTO);
+            assessmentDataDTOS.add(assessmentDataDTO);
+        }
+        ThreeAcceptanceCheckRequest threeAcceptanceCheckRequest = new ThreeAcceptanceCheckRequest();
+        threeAcceptanceCheckRequest.setShopId(shopId);
+        threeAcceptanceCheckRequest.setAssessmentDataDTOS(assessmentDataDTOS);
+        return threeAcceptanceCheckRequest;
+    }
+
+    @Override
+    public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
+        try {
+            //工程部验收签名
+            JSONObject engineering = new JSONObject();
+            engineering.put("pic", request.getEngineeringAcceptance().getAcceptanceSignatures());
+            engineering.put("acceptanceTime", new Date());
+            engineering.put("result", request.getEngineeringAcceptance().getResultType());
+            engineering.put("remark", request.getEngineeringAcceptance().getComments());
+            engineering.put("status", 1);
+            //加盟商
+            JSONObject partner = new JSONObject();
+            partner.put("pic", request.getPartnerAcceptance().getAcceptanceSignatures());
+            partner.put("acceptanceTime", new Date());
+            partner.put("result", request.getPartnerAcceptance().getResultType());
+            partner.put("remark", request.getPartnerAcceptance().getComments());
+            partner.put("status", 1);
+            AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
+            acceptanceInfoDO.setShopId(request.getShopId());
+            acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString());
+            acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString());
+            acceptanceInfoDO.setUpdateTime(new Date());
+            acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
+            //更新阶段状态验收中
+            shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122);
+            return Boolean.TRUE;
+        } catch (Exception e) {
+            log.error("mini提交三方验收失败");
+            throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE);
+        }
+    }
+
     @Override
     public PageInfo<fitmentCheckVO> getFitmentAcceptanceList(Integer subStageStatus, LoginUserInfo user, Integer pageNum, Integer pageSize) {
         List<String> authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId());
@@ -532,51 +581,14 @@ public class DecorationServiceImpl implements DecorationService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean submitAcceptance(ThreeAcceptanceRequest request, PartnerUserInfoVO minUser, LoginUserInfo pcUser) {
+    public Boolean pcSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
         log.info("submitAcceptance, request:{} ", JSONObject.toJSONString(request));
-        if (Objects.nonNull(minUser)) {
+        //营运部验收签名
-            try {
+        try {
-                //插入检查项
+            AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(request.getShopId());
-                for (AssessmentDataDO assessmentDataDO : request.getAssessmentDataDOS()) {
+            if (StringUtils.isNotEmpty(acceptanceInfoDO1.getEngineeringAcceptanceSignatures())
-                    //TODO 考核人是谁？
+                    && StringUtils.isNotEmpty(acceptanceInfoDO1.getPartnerAcceptanceSignatures())
-                    assessmentDataDO.setAssessmentUserId(minUser.getPartnerId());
+                    && Objects.nonNull(request.getOperationsAcceptance())) {
-                }
-                Boolean assessment = assessmentDataService.batchInsert(request.getAssessmentDataDOS());
-                if (assessment == Boolean.FALSE) {
-                    log.error("三方验收插入检查项失败");
-                    throw new ServiceException(ErrorCodeEnum.CHECK_ITEM);
-                }
-                //工程部验收签名
-                JSONObject engineering = new JSONObject();
-                engineering.put("pic", request.getEngineeringAcceptance().getAcceptanceSignatures());
-                engineering.put("acceptanceTime", new Date());
-                engineering.put("result", request.getEngineeringAcceptance().getResultType());
-                engineering.put("remark", request.getEngineeringAcceptance().getComments());
-                engineering.put("status", 1);
-                //加盟商
-                JSONObject partner = new JSONObject();
-                partner.put("pic", request.getPartnerAcceptance().getAcceptanceSignatures());
-                partner.put("acceptanceTime", new Date());
-                partner.put("result", request.getPartnerAcceptance().getResultType());
-                partner.put("remark", request.getPartnerAcceptance().getComments());
-                partner.put("status", 1);
-                AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO();
-                acceptanceInfoDO.setShopId(request.getShopId());
-                acceptanceInfoDO.setPartnerAcceptanceSignatures(partner.toString());
-                acceptanceInfoDO.setEngineeringAcceptanceSignatures(engineering.toString());
-                acceptanceInfoDO.setUpdateTime(new Date());
-                acceptanceInfoDAO.updateAcceptanceInfo(acceptanceInfoDO);
-                //更新阶段状态验收中
-                shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_122);
-                return Boolean.TRUE;
-            } catch (Exception e) {
-                log.error("mini提交三方验收失败");
-                throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE);
-            }
-        } else {
-            //营运部验收签名
-            try {
-                AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(request.getShopId());
                 JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO1.getEngineeringAcceptanceSignatures());
                 JSONObject partner = JSONObject.parseObject(acceptanceInfoDO1.getPartnerAcceptanceSignatures());
                 JSONObject operations = new JSONObject();
@@ -594,19 +606,54 @@ public class DecorationServiceImpl implements DecorationService {
                         && AuditResultTypeEnum.PASS.getCode() == partner.getInteger("result")
                         && AuditResultTypeEnum.PASS.getCode() == engineering.getInteger("result")) {
                     //更新阶段状态验收完毕
-                    shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123,null);
+                    shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123, null);
                     preparationService.whetherToOpenForAcceptance(request.getShopId());
                 } else {
                     //未通过至为带预约
                     shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120, null);
                 }
-            } catch (Exception e) {
-                log.error("PC提交三方验收失败");
-                throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE);
             }
-
+            return Boolean.TRUE;
+        } catch (Exception e) {
+            log.error("PC提交三方验收失败");
+            throw new ServiceException(ErrorCodeEnum.THREE_ACCEPTANCE);
         }
-        return Boolean.FALSE;
+
+    }
+
+    @Override
+    public List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId) {
+        List<ThreeAcceptanceDTO> threeAcceptanceDTOS = new ArrayList<>();
+
+        AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
+        //工程部
+        if (StringUtils.isNotEmpty(acceptanceInfoDO.getEngineeringAcceptanceSignatures())) {
+            JSONObject engineering = JSONObject.parseObject(acceptanceInfoDO.getEngineeringAcceptanceSignatures());
+            ThreeAcceptanceDTO engineeringDTO = new ThreeAcceptanceDTO();
+            engineeringDTO.setAcceptanceSignatures(engineering.getString("pic"));
+            engineeringDTO.setComments(engineering.getString("remark"));
+            engineeringDTO.setResultType(engineering.getInteger("result"));
+            threeAcceptanceDTOS.add(CommonConstants.ZERO, engineeringDTO);
+        }
+        //营运部
+        if (StringUtils.isNotEmpty(acceptanceInfoDO.getOperationsAcceptanceSignatures())) {
+            JSONObject operations = JSONObject.parseObject(acceptanceInfoDO.getOperationsAcceptanceSignatures());
+            ThreeAcceptanceDTO operationsDTO = new ThreeAcceptanceDTO();
+            operationsDTO.setAcceptanceSignatures(operations.getString("pic"));
+            operationsDTO.setComments(operations.getString("remark"));
+            operationsDTO.setResultType(operations.getInteger("result"));
+            threeAcceptanceDTOS.add(CommonConstants.ONE, operationsDTO);
+        }
+        //加盟商
+        if (StringUtils.isNotEmpty(acceptanceInfoDO.getPartnerAcceptanceSignatures())) {
+            JSONObject partner = JSONObject.parseObject(acceptanceInfoDO.getPartnerAcceptanceSignatures());
+            ThreeAcceptanceDTO partnerDTO = new ThreeAcceptanceDTO();
+            partnerDTO.setAcceptanceSignatures(partner.getString("pic"));
+            partnerDTO.setComments(partner.getString("remark"));
+            partnerDTO.setResultType(partner.getInteger("result"));
+            threeAcceptanceDTOS.add(CommonConstants.TWO, partnerDTO);
+        }
+        return threeAcceptanceDTOS;
     }
 
     @Override

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

@@ -82,6 +82,6 @@ public class PCDecorationController {
     @ApiOperation("提交三方验收")
     @PostMapping("/submitThreeAcceptance")
     public ResponseResult<Boolean> submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){
-        return ResponseResult.success(decorationService.submitAcceptance(request,null, CurrentUserHolder.getUser()));
+        return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
     }
 }

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

@@ -76,7 +76,7 @@ public class MiniDecorationController {
         PartnerUserInfoVO user = PartnerUserHolder.getUser();
         return ResponseResult.success(decorationService.getDecorationModel(shopId,user));
     }
-    @ApiOperation("获取三方验收检查项")
+    @ApiOperation("获取三方验收模板检查项")
     @GetMapping("/getChecks")
     public ResponseResult<List<AssessmentTemplateVO>> getChecks(@RequestParam Integer type){
        return ResponseResult.success(assessmentTemplateService.listByType(type));
@@ -86,11 +86,16 @@ public class MiniDecorationController {
     public ResponseResult<Boolean> submitThreeChecks(@RequestBody ThreeAcceptanceCheckRequest request){
         return ResponseResult.success(decorationService.submitThreeCheck(request));
     }
-    @ApiOperation("提交三方验收")
+    @ApiOperation("获取三方验收检查项")
-    @PostMapping("/submitThreeAcceptance")
+    @GetMapping("/getAcceptanceChecks")
+    public ResponseResult<ThreeAcceptanceCheckRequest> getAcceptanceChecks(@RequestParam Long shopId){
+        return ResponseResult.success(decorationService.getThreeChecks(shopId));
+    }
+    @ApiOperation("提交三方验收签字")
+    @PostMapping("/submitThreeAcceptanceSign")
     public ResponseResult<Boolean> submitThreeAcceptance(@RequestBody ThreeAcceptanceRequest request){
-        PartnerUserInfoVO user = PartnerUserHolder.getUser();
+
-        return ResponseResult.success(decorationService.submitAcceptance(request,user,null));
+        return ResponseResult.success(decorationService.miniSubmitAcceptanceSign(request));
     }
     @ApiOperation("查看三方验收")
     @GetMapping("/getThreeAcceptance")