1.在职花名册增加长名称

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hspm/business/repository/ext/service/EmpReportPluginEx.java

@@ -56,7 +56,7 @@ public class EmpReportPluginEx implements IEmpReportExtService {
     public void addExtQueryFields(EmpReportExtQueryFieldsDTO empReportExtQueryFieldsDTO) {
         // 添加用于计算时存在花名册查询配置实体上的查询字段
         Set<String> queryFieldSet = empReportExtQueryFieldsDTO.getQueryFieldSet();
-        queryFieldSet.add("TOTO_COLUMN");
+        //queryFieldSet.add("TOTO_COLUMN");
     }
 
     @Override

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hspm/formplugin/web/reform/file/web/manage/FileManageReformEmpPosListPluginEx.java

@@ -26,7 +26,7 @@ public class FileManageReformEmpPosListPluginEx extends HRDataBaseList implement
         DynamicObject org = e.getRowData();
         if("company.name".equals(e.getColKey())) {
             Long orgId = org.getLong("adminorg.id");
-            Date date = new Date();
+            Date date = org.getDate("startdate");
             String orgLongName = OrgBatchBillHelper.getOrgLongName(orgId, date, null);
             org.set("description", orgLongName.replace("集团_", ""));
         }