Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java =================================================================== diff -u -r35797 -r35799 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java (.../ForeignTousseApplicationReportHelper.java) (revision 35797) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java (.../ForeignTousseApplicationReportHelper.java) (revision 35799) @@ -3,7 +3,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; @@ -17,11 +16,7 @@ import net.sf.json.JSONArray; import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - -import com.forgon.Constants; -import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; @@ -35,8 +30,6 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseItemVO; import com.forgon.tools.MathTools; import com.forgon.tools.db.DatabaseUtil; -import com.forgon.tools.db.InitDbConnection; -import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.SqlUtils; /** Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java =================================================================== diff -u -r35797 -r35799 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java (.../CssdWorkloadReportForTangshanWorkersHospitalHelper.java) (revision 35797) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java (.../CssdWorkloadReportForTangshanWorkersHospitalHelper.java) (revision 35799) @@ -52,6 +52,7 @@ departGroupIds = new HashSet(); departGroupIds.add(departGroupStr); } + @SuppressWarnings("unchecked") List invoiceDepartments = objectDao.findByHql("select po from " + InvoiceDepartment.class.getSimpleName() + " po where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", departGroupIds)); for (InvoiceDepartment invoiceDepartment : invoiceDepartments) { if("全部".equals(invoiceDepartment)){