促销员上报数据添加各类鸡爪销量

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

 package com.wangxiaolu.promotion.controller.activity.temporary;
 
+import com.alibaba.fastjson.JSONObject;
 import com.wangxiaolu.promotion.enums.activity.ClockType;
 import com.wangxiaolu.promotion.exception.ParamException;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
@@ -74,6 +75,8 @@ public class TemporaryActivityCoreController {
         TemporaryActivityReportedDto temActDto = new TemporaryActivityReportedDto();
         BeanUtils.copyProperties(activityVo, temActDto);
         temActDto.setId(activityVo.getActivityReportedId());
+
+        // 有ID则修改，无ID则新建
         if (Objects.nonNull(activityVo.getActivityReportedId())) {
             tempActivityCoreService.activityDataReportedUpdate(temActDto);
             return activityVo.getActivityReportedId();

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java

@@ -56,8 +56,11 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
      */
     @Override
     public void findListByTemporaryId(Integer temporaryId, PageInfo pageInfo) {
-        TemporaryActivityWrapper taw = new TemporaryActivityWrapper()
-                .setTemporaryId(temporaryId);
+        TemporaryActivityWrapper taw = JSONObject.parseObject(JSONObject.toJSONString(pageInfo.getQueryParams()), TemporaryActivityWrapper.class);
+        taw = Objects.isNull(taw) ? new TemporaryActivityWrapper() : taw;
+        taw.setTemporaryId(temporaryId);
+
+
         LambdaQueryWrapper<TemporaryActivityReportedDO> temQw = buildQueryList(taw);
 
         Page<TemporaryActivityReportedDO> page = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize());
@@ -88,7 +91,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
     @Override
     public void updateById(TemporaryActivityReportedDto temActDto) {
         TemporaryActivityReportedDO rDo = new TemporaryActivityReportedDO();
-        BeanUtils.copyProperties(temActDto,rDo);
+        BeanUtils.copyProperties(temActDto, rDo);
         rDo.setModifyTime(new Date());
         temporaryActivityReportedMapper.updateById(rDo);
     }
@@ -102,6 +105,9 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getCreateDate())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getCreateDate, tw.getCreateDate());
         }
+        if (!StringUtils.isEmpty(tw.getApproveStatus())){
+            queryWrapper.eq(TemporaryActivityReportedDO::getApproveStatus, tw.getApproveStatus());
+        }
 
         // 默认创建日期倒序排列
         queryWrapper.orderByDesc(TemporaryActivityReportedDO::getCreateDate);

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityReportedDO.java

@@ -68,6 +68,15 @@ public class TemporaryActivityReportedDO implements Serializable {
      */
     private Date approveTime;
 
+    private Integer sellXiangA;
+    private Integer sellXiangB;
+    private Integer sellXiangC;
+    private Integer sellXiangD;
+    private Integer sellDaiA;
+    private Integer sellDaiB;
+    private Integer sellDaiC;
+    private Integer sellDaiD;
+
     /**
      * 创建时间
      */

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityWrapper.java

@@ -18,11 +18,16 @@ public class TemporaryActivityWrapper {
     /**
      * temporaryId
      */
-    Integer temporaryId;
+    private Integer temporaryId;
 
     /**
      * 创建时间YYYY-MM-DD
      */
-    String createDate;
+    private String createDate;
 
+    /**
+     * 审批状态（审批中、审批通过、退回……）
+     * 关联enum类 TemActApproveStatus
+     */
+    private String approveStatus;
 }

src/main/java/com/wangxiaolu/promotion/pojo/PageInfo.java

@@ -10,6 +10,7 @@ import org.springframework.util.CollectionUtils;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author : liqiulin
@@ -40,7 +41,9 @@ public class PageInfo<T> implements Serializable {
      */
     private int totalPage;
 
-    List<T> records;
+    private List<T> records;
+
+    private Map<String,Object> queryParams;
 
     /**
      *

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

@@ -90,6 +90,15 @@ public class TemporaryActivityReportedDto {
     List<String> tgcjPhotoUrls;
     List<String> tgcjChangePhotoUrls;
 
+    private Integer sellXiangA;
+    private Integer sellXiangB;
+    private Integer sellXiangC;
+    private Integer sellXiangD;
+    private Integer sellDaiA;
+    private Integer sellDaiB;
+    private Integer sellDaiC;
+    private Integer sellDaiD;
+
     /**
      * 创建时间
      */

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

@@ -46,19 +46,29 @@ public class TemporaryActivityDataVo {
     /**
      * 推广试吃照片
      */
-    List<String> tgscPhotoUrls;
-    List<String> tgscChangePhotoUrls;
+    private List<String> tgscPhotoUrls;
+    private List<String> tgscChangePhotoUrls;
 
     /**
      * 推广互动照片
      */
-    List<String> tghdPhotoUrls;
-    List<String> tghdChangePhotoUrls;
+    private List<String> tghdPhotoUrls;
+    private List<String> tghdChangePhotoUrls;
 
     /**
      * 推广成交照片
      */
-    List<String> tgcjPhotoUrls;
-    List<String> tgcjChangePhotoUrls;
+    private List<String> tgcjPhotoUrls;
+    private List<String> tgcjChangePhotoUrls;
 
-}
+    private Integer ax;
+
+    private Integer sellXiangA;
+    private Integer sellXiangB;
+    private Integer sellXiangC;
+    private Integer sellXiangD;
+    private Integer sellDaiA;
+    private Integer sellDaiB;
+    private Integer sellDaiC;
+    private Integer sellDaiD;
+}
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/TemporaryActivityCoreService.java

@@ -18,13 +18,13 @@ public interface TemporaryActivityCoreService {
     long activityDataReportedSave(TemporaryActivityReportedDto temActDto);
 
     /**
-     * 促销员当日打卡信息保存
+     * 活动上报数据修改
      */
-    void clockInTodayActivity(TemporaryClockDto dto, Integer clockType);
+    void activityDataReportedUpdate(TemporaryActivityReportedDto temActDto);
 
     /**
-     * 活动上报数据修改
+     * 促销员当日打卡信息保存
      */
-    void activityDataReportedUpdate(TemporaryActivityReportedDto temActDto);
+    void clockInTodayActivity(TemporaryClockDto dto, Integer clockType);
 
 }