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

@@ -11,7 +11,6 @@
                e.workcode,
                e.certificatenum as idNo,
                e.accounttype as accountType,
-               e.sex as sex,
                'false' as extEmp
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
@@ -22,7 +21,6 @@
     <select id="getEmployeeByIds" resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
         select e.id as employeeId,
         e.lastname as username,
-        e.sex as sex,
         e.certificatenum as idNo,
         e.status as status,
         e.workcode as workcode,
@@ -44,7 +42,6 @@
             resultType="com.engine.salary.entity.datacollection.DataCollectionEmployee">
         select e.id as employeeId,
         e.lastname as username,
-        e.sex as sex,
         e.certificatenum as idNo,
         e.status as status,
         e.workcode as workcode,
@@ -126,7 +123,6 @@
         select e.id as employeeId,
         e.lastname as username,
         e.status as status,
-        e.sex as sex,
         e.certificatenum as idNo,
         e.workcode as workcode,
         d.departmentname as departmentName,
@@ -233,7 +229,6 @@
         select e.id               as employeeId,
                e.lastname         as username,
                e.status           as status,
-               e.sex as sex,
                e.certificatenum   as idNo,
                e.workcode         as workcode,
                d.departmentname   as departmentName,
@@ -288,7 +283,6 @@
                e.lastname         as username,
                e.status           as status,
                e.workcode         as workcode,
-               e.sex as sex,
                e.certificatenum   as idNo,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
@@ -310,7 +304,6 @@
                e.status           as status,
                e.workcode         as workcode,
                e.certificatenum   as idNo,
-               e.sex as sex,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
                e.accounttype as accountType,
@@ -331,7 +324,6 @@
                e.status           as status,
                e.workcode         as workcode,
                e.certificatenum   as idNo,
-               e.sex as sex,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
                e.departmentid     as departmentId,
@@ -495,7 +487,6 @@
                e.lastname         as username,
                e.status           as status,
                e.certificatenum   as idNo,
-               e.sex as sex,
                e.workcode         as workcode,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
@@ -571,7 +562,6 @@
         e.lastname as username,
         e.status as status,
         e.certificatenum as idNo,
-        e.sex as sex,
         e.workcode as workcode,
         d.departmentname as departmentName,
         d.id as departmentId,

src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java

@@ -334,7 +334,7 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
                     sumRow.add(Util.null2String(countResult.get(weaTableColumnGroup.getColumn())));
                 }
             } else {
-                sumRow.add("");
+                sumRow.add(Util.null2String(countResult.get(weaTableColumnGroup.getColumn())));
             }
         }
         rowList.add(sumRow);