Commit 9aa3576d authored by hongguangwu's avatar hongguangwu

MVP1.7.9-日志优化

parent 5c644f95
...@@ -168,6 +168,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -168,6 +168,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
TEmployeeInsurancePre oldInsurance; TEmployeeInsurancePre oldInsurance;
String differenceInsuranceKey; String differenceInsuranceKey;
TEmployeePreLogDetail detailInsuranceLog; TEmployeePreLogDetail detailInsuranceLog;
List<String> ignoreField = new ArrayList<>();
ignoreField.add("joinLeaveDate");
ignoreField.add("createTime");
for (TEmployeeInsurancePre newInsurance : newList) { for (TEmployeeInsurancePre newInsurance : newList) {
differenceInsuranceKey = null; differenceInsuranceKey = null;
if (Common.isNotNull(newInsurance.getModelType())) { if (Common.isNotNull(newInsurance.getModelType())) {
...@@ -188,7 +191,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -188,7 +191,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldInsurance = oldMap.get(newInsurance.getId()); oldInsurance = oldMap.get(newInsurance.getId());
if (oldInsurance != null) { if (oldInsurance != null) {
initDateHour(oldInsurance); initDateHour(oldInsurance);
differenceInsuranceKey = HrEquator.comparisonValue(oldInsurance, newInsurance); differenceInsuranceKey = HrEquator.comparisonValueIgnoreField(oldInsurance, newInsurance, ignoreField);
} }
if (Common.isNotNull(differenceInsuranceKey) || oldInsurance == null) { if (Common.isNotNull(differenceInsuranceKey) || oldInsurance == null) {
detailInsuranceLog = new TEmployeePreLogDetail(); detailInsuranceLog = new TEmployeePreLogDetail();
......
...@@ -41,11 +41,12 @@ public class TEmployeeInsurancePre extends BaseEntity { ...@@ -41,11 +41,12 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema(description = "手机号码") @Schema(description = "手机号码")
private String empPhone; private String empPhone;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
@Schema(description = "入职日期") @Schema(description = "入职日期")
private Date joinLeaveDate; private Date joinLeaveDate;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
@Schema(description = "登记日期") @Schema(description = "登记日期")
private Date registTime; private Date registTime;
...@@ -70,7 +71,7 @@ public class TEmployeeInsurancePre extends BaseEntity { ...@@ -70,7 +71,7 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema(description = "项目id") @Schema(description = "项目id")
private String deptId; private String deptId;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
@Schema(description = "预计派单时间") @Schema(description = "预计派单时间")
private LocalDateTime expectedCollectionTime; private LocalDateTime expectedCollectionTime;
...@@ -89,15 +90,15 @@ public class TEmployeeInsurancePre extends BaseEntity { ...@@ -89,15 +90,15 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema(description = "购买类型, 1新增、3批增、4替换") @Schema(description = "购买类型, 1新增、3批增、4替换")
private Integer buyType; private Integer buyType;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
@Schema(description = "保单开始时间") @Schema(description = "保单开始时间")
private Date policyStart; private Date policyStart;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
@Schema(description = "保单结束时间") @Schema(description = "保单结束时间")
private Date policyEnd; private Date policyEnd;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd") @JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
@Schema(description = "预计生效日期") @Schema(description = "预计生效日期")
private Date policyEffect; private Date policyEffect;
......
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