diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java index fb66ec9..1cb65bb 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java @@ -58,13 +58,13 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin { // 报表字段及数据类型 String[] FIELDS = { DEV_KEY+"_user", DEV_KEY+"_username", DEV_KEY+"_department",DEV_KEY+"_holiday_date_start", - DEV_KEY+"_holiday_date_end", + DEV_KEY+"_holiday_date_end",DEV_KEY+"_holiday_days", DEV_KEY+"_holiday_type", DEV_KEY+"_holiday_addr", DEV_KEY+"_phone", DEV_KEY+"_reason" }; DataType[] DATATYPES = { DataType.LongType,DataType.StringType, DataType.StringType, DataType.StringType, - DataType.StringType, + DataType.StringType,DataType.IntegerType, DataType.StringType, DataType.StringType, DataType.StringType, DataType.StringType }; @@ -104,7 +104,7 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin { "id,applier,applier.name as appliername,applier.phone as appliernamephone,description," + "org.name as orgname,'探亲休假' as triptypename," + "zcgj_holiday_address as address," + - "zcgj_holiday_start_time as startdate,zcgj_holiday_end_time as enddate" , + "zcgj_holiday_start_time as startdate,zcgj_holiday_end_time as enddate,zcgj_holiday_days as days" , searchFilterList.toArray(new QFilter [] {}), null ).orderBy(new String[]{"applier", "startdate"}); @@ -122,6 +122,7 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin { String triptypename = itemRow.getString("triptypename"); String description = itemRow.getString("description"); String address = itemRow.getString("address"); + Integer days = itemRow.getInteger("days"); Object[] totalRow = new Object[FIELDS.length]; totalRow[0] = applier; @@ -129,10 +130,11 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin { totalRow[2] = orgname; totalRow[3] = startdateStr; totalRow[4] = enddateStr; - totalRow[5] = triptypename; - totalRow[6] = address; - totalRow[7] = appliernamephone; - totalRow[8] = description; + totalRow[5] = days; + totalRow[6] = triptypename; + totalRow[7] = address; + totalRow[8] = appliernamephone; + totalRow[9] = description; coll.add(totalRow); } return resultDataSet;