diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 19c501d26..8fbefe375 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -53,6 +53,7 @@ import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; import weaver.hrm.User; +import weaver.wechat.util.Utils; import java.io.InputStream; import java.math.BigDecimal; @@ -335,7 +336,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa .attendQuoteId(attendQuote.getId()) .attendQuoteDataId(po.getId()) .attendQuoteFieldId(Long.valueOf(attendQuoteData.get("attendQuoteFieldId").toString())) - .dataValue(attendQuoteData.get("dataValue") == null ? "" : attendQuoteData.get("dataValue").toString()) + .dataValue(Utils.null2String(attendQuoteData.get("dataValue"))) .build()); } } @@ -455,6 +456,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa dataValueBiz.deleteByAttendQuoteIds(quoteIds); // 新增考勤值数据 if (CollectionUtils.isNotEmpty(values)) { + log.info("考勤数据:{}",values); dataValueBiz.insertData(values); } } @@ -692,7 +694,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa .attendQuoteId(attendQuote.getId()) .attendQuoteDataId(po.getId()) .attendQuoteFieldId(attendQuoteField.getId()) - .dataValue(bigDecimalValue) + .dataValue(Utils.null2String(bigDecimalValue)) .build()); } } else { @@ -706,7 +708,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa .attendQuoteId(attendQuote.getId()) .attendQuoteDataId(po.getId()) .attendQuoteFieldId(attendQuoteField.getId()) - .dataValue(cellVal) + .dataValue(Utils.null2String(cellVal)) .build()); }