合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
+import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
 import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.exception.ParamException;
@@ -53,7 +54,6 @@ public class TemporaryActivityCoreController {
         TemporaryActivityReportedDto temActDto = new TemporaryActivityReportedDto();
         BeanUtils.copyProperties(activityVo, temActDto);
         temActDto.setId(activityVo.getActivityReportedId());
-
         /**
          * 已有id，修改任务
          */

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanQueryController.java

@@ -5,6 +5,7 @@ import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapp
 import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import com.wangxiaolu.promotion.pojo.PageInfo;
 import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
+import com.wangxiaolu.promotion.pojo.activity.inspectionInfo.dto.InspectionInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.planv2.response.ActivityResponse;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
@@ -53,7 +54,7 @@ public class PromPlanQueryController {
         // 查询计划
         ActivityResponse activityResponse = promPlanQueryService.queryPlanById(id);
         // 查询当前计划是否被稽查
-        ActivityExamineDto examineDto = exaPlanQueryService.selectByPlanId(id);
+        InspectionInfoDto examineDto = exaPlanQueryService.selectByPlanIdV2(id);
         activityResponse.setExamine(examineDto);
         // 查询促销上报任务
         List<TemporaryActivityReportedDto> reportedDtos = temporaryActivityQueryService.findListByPlan(id);

src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/response/ActivityResponse.java

@@ -2,6 +2,7 @@ package com.wangxiaolu.promotion.pojo.activity.planv2.response;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
+import com.wangxiaolu.promotion.pojo.activity.inspectionInfo.dto.InspectionInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
@@ -26,7 +27,8 @@ public class ActivityResponse {
 
     List<ActivityReported> reporteds;
 
-    ActivityExamineDto examine;
+//    ActivityExamineDto examine;
+    InspectionInfoDto  examine;
 
     @JsonIgnore
     List<TemporaryActivityReportedDto> reportedDtos;

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityReportedDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -183,6 +184,24 @@ public class TemporaryActivityReportedDto {
      * 1:有效；0：删除；
      */
     private Integer isDelete;
+    // 促销员联系电话
+    private String temporaryPhone;
+    // 执行方式
+    private String executeModePlan;
+    // 配发试吃品是否有黑鸭口味
+    private String hasBlackDuckFlavor;
+    // 配发黑鸭试吃品（根）
+    private Integer blackDuckTastingNum;
+    // 配发卤香试吃品（根）
+    private Integer braisedTastingNum;
+    // 配发赠品个数
+    private Integer giftNum;
+    // 推广活动销额（元）
+    private BigDecimal promotionSales;
+    // 黑鸭销售（元）
+    private BigDecimal blackDuckSales;
+    // 礼盒销售（元）
+    private BigDecimal giftBoxSales;
 
     public void approvedDataVerify(){
 

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryActivityDataVo.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -66,4 +67,23 @@ public class TemporaryActivityDataVo {
      */
     private List<String> psvPhotoUrls;
     private List<String> psvChangePhotoUrls;
+    // 促销员联系电话
+    private String temporaryPhone;
+    // 执行方式
+    private String executeModePlan;
+    // 配发试吃品是否有黑鸭口味
+    private String hasBlackDuckFlavor;
+    // 配发黑鸭试吃品（根）
+    private Integer blackDuckTastingNum;
+    // 配发卤香试吃品（根）
+    private Integer braisedTastingNum;
+    // 配发赠品个数
+    private Integer giftNum;
+    // 推广活动销额（元）
+    private BigDecimal promotionSales;
+    // 黑鸭销售（元）
+    private BigDecimal blackDuckSales;
+    // 礼盒销售（元）
+    private BigDecimal giftBoxSales;
+
 }

src/main/java/com/wangxiaolu/promotion/service/activity/examine/ExaPlanQueryService.java

@@ -19,4 +19,6 @@ public interface ExaPlanQueryService {
     InspectionInfoDto selectNewByID(Long id);
 
     void pageV2(PageInfo pageInfo);
+
+    InspectionInfoDto selectByPlanIdV2(Long id);
 }

src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanQueryServiceImpl.java

@@ -52,4 +52,9 @@ public class ExaPlanQueryServiceImpl implements ExaPlanQueryService {
         InspectionInfoWrapper wq = JSONObject.parseObject(JSONObject.toJSONString(pageInfo.getQueryParams()), InspectionInfoWrapper.class);
         inspectionInfoDao.page(pageInfo,wq);
     }
+
+    @Override
+    public InspectionInfoDto selectByPlanIdV2(Long id) {
+        return inspectionInfoDao.selectByPlanId(id);
+    }
 }