新单跟进145

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionUpdateRequest.java

@@ -91,8 +91,9 @@ public class CommissionUpdateRequest implements Serializable {
     /**
     /**
      * 来佣日期
      * 来佣日期
      */
      */
-    @Schema(description = "来佣日期 格式: yyyy-MM-dd")
-    private String commissionDate;
+    @Schema(description = "来佣日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date commissionDate;
 
 
     /**
     /**
      * 备注
      * 备注

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

@@ -239,7 +239,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             commissionEditRecords.add(commissionRecord);
             commissionEditRecords.add(commissionRecord);
         }
         }
         String commissionDate = DateUtil.formatDate(commission.getCommissionDate());
         String commissionDate = DateUtil.formatDate(commission.getCommissionDate());
-        String requestCommissionDate = commissionUpdateRequest.getCommissionDate();
+        String requestCommissionDate = DateUtil.formatDate(commissionUpdateRequest.getCommissionDate());
         if (!Objects.equals(commissionDate, requestCommissionDate)) {
         if (!Objects.equals(commissionDate, requestCommissionDate)) {
             CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
             CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
             commissionEditRecords.add(commissionRecord);
             commissionEditRecords.add(commissionRecord);