职称显示为中午

src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java

@@ -101,6 +101,9 @@ public class DataCollectionEmployee {
     @SalaryFormulaVar(defaultLabel = "职称", labelId = 98623, dataType = "string")
     private String jobcall;
 
+    @SalaryFormulaVar(defaultLabel = "职称ID", labelId = 98623, dataType = "string")
+    private Long jobcallId;
+
     //生日
     @SalaryFormulaVar(defaultLabel = "出生日期", labelId = 98624, dataType = "string")
     private String birthday;

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctFormulaBO.java

@@ -113,6 +113,7 @@ public class SalaryAcctFormulaBO {
                 .jobtitleName(simpleEmployee.getJobtitleName())
                 .jobtitleId(simpleEmployee.getJobtitleId())
                 .jobcall(simpleEmployee.getJobcall())
+                .jobcallId(simpleEmployee.getJobcallId())
                 .companystartdate(simpleEmployee.getCompanystartdate())
                 .birthday(simpleEmployee.getBirthday())
                 .workcode(simpleEmployee.getWorkcode())

src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java

@@ -90,6 +90,8 @@ public class SalaryFormulaEmployeeDTO {
     //职称
     @SalaryFormulaVar(defaultLabel = "职称", labelId = 98623, dataType = "string")
     private String jobcall;
+    @SalaryFormulaVar(defaultLabel = "职称ID", labelId = 98623, dataType = "string")
+    private Long jobcallId;
 
 
     @SalaryFormulaVar(defaultLabel = "出生日期", labelId = 98624, dataType = "string")

src/com/engine/salary/mapper/datacollection/EmployMapper.xml

@@ -52,10 +52,10 @@
         e.sex as sex,
         e.email as email,
         e.telephone as telephone,
-        e.jobcall as jobcall,
+        e.jobcall as jobcallId,
+        job.name as jobcall,
         e.birthday as birthday,
         e.certificatenum as idNo,
-        c.id as jobtitleId,
         e.enddate as dismissdate,
         e.workyear,
         e.companyworkyear
@@ -63,6 +63,7 @@
         left join hrmdepartment d on e.departmentid = d.id
         left join hrmjobtitles c on e.jobtitle = c.id
         left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
+        left join hrmjobcall job on e.jobcall=job.id
         where e.status not in (7) and (e.accounttype is null or e.accounttype = 0)
         <if test="collection != null and collection.size()>0">
             AND e.id IN

src/com/engine/salary/service/impl/SalarySendServiceImpl.java

@@ -933,6 +933,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
                     .subcompanyName(simpleEmployee.getSubcompanyName())
                     .email(StringUtils.isEmpty(simpleEmployee.getEmail()) ? "" : simpleEmployee.getEmail())
                     .jobcall(simpleEmployee.getJobcall())
+                    .jobcallId(simpleEmployee.getJobcallId())
                     .companystartdate(simpleEmployee.getCompanystartdate())
                     .sex("0".equals(simpleEmployee.getSex()) ? "男" : "女")
                     .mobile(StringUtils.isEmpty(simpleEmployee.getMobile()) ? "" : simpleEmployee.getMobile())