Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r30680 -r30705 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30680) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30705) @@ -65,7 +65,6 @@ import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; -import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption; import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.WorkScoreConfig; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -104,9 +103,7 @@ import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfZsyy; import com.forgon.disinfectsystem.jasperreports.service.JasperReportManager; import com.forgon.disinfectsystem.jasperreports.service.WorkQualityCollectionReport; -import com.forgon.disinfectsystem.materialerrordamage.service.MaterialErrorDamageDetailManager; import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingItemManager; -import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; @@ -143,10 +140,6 @@ private TousseDefinitionManager tousseDefinitionManager; - private MaterialErrorDamageDetailManager materialErrorDamageDetailManager; - - private MaterialDefinitionManager materialDefinitionManager; - private HttpOptionManager httpOptionManager; private GoodsOptionManager goodsOptionManager; @@ -195,16 +188,6 @@ this.tousseDefinitionManager = tousseDefinitionManager; } - public void setMaterialErrorDamageDetailManager( - MaterialErrorDamageDetailManager materialErrorDamageDetailManager) { - this.materialErrorDamageDetailManager = materialErrorDamageDetailManager; - } - - public void setMaterialDefinitionManager( - MaterialDefinitionManager materialDefinitionManager) { - this.materialDefinitionManager = materialDefinitionManager; - } - public void setHttpOptionManager(HttpOptionManager httpOptionManager) { this.httpOptionManager = httpOptionManager; } @@ -1855,111 +1838,6 @@ } return totalIntegral; } - /** - * 获取材料报损数据 - * @return - */ - private List getMaterialDamageItemViewDataSourceOld() { - List damageBeans = new ArrayList(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String startDay = StrutsParamUtils.getPraramValue("startDay", - sdf.format(new Date())); - String endDay = StrutsParamUtils.getPraramValue("endDay", - sdf.format(new Date())); - String departSearch = StrutsParamUtils.getPraramValue("departSearch",""); - String damageReporter = StrutsParamUtils.getPraramValue("damageReporter",""); - String sql = "select * from ( " - +" select medd.type,medd.operator,medd.materialName,medd.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost " - +" ,ur.circuitNurse,ur.doctorName,case when ur.operationTime is null then ur.enteringDate else ur.operationTime end useTime " - +" from MaterialErrorDamageDetail medd " - +" join MaterialDefinition md on md.id=medd.materialDefinitionId " - +" join recyclingItem_errorDamage re on re.errorDamageDetail_id=medd.id " - +" join RecyclingItem ri on re.recyclingItem_id=ri.id " - +" join RecyclingRecord rr on ri.recyclingRecord_id = rr.id " - +" join invoicePlan ip on ip.id=rr.recyclingapplication_id " - +" join RecyclingApplication ra on ra.id=ip.id " - +" join UseRecord ur on ur.id=ra.userecord_id " - +" where ri.amount = 1 " - - +" union all " - - +" select medd.type,medd.operator,medd.materialName,medd.toussename,medd.operationTime,medd.depart,medd.amount,medd.materialCost, " - +" null,null,null " - +" from MaterialErrorDamageDetail medd " - +" join MaterialDefinition md on md.id=medd.materialDefinitionId " - +" join recyclingItem_errorDamage re on re.errorDamageDetail_id=medd.id " - +" join RecyclingItem ri on re.recyclingItem_id=ri.id " - +" where ri.amount > 1 " - +" ) po "; - sql += " where 1=1 "; - if (StringUtils.isNotBlank(departSearch)) { - sql += " and po.depart='" + departSearch + "'"; - } - if (StringUtils.isNotBlank(damageReporter)) { - sql += " and po.operator='" + damageReporter + "'"; - } - sql += " and po.type = '"+MaterialErrorDamageDetail.TYPE_DAMAGE+"' "; - sql += " and po.operationTime between " - + dateQueryAdapter.dateAdapter(startDay + " 00:00:00") - + " and " + dateQueryAdapter.dateAdapter(endDay + " 23:59:59"); - sql += " order by po.operationTime desc"; - List items = materialErrorDamageDetailManager.getDetails(sql); - Map map = new HashMap(); - Integer sumAmount = 0; - if (items != null) { - for (MaterialErrorDamageDetail item : items) { - String keyName = item.getDepart(); - if(StringUtils.isBlank(keyName)){ - continue; - } - MaterialDamageBean bean = null; - if(map.containsKey(keyName)){ - bean = map.get(keyName); - }else{ - bean = new MaterialDamageBean(); - } -// MaterialDamageBean bean = new MaterialDamageBean(); -// bean.setDamageReporter(item.getOperator()); -// bean.setDamageTime(item.getOperationTime()); - bean.setDepart(item.getDepart()); - List materialDamageItems = bean.getMaterialDamageItems(); - if(CollectionUtils.isEmpty(materialDamageItems)){ - materialDamageItems = new ArrayList(); - } - - MaterialDamageItemBean itemBean = new MaterialDamageItemBean(); - itemBean.setMaterialName(item.getMaterialName()); - itemBean.setDamageAmount(item.getAmount()); - itemBean.setDamageReporter(item.getOperator()); - itemBean.setDamageTime(item.getOperationTime()); - sumAmount += item.getAmount(); - Double cost = item.getMaterialCost(); - if(cost == null){ - cost = 0d; - } - itemBean.setMaterialCost(cost); - materialDamageItems.add(itemBean); - Integer curAmount = bean.getAmount(); - Double totalPrice = bean.getTotalPrice(); - Double price = MathTools.mul(cost, item.getAmount(), 2).doubleValue(); - bean.setAmount(curAmount + item.getAmount()); - bean.setTotalPrice(totalPrice + price); - - bean.setMaterialDamageItems(materialDamageItems); - map.put(keyName, bean); - } - } - if(map.size() > 0){ - for(MaterialDamageBean bean : map.values()){ - // 计算科室占比 - Integer amount = bean.getAmount(); - String rate = MathTools.divideStr(amount, sumAmount, 2); - bean.setRate(rate); - damageBeans.add(bean); - } - } - return damageBeans; - } /** * 获取材料报损数据 @@ -2124,31 +2002,6 @@ } /** - * 通过材料名称得到材料成本价 - * - * @param materialName - * @return - */ - private Double getMaterialCost(String materialName) { - if (StringUtils.isNotBlank(materialName)) { - int index = materialName.indexOf("["); - String realName = materialName; - String specification = null; - int inde = materialName.indexOf("]"); - if (index != -1 && inde != -1) { - realName = materialName.substring(0, index); - specification = materialName.substring(index + 1, inde); - } - MaterialDefinition materialDefinition = materialDefinitionManager - .getMaterialDefinitionByName(realName, specification); - if (materialDefinition != null) { - return materialDefinition.getCost(); - } - } - return null; - } - - /** * 使用记录人员汇总报表 * @return * 2014-7-25