修改三方验收bug

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

@@ -2,6 +2,7 @@ package com.cool.store.dao;
 
 import com.cool.store.entity.AssessmentDataDO;
 import com.cool.store.mapper.AssessmentDataMapper;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
@@ -71,4 +72,10 @@ public class AssessmentDataDAO {
     public List<AssessmentDataDO> selectListByShopId(Long shopId) {
         return assessmentDataMapper.selectListByShopId(shopId);
     }
+    public Boolean deleteByShopId(Long shopId){
+        if (shopId == null){
+            return Boolean.FALSE;
+        }
+       return assessmentDataMapper.deleteByShopId(shopId);
+    }
 }

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

@@ -11,4 +11,5 @@ public interface AssessmentDataMapper extends Mapper<AssessmentDataDO> {
     Integer batchUpdate(List<AssessmentDataDO> AssessmentDataDOS);
 
     List<AssessmentDataDO> selectListByShopId(@Param("shopId") Long shopId);
+    Boolean deleteByShopId(@Param("shopId") Long shopId);
 }

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

@@ -41,6 +41,9 @@
     </foreach>
     )
   </update>
+  <delete id="deleteByShopId">
+    DELETE FROM xfsg_assessment_data WHERE shop_id = #{shopId}
+  </delete>
   <select id="selectListByShopId" resultType="com.cool.store.entity.AssessmentDataDO">
     select *
     from xfsg_assessment_data

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

