1、打卡、活动上报添加[所属经销商]信息

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

@@ -68,6 +68,7 @@ public class TemporaryActivityCoreController {
          */
         TemporaryClockDto clockDto = tempActivityClockQueryService.findTodayTemporaryClockByTemId(temActDto.getTemporaryId());
         temActDto.setApproveStatus(TemActApproveStatus.SUBMITTED)
+                .setDealerName(clockDto.getDealerName())
                 .setLineName(clockDto.getLineName())
                 .setStoreName(clockDto.getStoreName())
                 .setDeptQcId(clockDto.getDeptQcId())

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

@@ -36,6 +36,11 @@ public class TemporaryActivityClockDO implements Serializable {
      */
     private Long reportedId;
 
+    /**
+     * 经销商名称
+     */
+    private String dealerName;
+
     /**
      * qince_clientele_store表qc_id
      */
@@ -61,12 +66,12 @@ public class TemporaryActivityClockDO implements Serializable {
     /**
      * 打卡所在地-省
      */
-    String clockProvince;
+    private String clockProvince;
 
     /**
      * 打卡所在地-市
      */
-    String clockCity;
+    private String clockCity;
 
     /**
      * 上班打卡地址
@@ -144,10 +149,10 @@ public class TemporaryActivityClockDO implements Serializable {
     private Date modifyTime;
 
     // 活动模式Id
-    Integer activityPatternId;
+    private Integer activityPatternId;
 
     // 活动模式
-    String activityPattern;
+    private String activityPattern;
 
 
     /**

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

@@ -32,6 +32,8 @@ public class TemporaryActivityReportedDO implements Serializable {
      */
     private String temporaryName;
 
+    private String dealerName;
+
     /**
      * 关联—活动店铺id
      */

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

@@ -35,6 +35,8 @@ public class TemporaryActivityReportedDto {
      */
     private String temporaryName;
 
+    private String dealerName;
+
     /**
      * 关联—活动店铺id
      */

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

@@ -34,24 +34,26 @@ public class TemporaryClockDto {
     /**
      * 关联活动上报id
      */
-    private Long reportedId;
+    Long reportedId;
 
     Long storeId;
 
-    private String lineName;
+    String dealerName;
+
+    String lineName;
 
     /**
      * qince_clientele_store表store_name
      */
-    private String storeName;
+    String storeName;
 
-    private String deptQcId;
+    String deptQcId;
 
-    private String deptQcOrgName;
+    String deptQcOrgName;
 
-    private String chargerQcId;
+    String chargerQcId;
 
-    private String chargerName;
+    String chargerName;
 
     // 上班打卡地址
     String clockInAddress;
@@ -82,7 +84,7 @@ public class TemporaryClockDto {
     // 午休下班打卡图片
     String noonClockOutPhoto;
 
-    Date noonClockOutPhotoUpdateTime;;
+    Date noonClockOutPhotoUpdateTime;
 
     // 午休下班打卡时间
     Date noonClockOutTime;
@@ -135,7 +137,7 @@ public class TemporaryClockDto {
      * 是否删除
      * 1:有效；0：删除；
      */
-    private Integer isDelete;
+    Integer isDelete;
 
     public TemporaryClockDto(Integer clockType, Long id, Integer temporaryId, String temporaryName, String clockProvince, String clockCity) {
         if (!ClockType.TEMPORARY_CLOCK_IN.equals(clockType)) {

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

@@ -66,7 +66,8 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
                     .setChargerQcId(employeeDto.getQcId())
                     .setChargerName(employeeDto.getName())
                     .setActivityPatternId(planInfoDto.getActivityPatternId())
-                    .setActivityPattern(planInfoDto.getActivityPattern());
+                    .setActivityPattern(planInfoDto.getActivityPattern())
+                    .setDealerName(planInfoDto.getDealerName());
             temporaryActivityClockDao.save(dto);
         } else {
             temporaryActivityClockDao.updateById(dto);