Commit 81d99ff3 by jianan

新单跟进145

parent c47ffcbe
......@@ -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;
/**
* 备注
......
......@@ -239,7 +239,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commissionEditRecords.add(commissionRecord);
}
String commissionDate = DateUtil.formatDate(commission.getCommissionDate());
String requestCommissionDate = commissionUpdateRequest.getCommissionDate();
String requestCommissionDate = DateUtil.formatDate(commissionUpdateRequest.getCommissionDate());
if (!Objects.equals(commissionDate, requestCommissionDate)) {
CommissionEditRecord commissionRecord = getCommissionEditRecord("来佣日期", commissionDate, requestCommissionDate, commission.getCommissionBizId(), currentLoginUser);
commissionEditRecords.add(commissionRecord);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment