钱智，社保

src/com/engine/salary/entity/siaccount/dto/QZReportListDTO.java

@@ -19,7 +19,6 @@ public class QZReportListDTO {
     /**
      * 公司名称
      */
-    @ElogTransform(name = "个税扣缴义务人")
     private Long paymentOrganization;
     private String paymentOrganizationName;
     /**

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

@@ -558,28 +558,11 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
             }
             record.put("firstDepartmentName", depList.length >= 1 ? Util.formatMultiLang(depList[depList.length - 1], String.valueOf(user.getLanguage())) : "");
             record.put("secondDepartmentName", depList.length >= 2 ? Util.formatMultiLang(depList[depList.length - 2], String.valueOf(user.getLanguage())) : "");
-            record.put("jobcall", item.getJobcall());
+            record.put("jobtitleName", simpleEmployee.getJobtitleName());
             record.put("companystartdate", simpleEmployee.getCompanystartdate());
-            record.put("dismissdate", item.getStatus() != null && UserStatusEnum.getUnavailableStatus().contains(item.getStatus()) ? simpleEmployee.getDismissdate() : "");
-            //社保基数,取养老个人的基数
+            record.put("dismissdate", simpleEmployee.getStatus() != null && UserStatusEnum.getUnavailableStatus().contains(simpleEmployee.getStatus()) ? simpleEmployee.getDismissdate() : "");
 
 
-            if (!dynamicEmpInfo) {
-                record.put("department", item.getDepartmentName());
-                record.put("departmentId", item.getDepartmentId());
-                record.put("subcompany", item.getSubcompanyName());
-                record.put("subcompanyId", item.getSubcompanyId());
-                record.put("jobtitle", item.getJobtitleName());
-                record.put("jobtitleId", item.getJobtitleId());
-                record.put("jobcall", item.getJobcall());
-                record.put("jobcallId", item.getJobcallId());
-                record.put("employeeStatus", item.getStatus() != null ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(item.getStatus())) : "");
-            } else {
-                record.put("department", simpleEmployee.getDepartmentName());
-                record.put("departmentId", simpleEmployee.getDepartmentId());
-                record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.getDefaultLabelByValue(Integer.parseInt(simpleEmployee.getStatus())) : "");
-            }
-
             record.put("supplementaryMonth", item.getSupplementaryMonth());
             ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class);