模板4.0午休字段名修改

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/mapper/entity/ActivityPlanInfoDo.java

@@ -136,11 +136,11 @@ public class ActivityPlanInfoDo implements Serializable {
     /**
      * 午休下班时间
      */
-    private LocalDateTime noonOutLocalTime;
+    private LocalDateTime noonClockOutTime;
     /**
      * 午休上班时间
      */
-    private LocalDateTime noonInLocalTime;
+    private LocalDateTime noonClockInTime;
 
     /**
      * 下班时间

src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/dto/ActivityPlanInfoDto.java

@@ -137,11 +137,11 @@ public class ActivityPlanInfoDto implements Serializable {
     /**
      * 午休下班时间
      */
-    private LocalDateTime noonOutLocalTime;
+    private LocalDateTime noonClockOutTime;
     /**
      * 午休上班时间
      */
-    private LocalDateTime noonInLocalTime;
+    private LocalDateTime noonClockInTime;
 
     /**
      * 下班时间

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -237,8 +237,8 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                                 && noonOutLocalTime.isBefore(noonInLocalTime)
                                 && noonInLocalTime.isBefore(outLocalTime))
                         {
-                            dto.setNoonOutLocalTime(LocalDateTime.of(planDate, noonOutLocalTime));
-                            dto.setNoonInLocalTime(LocalDateTime.of(planDate, noonInLocalTime));
+                            dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
+                            dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
                         }else if (ObjectUtils.allNotNull(noonOutLocalTime, noonInLocalTime)){
                             dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                         }
@@ -470,8 +470,8 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                                 && noonOutLocalTime.isBefore(noonInLocalTime)
                                 && noonInLocalTime.isBefore(outLocalTime))
                         {
-                            dto.setNoonOutLocalTime(LocalDateTime.of(planDate, noonOutLocalTime));
-                            dto.setNoonInLocalTime(LocalDateTime.of(planDate, noonInLocalTime));
+                            dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
+                            dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
                         }else {
                             dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                         }
@@ -783,8 +783,8 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                             && noonOutLocalTime.isBefore(noonInLocalTime)
                             && noonInLocalTime.isBefore(outLocalTime))
                     {
-                        dto.setNoonOutLocalTime(LocalDateTime.of(planDate, noonOutLocalTime));
-                        dto.setNoonInLocalTime(LocalDateTime.of(planDate, noonInLocalTime));
+                        dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
+                        dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
                     }else {
                         dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                     }

src/main/resources/mapper/activityplanv2/ActivityPlanInfoMapper.xml

@@ -75,8 +75,8 @@
             #{item.month}, FROM_UNIXTIME(#{item.date} / 1000), #{item.lineName}, #{item.storeName}, #{item.storeCode},
             #{item.orgQcId},#{item.orgName}, 0, #{item.pattern}, #{item.dealerId}, #{item.dealerName}, '未确定',
             #{item.province}, #{item.city}, #{item.area}, #{item.addr},
-            FROM_UNIXTIME(#{item.clockInTime} / 1000), FROM_UNIXTIME(#{item.clockOutTime} / 1000), FROM_UNIXTIME(#{item.noonOutLocalTime} / 1000),
-            FROM_UNIXTIME(#{item.noonInLocalTime} / 1000),#{item.temWlSct},#{item.prdClass},#{item.createBy})
+            FROM_UNIXTIME(#{item.clockInTime} / 1000), FROM_UNIXTIME(#{item.clockOutTime} / 1000), FROM_UNIXTIME(#{item.noonClockOutTime} / 1000),
+            FROM_UNIXTIME(#{item.noonClockInTime} / 1000),#{item.temWlSct},#{item.prdClass},#{item.createBy})
         </foreach>
     </insert>
 
@@ -143,8 +143,8 @@
             dealer_name    = #{pDo.dealerName},
             clock_in_time  = #{pDo.clockInTime},
             clock_out_time = #{pDo.clockOutTime},
-            noon_clock_out_time = #{pDo.noonOutLocalTime},
-            noon_clock_in_time = #{pDo.noonInLocalTime},
+            noon_clock_out_time = #{pDo.noonClockOutTime},
+            noon_clock_in_time = #{pDo.noonClockInTime},
             tem_wl_sct = #{pDo.temWlSct},
             prd_class = #{pDo.prdClass},
             modify_by    = #{pDo.modifyBy}