导出

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityUserExport.java

@@ -46,7 +46,7 @@ public class SecurityUserExport {
     private String isFullTime;
     @ExcelProperty(value = "用工形式", index = 10)
     private String workType;
-    @ExcelProperty(value = "现任职时间", index = 11)
+    @ExcelProperty(value = "任现职时间", index = 11)
     private Date entryTime;
     @ExcelProperty(value = "工作年限", index = 12)
     private String workDuration;

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -724,7 +724,7 @@
                a.is_full_time                           AS isFullTime,
                a.work_type                              AS workType,
                a.entry_time                             AS entryTime,
-               TIMESTAMPDIFF(MONTH, a.work_time, NOW()) AS workDuration,
+               ROUND(TIMESTAMPDIFF(MONTH, a.work_time, NOW())/12,2) AS workDuration,
                a.highest_education                      AS highestEducation,
                a.education_type                         AS educationType,
                a.professional_qualifications            AS professionalQualifications,