diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java index 282618d24..8bcd1cd0b 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java @@ -1,6 +1,8 @@ package com.engine.salary.entity.salaryBill.dto; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -30,7 +32,7 @@ public class SalarySendBaseInfoDTO { private String template; // @ApiModelProperty("薪资所属月") -// @JsonSerialize(using = ToStringSerializer.class) + @JsonSerialize(using = ToStringSerializer.class) private YearMonth salaryMonth; // @ApiModelProperty("薪资账套的周期") diff --git a/src/com/engine/salary/util/ResponseResult.java b/src/com/engine/salary/util/ResponseResult.java index 4187266d7..d2634a1d2 100644 --- a/src/com/engine/salary/util/ResponseResult.java +++ b/src/com/engine/salary/util/ResponseResult.java @@ -9,6 +9,7 @@ import com.engine.core.exception.ECException; import com.engine.salary.exception.ExceptionUtil; import com.engine.salary.exception.SalaryRunTimeException; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import weaver.general.BaseBean; import weaver.hrm.User; @@ -113,6 +114,11 @@ public class ResponseResult { } + private static String getJsonString(Object apidatas) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + return mapper.writeValueAsString(apidatas); + } + /** * 成功返回 */ @@ -130,7 +136,7 @@ public class ResponseResult { Map apidatas = new HashMap<>(); apidatas.put("status", true); apidatas.put("data", r); - String success = JSONObject.toJSONString(apidatas, SerializerFeature.WriteMapNullValue, SerializerFeature.DisableCircularReferenceDetect); + String success = getJsonString(apidatas); if (isLog) { log.info("run salary api success return {}", success); }