Commit 7b3c017a authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5

parents 1967432e 0000a36f
......@@ -181,7 +181,7 @@ public class EmployeeProjectExportVO {
private String fileTown;
/**
* 是否大专及以上(0否1是)
* 是否大专及以上(0否1是)—— readConverterExp 无效,手动翻译
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "是否大专及以上")
......@@ -531,7 +531,7 @@ public class EmployeeProjectExportVO {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "档案是否完整")
@ExcelAttribute(name = "档案是否完整", isDataId = true , readConverterExp = "0=是,1=否")
@ExcelAttribute(name = "档案是否完整", readConverterExp = "0=是,1=否")
private String isComplete;
private String[] socialStatusArray;
......
......@@ -245,7 +245,7 @@
b.EMP_NATRUE AS PROEMP_NATRUE,
a.EMP_LABEL,
t.CONTRACT_PARTY,
a.IS_COMPLETE
if(ifnull(a.IS_COMPLETE,'1')='0','是','否') IS_COMPLETE
</sql>
......
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