合并分支 'dxy' 到 'qa'

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

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
-import com.wangxiaolu.promotion.controller.user.tem.TemporaryInfoQueryController;
-import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
+import com.alibaba.nacos.client.utils.StringUtils;
 import com.wangxiaolu.promotion.enums.activity.TemActApproveStatus;
 import com.wangxiaolu.promotion.exception.DataException;
 import com.wangxiaolu.promotion.exception.ParamException;
@@ -23,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
@@ -154,7 +154,22 @@ public class TemporaryActivityCoreController {
                 throw new DataException(RCode.NOT_GFQ_PHOTO_ERROR);
             } else if (CollectionUtils.isEmpty(activityReportedDto.getScbbwlPhotoInfos()) ){
                 throw new DataException(RCode.NOT_SCBBWL_PHOTO_ERROR);
+            }else if  (StringUtils.isBlank(activityReportedDto.getHasBlackDuckFlavor())){
+                throw new DataException(RCode.NOT_BLACK_DUCK_FLAVOR_ERROR);
+            }else if (activityReportedDto.getBlackDuckTastingNum() == null || activityReportedDto.getBlackDuckTastingNum() == 0 ){
+                throw new DataException(RCode.NOT_BLACK_DUCK_TASTING_NUM_ERROR);
+            }else if (activityReportedDto.getBraisedTastingNum() == null ){
+                throw new DataException(RCode.NOT_BRAISED_TASTING_NUM_ERROR);
+            }else if (activityReportedDto.getGiftNum() == null ){
+                throw new DataException(RCode.NOT_GIFT_NUM_ERROR);
+            }else if (activityReportedDto.getPromotionSales() == null ||(1== BigDecimal.ZERO.compareTo(activityReportedDto.getPromotionSales()))){
+                throw new DataException(RCode.NOT_PROMOTION_SALES_ERROR);
+            }else if (activityReportedDto.getBlackDuckSales() == null ){
+                throw new DataException(RCode.NOT_BLACK_DUCK_SALES_ERROR);
+            }else if (activityReportedDto.getGiftBoxSales() == null ){
+                throw new DataException(RCode.NOT_GIFT_SALES_ERROR);
             }
+
             tempActivityCoreService.activityReportedSubmit(id);
         return R.success();
     }

src/main/java/com/wangxiaolu/promotion/pojo/activity/inspectionInfo/dto/InspectionInfoDto.java

@@ -298,4 +298,36 @@ public class InspectionInfoDto {
      * 主货架照片
      */
     private String storeZhiPhoto;
+
+    /**
+     * promotion_manage_employee表id
+     */
+    private Integer employeeId;
+
+    /**
+     * 姓名
+     */
+    private String employeeName;
+
+    /**
+     * 员工工号
+     */
+    private String employeeNo;
+
+    /**
+     * 创建人
+     */
+    private String createBy ;
+    /**
+     * 修改人
+     */
+    private String modifyBy ;
+    /**
+     * 创建时间
+     */
+    private Date createTime ;
+    /**
+     * 修改时间
+     */
+    private Date modifyTime ;
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/inspectionInfo/vo/InspectionInfoVO.java

@@ -263,4 +263,19 @@ public class InspectionInfoVO {
      * 主货架照片
      */
     private String storeZhiPhoto;
+
+    /**
+     * promotion_manage_employee表id
+     */
+    private Integer employeeId;
+
+    /**
+     * 姓名
+     */
+    private String employeeName;
+
+    /**
+     * 员工工号
+     */
+    private String employeeNo;
 }

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

@@ -68,12 +68,15 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
         inspectionInfoDto.setStoreCode(activityPlanInfoDto.getStoreCode());
         inspectionInfoDto.setStoreName(activityPlanInfoDto.getStoreName());
         inspectionInfoDto.setPattern(activityPlanInfoDto.getPattern());
-
+        inspectionInfoDto.setCreateTime(new Date());
+        inspectionInfoDto.setCreateBy(inspectionInfoDto.getEmployeeName());
         return inspectionInfoDao.save(inspectionInfoDto);
     }
 
     @Override
     public InspectionInfoDto updateByIdV2(InspectionInfoDto inspectionInfoDto) {
+        inspectionInfoDto.setModifyTime(new Date());
+        inspectionInfoDto.setModifyBy(inspectionInfoDto.getEmployeeName());
         return inspectionInfoDao.updateById(inspectionInfoDto);
     }
 

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityCoreServiceImpl.java

@@ -78,10 +78,10 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
             throw new FlowException(RCode.DATA_HAVE_ERROR);
         }
 
-        // 获取计划信息，补充此计划的销售品项
+        // 获取计划信息，补充此计划的销售品项和执行方式
         ActivityPlanInfoDto planInfoDto = activityPlanInfoDao.selectById(temActDto.getPlanId());
         temActDto.setPrdClass(Objects.isNull(planInfoDto) ? null : planInfoDto.getPrdClass());
-
+        temActDto.setExecuteModePlan(Objects.isNull(planInfoDto) ? null : planInfoDto.getPlanExecuteMode());
         // 返回生成的活动id
         long reportedId = temporaryActivityReportedDao.activityDataSave(temActDto);
         temActDto.setId(reportedId);

src/main/resources/mapper/inspection/InspectionInfoMapper.xml

@@ -73,6 +73,15 @@
 
         <!-- 6. JSON类型 -->
         <result property="temWorkPhotos" column="tem_work_photos" jdbcType="VARCHAR" />
+
+        <!-- 7. 新增字段 -->
+        <result property="employeeId" column="employee_id" jdbcType="INTEGER" />
+        <result property="employeeName" column="employee_name" jdbcType="VARCHAR" />
+        <result property="employeeNo" column="employee_no" jdbcType="VARCHAR" />
+        <result property="createBy" column="create_by" jdbcType="VARCHAR" />
+        <result property="modifyBy" column="modify_by" jdbcType="VARCHAR" />
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP" />
+        <result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -87,6 +96,6 @@
         has_promotion_gifts_score,sells_non_wangxiaolu_products_score,promotion_activity_content,has_ground_stack,has_black_duck_display,
         has_black_duck_tasting,other_brand_has_tasting_table,pedestrian_count_within_10_min,total_tasting_product_count,tasting_product_count_by_flavor,
         other_brand_tasting_table_proof_url,non_wangxiaolu_sales_proof_url,store_picture,tem_work_photos,store_tc_photo,
-        store_zhi_photo
+        store_zhi_photo,employee_id,employee_name,employee_no,create_by,modify_by,create_time,modify_time
     </sql>
 </mapper>