@@ -23,7 +23,7 @@ public class AssessmentDataDTO {
     /**
      * 店铺是否合格
      */
-    @ApiModelProperty("店铺是否合格，0合格1不合格")
+    @ApiModelProperty("店铺是否合格，false不合格,true合格")
     private Boolean qualified;
     /**
      * 原因

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

@@ -15,7 +15,7 @@ public class ThreeAcceptanceDTO {
     private String acceptanceSignatures;
     @ApiModelProperty("验收评语")
     private String comments;
-    @ApiModelProperty("0通过，1不通过")
+    @ApiModelProperty("1通过，0不通过")
     private Integer resultType;
     @ApiModelProperty("验收时间")
     private String acceptanceTime;

coolstore-partner-model/src/main/java/com/cool/store/response/ThreeAcceptanceResponse.java

@@ -1,31 +0,0 @@
-package com.cool.store.response;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @Auther: WangShuo
- * @Date: 2024/04/29/下午11:51
- * @Version 1.0
- * @注释:
- */
-@Data
-public class ThreeAcceptanceResponse {
-
-    @ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
-    private String engineeringAcceptanceSignatures;
-    @ApiModelProperty("营运部验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
-    private String operationsAcceptanceSignatures;
-    @ApiModelProperty("加密商验收签名  {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
-    private String partnerAcceptanceSignatures;
-    @ApiModelProperty("验收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date acceptanceTime;
-    @ApiModelProperty("验收结果")
-    private Byte resultType;
-    @ApiModelProperty("验收评语")
-    private String acceptanceComments;
-}

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

@@ -9,7 +9,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.vo.Fitment.DecorationStageVO;
 import com.cool.store.vo.Fitment.DecorationModelVO;
@@ -113,7 +113,7 @@ public interface DecorationService {
      * @Date: 2024/5/6
      * @description:查看三方验收签字
      */
-    List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId);
+    ThreeSignResponse getThreeAcceptanceSign(Long shopId);
     /**
      * @Auther: wangshuo
      * @Date: 2024/5/3

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

@@ -21,7 +21,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.*;
 import com.cool.store.utils.poi.StringUtils;
@@ -412,6 +412,11 @@ public class DecorationServiceImpl implements DecorationService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean submitThreeCheck(ThreeAcceptanceCheckRequest request) {
         log.info("submitThreeCheck, request:{} ", JSONObject.toJSONString(request));
+        Boolean flag = assessmentDataDAO.deleteByShopId(request.getShopId());
+        if (Boolean.FALSE.equals(flag)){
+            log.error("三方验收插入检查项失败");
+            throw new ServiceException(ErrorCodeEnum.CHECK_ITEM);
+        }
         List<AssessmentDataDO> assessmentDataDOS = new ArrayList<>();
         for (AssessmentDataDTO assessmentDataDTO : request.getAssessmentDataDTOS()) {
             AssessmentDataDO assessmentDataDO = new AssessmentDataDO();
@@ -631,9 +636,9 @@ public class DecorationServiceImpl implements DecorationService {
     }
 
     @Override
-    public List<ThreeAcceptanceDTO> getThreeAcceptanceSign(Long shopId) {
-        List<ThreeAcceptanceDTO> threeAcceptanceDTOS = new ArrayList<>();
+    public ThreeSignResponse getThreeAcceptanceSign(Long shopId) {
 
+        ThreeSignResponse threeSignResponse = new ThreeSignResponse();
         AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
         //工程部
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getEngineeringAcceptanceSignatures())) {
@@ -643,7 +648,7 @@ public class DecorationServiceImpl implements DecorationService {
             engineeringDTO.setComments(engineering.getString("remark"));
             engineeringDTO.setResultType(engineering.getInteger("result"));
             engineeringDTO.setAcceptanceTime(engineering.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.ZERO, engineeringDTO);
+            threeSignResponse.setEngineeringAcceptance(engineeringDTO);
         }
         //营运部
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getOperationsAcceptanceSignatures())) {
@@ -653,7 +658,7 @@ public class DecorationServiceImpl implements DecorationService {
             operationsDTO.setComments(operations.getString("remark"));
             operationsDTO.setResultType(operations.getInteger("result"));
             operationsDTO.setAcceptanceTime(operations.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.ONE, operationsDTO);
+            threeSignResponse.setOperationsAcceptance(operationsDTO);
         }
         //加盟商
         if (StringUtils.isNotEmpty(acceptanceInfoDO.getPartnerAcceptanceSignatures())) {
@@ -663,9 +668,9 @@ public class DecorationServiceImpl implements DecorationService {
             partnerDTO.setComments(partner.getString("remark"));
             partnerDTO.setResultType(partner.getInteger("result"));
             partnerDTO.setAcceptanceTime(partner.getString("acceptanceTime"));
-            threeAcceptanceDTOS.add(CommonConstants.TWO, partnerDTO);
+            threeSignResponse.setPartnerAcceptance(partnerDTO);
         }
-        return threeAcceptanceDTOS;
+        return threeSignResponse;
     }
 
     @Override

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

@@ -8,7 +8,6 @@ import com.cool.store.request.BookingAcceptanceRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ResponseResult;
-import com.cool.store.response.ThreeAcceptanceResponse;
 import com.cool.store.service.DecorationService;
 import com.cool.store.vo.Fitment.DecorationModelVO;
 import com.cool.store.vo.Fitment.DesignInfoVo;

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

@@ -9,7 +9,7 @@ import com.cool.store.request.ThreeAcceptanceCheckRequest;
 import com.cool.store.request.ThreeAcceptanceRequest;
 import com.cool.store.response.FitmentResponse;
 import com.cool.store.response.ResponseResult;
-import com.cool.store.response.ThreeAcceptanceResponse;
+
 import com.cool.store.response.ThreeSignResponse;
 import com.cool.store.service.AssessmentTemplateService;
 import com.cool.store.service.DecorationService;
@@ -101,7 +101,7 @@ public class MiniDecorationController {
     }
     @ApiOperation("查看三方验收签字")
     @GetMapping("/getThreeSign")
-    public ResponseResult<List<ThreeAcceptanceDTO> > getThreeAcceptance(@RequestParam Long shopId){
+    public ResponseResult<ThreeSignResponse> getThreeAcceptance(@RequestParam Long shopId){
         return ResponseResult.success(decorationService.getThreeAcceptanceSign(shopId));
     }
 }