Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35932 -r35934 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35932) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35934) @@ -1,22 +1,30 @@ package com.forgon.disinfectsystem.jasperreports.service; import java.io.File; -import java.io.UnsupportedEncodingException; -import java.lang.annotation.Annotation; import java.math.BigDecimal; import java.math.RoundingMode; -import java.net.URLDecoder; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperFillManager; @@ -29,12 +37,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.Predicate; -import org.apache.commons.collections4.Transformer; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.log4j.Logger; -import org.jsoup.helper.DataUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -44,108 +48,139 @@ import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.BrancheOfHospital; import com.forgon.directory.model.OrgUnit; -import com.forgon.directory.model.Org_OrgGroup; -import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager; -import com.forgon.disinfectsystem.diposablegoods.util.DisposableGoodsUtils; -import com.forgon.disinfectsystem.diposablegoods.util.GodownEntryUtil; -import com.forgon.disinfectsystem.diposablegoods.util.MaterialEntryUtil; import com.forgon.disinfectsystem.entity.adverseeventrecord.AdverseEventRecord; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; -import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; -import com.forgon.disinfectsystem.entity.basedatamanager.instrumentrepair.InstrumentRepair; -import com.forgon.disinfectsystem.entity.basedatamanager.instrumentrepair.InstrumentRepairGoods; -import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; -import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption; import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.WorkScoreConfig; -import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; import com.forgon.disinfectsystem.entity.basedatamanager.schedule.ScheduleDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.schedule.ScheduleInformation; -import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.ConsumptiveConfig; -import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.ConsumptiveInstance; -import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.DetectionItem; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; -import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; -import com.forgon.disinfectsystem.entity.basedatamanager.supplier.SupplierContact; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; -import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition; import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItem; import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItemOption; import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance; import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceItem; -import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceOptionValue; -import com.forgon.disinfectsystem.entity.devicemaintenance.DeviceMaintenance; -import com.forgon.disinfectsystem.entity.devicemonitoring.DeviceMonitoring; import com.forgon.disinfectsystem.entity.disposablegoods.DisposableGoodsInventory; -import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; -import com.forgon.disinfectsystem.entity.foreigntoussecharge.ChargeSetting; -import com.forgon.disinfectsystem.entity.foreigntoussecharge.ChargeSettingModeItem; -import com.forgon.disinfectsystem.entity.foreigntoussecharge.ChargeSettingSpecItem; -import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseChargeMode; -import com.forgon.disinfectsystem.entity.foreigntoussecharge.ForeignTousseSpecification; -import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; -import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceDepartment; import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.invoicemanager.MaterialInvoice; -import com.forgon.disinfectsystem.entity.invoicemanager.MaterialInvoiceItem; -import com.forgon.disinfectsystem.entity.invoicemanager.MaterialItem; -import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem; -import com.forgon.disinfectsystem.entity.packing.PackingRecord; -import com.forgon.disinfectsystem.entity.packing.PackingRecordOutItem; -import com.forgon.disinfectsystem.entity.packing.PackingTask; -import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringGoods; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; -import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord; -import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordItem; -import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; -import com.forgon.disinfectsystem.entity.reportforms.CustomTimePeriod; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem; import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord; -import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialItem; -import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialRecord; -import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTable; -import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTableItem; -import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTemplate; -import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MaterialStockVo; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MonthGoodsDetailVo; -import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockDiposableGoodBatch; -import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockDiposableGoods; -import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockIdentificationOfGoods; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockTakeRecord; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.entity.useRecord.UseRecord; -import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; -import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; -import com.forgon.disinfectsystem.jasperreports.javabeansource.*; +import com.forgon.disinfectsystem.jasperreports.javabeansource.AdverseEventRecordReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ApparatusInfusionisType; +import com.forgon.disinfectsystem.jasperreports.javabeansource.BiologicalMonitoringReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordItemVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.CleaningAreaWorkloadForUser; +import com.forgon.disinfectsystem.jasperreports.javabeansource.CrossTableBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.CssdWorkloadReportForTangshanWorkersVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DamageErrorMontBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartSatisfyDetailReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartmentMonthDetail; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceCusBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.DisinfectionFractionDefectiveBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.EighteenQuotaBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.FirstColumnVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseApplicationVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSizeReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSterilizationMonitorAndDeliveryVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSupplierStatisticsReportVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryItemVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_main; +import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsAmountSummaryByGrade; +import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsRiskLevelReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.InstrumentRepairVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceAmountContrastBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQuery; +import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQueryItem; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialDamageBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialDamageTotal_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageSummaryOfDepartmentVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialTypeWorkloadReport; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialWashUnqualifiedPosition; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MonitoringItemBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportChartBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.NurseWorkloadBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseRecortSumBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseReportAscriptionDepartVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseReportDepartVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_child_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_main; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_child_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_main; +import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityControlOfClinic; +import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityMonitoringReportTaskGroupVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnRecordItemVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.RinserStove; +import com.forgon.disinfectsystem.jasperreports.javabeansource.RinserStove_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyInfo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.ScheduleReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SciProjectAccountingVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SteAmountEachBranchReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationAreaWorkLoadBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationEffectMonitorReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationOmitReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationOmitReportBeanChild; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForDepartmentVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.SupplyRoomQualityQuota; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplyDepartment; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplyDepartment_Child; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplySummary; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseDeliverDetailVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseMorrowSendBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseOverLoadBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseReturnDisinfectionForDepartment; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseReturnDisinfectionForTousseInstance; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSpecificationSizeStatistics; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSterilizationInspectSituationBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseTraceabilityInquiry; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadVO; +import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadVOForDLZXYY; +import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordInfoReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorItemBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordTousseItemBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.WaitPackingTaskReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.WashAndDisinfectRecordItemBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkloadScoreStatisticReportVo; +import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean; import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex; import com.forgon.disinfectsystem.jasperreports.util.AmountContrastReportHelper; import com.forgon.disinfectsystem.jasperreports.util.CssdWorkloadReportForTangshanWorkersHospitalHelper; @@ -202,39 +237,25 @@ import com.forgon.disinfectsystem.jasperreports.util.WashWorkloadReprotHelper; import com.forgon.disinfectsystem.jasperreports.util.YearWorkloadReportHelper; import com.forgon.disinfectsystem.jasperreports.util.YearWorkloadReportSpecialHelper; -import com.forgon.disinfectsystem.packing.service.PackingManager; -import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager; -import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo; import com.forgon.disinfectsystem.report.dao.ReportDao; import com.forgon.disinfectsystem.report.entity.ReportDataWriteRecord; import com.forgon.disinfectsystem.reportforms.vo.ReportQueryParams; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryItemManager; import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking; -import com.forgon.disinfectsystem.vo.TousseOperate; -import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.security.model.User; -import com.forgon.systemsetting.model.HttpOption; -import com.forgon.tools.MapTools; import com.forgon.tools.MathTools; -import com.forgon.tools.SqlBuilder; import com.forgon.tools.StrutsParamUtils; -import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; -import com.forgon.tools.format.ConvertNumber; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; -import com.forgon.treenode.model.THTreeNode; -import com.forgon.util.DefaultValue; - -import edu.emory.mathcs.backport.java.util.Arrays; // /**