档期计划bug修改

src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApPromotionImplDao.java

@@ -40,10 +40,10 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao {
     public PageInfo page(SalesApWq salesApWq) {
         LambdaQueryWrapper<SalesApPromotion> qw = buildWq(salesApWq);
         Page<SalesApPromotion> salesApDisplayPage = salesApPromotionMapper.selectPage(TableSupport.pageI(), qw);
-        salesApDisplayPage.getRecords().forEach(salesApPromotion -> {
-            String flavor = salesApPromotion.getPlannedPromotionFlavor() == null ? null : salesApPromotion.getPlannedPromotionFlavor() + salesApPromotion.getPlannedPromotionFlavorOther();
-            salesApPromotion.setPlannedPromotionFlavor(flavor);
-        });
+//        salesApDisplayPage.getRecords().forEach(salesApPromotion -> {
+//            String flavor = salesApPromotion.getPlannedPromotionFlavor() == null ? null : salesApPromotion.getPlannedPromotionFlavor() + salesApPromotion.getPlannedPromotionFlavorOther();
+//            salesApPromotion.setPlannedPromotionFlavor(flavor);
+//        });
         return new PageInfo(salesApDisplayPage);
     }
 

src/main/java/com/sfa/operation/domain/sales/entity/SalesApPromotion.java

@@ -398,9 +398,9 @@ public class SalesApPromotion implements Serializable {
      */
     private Date updateTime;
     @TableField(exist = false)
-    private boolean isActualPromotionStartDate;
+    private Boolean isActualPromotionStartDate;
     @TableField(exist = false)
-    private boolean isActualPromotionEndDate;
+    private Boolean isActualPromotionEndDate;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;