Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java =================================================================== diff -u -r16176 -r17831 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java (.../QualityMonitoringDefinitionManager.java) (revision 16176) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java (.../QualityMonitoringDefinitionManager.java) (revision 17831) @@ -29,5 +29,12 @@ * @return */ List getItemsByFormDefinitionName(String formDefinitionId); - + /** + * 通过类型和责任环节获取监测项定义 + * @param formType + * @param responsiblePerson + * @return + */ + public List loadFormDefinitionGroupByTupeAndResponsibilityPart( + String formType, String responsiblePerson); } Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java =================================================================== diff -u -r17820 -r17831 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java (.../QualityMonitoringDefinitionManagerImpl.java) (revision 17820) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java (.../QualityMonitoringDefinitionManagerImpl.java) (revision 17831) @@ -159,6 +159,21 @@ sql += " order by sortNumber asc "; return objectDao.findBySql(QualityMonitoringDefinition.class.getSimpleName(),sql); } + @Override + public List loadFormDefinitionGroupByTupeAndResponsibilityPart( + String formType, String responsiblePerson) { + String sql = String.format(" where 1=1 "); + if(StringUtils.isNotBlank(formType)){ + sql += " and po.formType = '" + formType + "'"; + } + if(StringUtils.isNotBlank(responsiblePerson)){ + sql += " and po.responsibilityPart = '" + responsiblePerson + "'"; + } + sql += " and (po.isDisabled is null or po.isDisabled = '" + Constants.STR_NO + "')"; + sql += " order by sortNumber asc "; + return objectDao.findBySql(QualityMonitoringDefinition.class.getSimpleName(),sql); + } + /** * 通过监测项名字获取监测细则列表 */ Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js =================================================================== diff -u -r17676 -r17831 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js (.../qualityMonitoringMonthView.js) (revision 17676) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js (.../qualityMonitoringMonthView.js) (revision 17831) @@ -36,6 +36,8 @@ var queryYear = $Id('monthSearch').value; // 监测项类型 var monitoringType = $Id('monitoringType').value; + // 责任环节 + var responsibilityType = Ext.getCmp('responsibilityType').getRawValue(); // 监测项名称 var inspectItem = Ext.getCmp('inspectItem').getRawValue(); // 监测细则 @@ -58,8 +60,8 @@ } } - if(inspectItem == null || inspectItem == ""){ - showResult("请选择监测项"); + if((inspectItem == null || inspectItem == "") && (responsibilityType == null || responsibilityType == "")){ + showResult("请选择责任环节或者监测项"); return; } myMask = new Ext.LoadMask(Ext.getBody(), { @@ -89,7 +91,7 @@ reportFile = "QualityMonitoringInspectMonthReportView.jasper"; } } - window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+reportFile+"&monitoringType="+monitoringType+"&reportName=QualityMonitoringInspectMonthReport&queryYear="+yearStr+"&queryMonth="+monthStr+"&inspectItem=" + inspectItem +"&type=" + type + "&inspectDetail="+inspectDetail+"&querySupplyRoom="+querySupplyRoom+"",'thisIframe','_self'); + window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+reportFile+"&monitoringType="+monitoringType+"&reportName=QualityMonitoringInspectMonthReport&queryYear="+yearStr+"&queryMonth="+monthStr+"&inspectItem=" + inspectItem +"&type=" + type + "&inspectDetail="+inspectDetail+"&querySupplyRoom="+querySupplyRoom+"&responsibilityType="+responsibilityType+"",'thisIframe','_self'); } Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() { @@ -140,6 +142,7 @@ data : [['质量监测'], ['定期监测']] }); + var timeTypeStore = new Ext.data.SimpleStore( { fields : [ 'value' ], data : [['年份'], ['年月']] @@ -287,6 +290,35 @@ } }] },{ + width : 200, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'combo', + fieldLabel : "责任环节", + valueField : 'value', + displayField : 'value', + store : new top.Ext.data.SimpleStore({ + fields : [ 'value' ], + data : [[moduleNameArr[0]],[moduleNameArr[1]],[moduleNameArr[2]],[moduleNameArr[3]],[moduleNameArr[4]],[moduleNameArr[5]]] + } + ), + triggerAction : 'all', + editable : true, + mode : 'local', + forceSelection : false, + name : "responsibilityType", + id : "responsibilityType", + anchor : '95%', + value:'', + listeners:{ + select:function(){ + Ext.getCmp("inspectItem").setValue(""); + Ext.getCmp("inspectDetail").setValue(""); + } + } + }] + },{ // columnWidth : .3, width : 270, layout : 'form', @@ -307,10 +339,11 @@ triggerAction : 'all', hideTrigger : false, typeAhead : false, - allowBlank : false, + allowBlank : true, listeners:{ select:function(){ Ext.getCmp("inspectDetail").setValue(""); + Ext.getCmp("responsibilityType").setValue(""); formDefinitionDeatilStore.removeAll(); formDefinitionDeatilStore.load(); } @@ -376,6 +409,7 @@ Ext.getCmp('inspectDetail').setValue(""); Ext.getCmp('inspectItem').setValue(""); Ext.getCmp('monitoringType').setValue(""); + Ext.getCmp('responsibilityType').setValue(""); } }] }); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r17791 -r17831 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17791) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17831) @@ -296,15 +296,17 @@ String queryYear = StrutsParamUtils.getPraramValue("queryYear", ""); String queryMonth = StrutsParamUtils.getPraramValue("queryMonth", ""); String monitoringType = StrutsParamUtils.getPraramValue("monitoringType", ""); + // 责任环节 + String responsibilityType = StrutsParamUtils.getPraramValue("responsibilityType", ""); // 监测项 String inspectItem = StrutsParamUtils.getPraramValue("inspectItem", ""); String inspectDetail = StrutsParamUtils.getPraramValue("inspectDetail", ""); // 图形显示类型 String type = StrutsParamUtils.getPraramValue("type", ""); - if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) && StringUtils.isNotBlank(inspectItem)){ - return jasperReportManager.getQualityMonitoringInspectDayOfMonthParamet(queryYear,querySupplyRoom,queryMonth,monitoringType,inspectItem,inspectDetail,type); - }else if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ - return jasperReportManager.getQualityMonitoringInspectMonthParamet(queryYear,querySupplyRoom,monitoringType,inspectItem,inspectDetail,type); + if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) ){ + return jasperReportManager.getQualityMonitoringInspectDayOfMonthParamet(queryYear,querySupplyRoom,queryMonth,monitoringType,inspectItem,inspectDetail,type,responsibilityType); + }else if(StringUtils.isNotBlank(queryYear) ){ + return jasperReportManager.getQualityMonitoringInspectMonthParamet(queryYear,querySupplyRoom,monitoringType,inspectItem,inspectDetail,type,responsibilityType); } }else if(reportName.equals("formInstanceReport")){ String startDate = StrutsParamUtils.getPraramValue("startDate", ""); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17794 -r17831 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17794) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17831) @@ -107,6 +107,7 @@ import com.forgon.disinfectsystem.entity.packing.PackingRecord; import com.forgon.disinfectsystem.entity.packing.PackingRecordOutItem; 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.recyclingapplication.RecyclingApplication; @@ -12636,19 +12637,22 @@ return list; } // 获取质量监测统计项月报统计 - public List getQualityMonitoringInspectMonthParamet(String queryYear,String orgUnitCoding,String monitoringType,String inspectItem,String inspectDetail,String type){ + public List getQualityMonitoringInspectMonthParamet(String queryYear,String orgUnitCoding,String monitoringType,String inspectItem,String inspectDetail,String type,String responsibilityType){ List list = new ArrayList(); if("firstSecondHalfForm".equals(type) || "compareLastForm".equals(type) || "quarterForm".equals(type)){ // 上下半年对比，或者跟去年对比 或者季度对比的数据 - return getQualityMonitoringInspectCompareParamet(queryYear,orgUnitCoding,monitoringType,inspectItem,inspectDetail,type); + return getQualityMonitoringInspectCompareParamet(queryYear,orgUnitCoding,monitoringType,inspectItem,inspectDetail,type,responsibilityType); } - if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ + String sql = ""; + List resultNameList = new ArrayList(); + if(StringUtils.isNotBlank(responsibilityType)){ + resultNameList = getResultMameList(monitoringType,inspectItem,null,responsibilityType); + sql = getQualityMonitoringInspectMonthByResponsibilityTypeSql(queryYear,monitoringType,responsibilityType); + }else if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ String startYear = queryYear + "-01-01 00:00:00"; String nextYear = getNextYear(queryYear) + " 00:00:00"; - String sql = ""; - List resultNameList = new ArrayList(); if(StringUtils.isBlank(inspectDetail)){ - resultNameList = getResultMameList(monitoringType,inspectItem,null); + resultNameList = getResultMameList(monitoringType,inspectItem,null,null); // 细则没有选，不需要查询监测结果，查询细则 sql = "select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") +" monthstr,fdi.name,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fd.id = fi.formDefinition_id " @@ -12663,7 +12667,7 @@ + "and "+dateQueryAdapter.dateAdapter(nextYear) + " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fdi.name "; }else{ - resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail); + resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail,null); // 查询细则的统计结果 sql = "select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") +" monthstr,fiOption.answer,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi,FormInstanceOptionValue fiOption " @@ -12676,14 +12680,14 @@ + "and "+dateQueryAdapter.dateAdapter(nextYear) + " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fiOption.answer "; } - if(StringUtils.isNotBlank(sql)){ - ResultSet result = objectDao.executeSql(sql); - if("lineChart".equals(type) || "barChart".equals(type)){ - // 折线图柱状图的bean一样 - list = getQualityMonitoringInspectLineChartBean(resultNameList,result,queryYear,null); - }else{ - list = getQualityMonitoringInspectBean(resultNameList,result); - } + } + if(StringUtils.isNotBlank(sql)){ + ResultSet result = objectDao.executeSql(sql); + if("lineChart".equals(type) || "barChart".equals(type)){ + // 折线图柱状图的bean一样 + list = getQualityMonitoringInspectLineChartBean(resultNameList,result,queryYear,null); + }else{ + list = getQualityMonitoringInspectBean(resultNameList,result); } } return list; @@ -12699,19 +12703,24 @@ * @param type 查询的表格类型 * @return */ - public List getQualityMonitoringInspectDayOfMonthParamet(String queryYear,String orgUnitCoding,String queryMonth,String monitoringType,String inspectItem,String inspectDetail,String type){ + public List getQualityMonitoringInspectDayOfMonthParamet(String queryYear,String orgUnitCoding,String queryMonth,String monitoringType,String inspectItem, + String inspectDetail,String type,String responsibilityType){ List list = new ArrayList(); if("firstSecondHalfForm".equals(type) || "compareLastForm".equals(type) || "quarterForm".equals(type)){ // 上下半年对比，或者跟去年对比 或者季度对比的数据 - return getQualityMonitoringInspectCompareParamet(queryYear,orgUnitCoding,monitoringType,inspectItem,inspectDetail,type); + return getQualityMonitoringInspectCompareParamet(queryYear,orgUnitCoding,monitoringType,inspectItem,inspectDetail,type,responsibilityType); } - if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) && StringUtils.isNotBlank(inspectItem)){ + String sql = ""; + List resultNameList = new ArrayList(); + if(StringUtils.isNotBlank(responsibilityType)){ + resultNameList = getResultMameList(monitoringType,inspectItem,null,responsibilityType); + sql = getQualityMonitoringInspectDayByResponsibilityTypeSql(queryYear,queryMonth,monitoringType,responsibilityType); + }else if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) && StringUtils.isNotBlank(inspectItem)){ String startTime = queryYear + "-" + queryMonth + "-01 00:00:00"; String endTime = getNextMonth(queryYear,queryMonth) + " 00:00:00"; - String sql = ""; - List resultNameList = new ArrayList(); + if(StringUtils.isBlank(inspectDetail)){ - resultNameList = getResultMameList(monitoringType,inspectItem,null); + resultNameList = getResultMameList(monitoringType,inspectItem,null,null); // 细则没有选，不需要查询监测结果，查询细则 sql = "select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") +" monthstr,fdi.name,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi " @@ -12724,7 +12733,7 @@ + "and "+dateQueryAdapter.dateAdapter(endTime) + " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") + " ,fdi.name "; }else{ - resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail); + resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail,null); // 查询细则的统计结果 sql = "select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") +" monthstr,fiOption.answer,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi,FormInstanceOptionValue fiOption " @@ -12737,15 +12746,15 @@ + "and "+dateQueryAdapter.dateAdapter(endTime) + " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") + " ,fiOption.answer "; } - if(StringUtils.isNotBlank(sql)){ - ResultSet result = objectDao.executeSql(sql); - if("lineChart".equals(type) || "barChart".equals(type)){ - // 折线图柱状图的bean一样 - list = getQualityMonitoringInspectLineChartBean(resultNameList,result,queryYear,queryMonth); - }else{ - // 一个月中每日的表格数据 - list = getQualityMonitoringInspectBean(resultNameList,result,queryYear,queryMonth); - } + } + if(StringUtils.isNotBlank(sql)){ + ResultSet result = objectDao.executeSql(sql); + if("lineChart".equals(type) || "barChart".equals(type)){ + // 折线图柱状图的bean一样 + list = getQualityMonitoringInspectLineChartBean(resultNameList,result,queryYear,queryMonth); + }else{ + // 一个月中每日的表格数据 + list = getQualityMonitoringInspectBean(resultNameList,result,queryYear,queryMonth); } } return list; @@ -12759,11 +12768,12 @@ * @param type * @return */ - public List getQualityMonitoringInspectCompareParamet(String queryYear,String orgUnitCoding,String monitoringType,String inspectItem,String inspectDetail,String type){ + public List getQualityMonitoringInspectCompareParamet(String queryYear,String orgUnitCoding,String monitoringType,String inspectItem, + String inspectDetail,String type,String responsibilityType){ List list = new ArrayList(); Map map = new HashMap(); try{ - if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ + if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear)){ Map> startAndEndDays = null; if ( "firstSecondHalfForm".equals(type) ) { startAndEndDays = getStartAndEndDay(queryYear, "split", null); @@ -12782,8 +12792,17 @@ } List resultNameList = new ArrayList(); String sql = ""; - if(StringUtils.isBlank(inspectDetail)){ - resultNameList = getResultMameList(monitoringType,inspectItem,null); + if(StringUtils.isNotBlank(responsibilityType)){ + resultNameList = getResultMameList(monitoringType,inspectItem,null,responsibilityType); + sql = " select fd.formName,sum(qmi.amount) from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmd " + + " where qmi.id = fi.id and fi.formDefinition_id=fd.id and fd.id=qmd.id " + + " and qmd.responsibilityPart='" + responsibilityType + "' " + + "and fd.formType='" + monitoringType + "'" + + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay) + + " and "+dateQueryAdapter.dateAdapter(endDay) + + " group by fd.formName "; + }else if(StringUtils.isBlank(inspectDetail)){ + resultNameList = getResultMameList(monitoringType,inspectItem,null,null); // 细则没有选，不需要查询监测结果，查询细则 sql = "select " +" fdi.name,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi " @@ -12796,7 +12815,7 @@ + "and "+dateQueryAdapter.dateAdapter(endDay) + " group by " + " fdi.name "; }else{ - resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail); + resultNameList = getResultMameList(monitoringType,inspectItem,inspectDetail,null); // 查询细则的统计结果 sql = "select " +" fiOption.answer,sum(qmi.amount) count " + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,FormInstanceItem fiItem,FormDefinitionItem fdi,FormInstanceOptionValue fiOption " @@ -12856,6 +12875,43 @@ list = (List)Arrays.asList(map.values().toArray()); return list; } + /* + * 获取质量检测一年中每个月的sql，按责任环节查询 + */ + private String getQualityMonitoringInspectMonthByResponsibilityTypeSql(String queryYear,String type,String responsibilityType){ + String sql = ""; + if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(responsibilityType)){ + String startYear = queryYear + "-01-01 00:00:00"; + String nextYear = getNextYear(queryYear) + " 00:00:00"; + sql = " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fd.formName,sum(qmi.amount) from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmd " + + " where qmi.id = fi.id and fi.formDefinition_id=fd.id and fd.id=qmd.id " + + " and qmd.responsibilityPart='" + responsibilityType + "' " + + " and fd.formType='" + type + "' " + + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear) + + " and "+dateQueryAdapter.dateAdapter(nextYear) + + " group by " +dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fd.formName"; + } + return sql; + } + /* + * 获取质量检测查询一个月中每天的sql，按责任环节查询 + */ + private String getQualityMonitoringInspectDayByResponsibilityTypeSql(String queryYear,String queryMonth,String type,String responsibilityType){ + String sql = ""; + if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(responsibilityType)){ + String startTime = queryYear + "-" + queryMonth + "-01 00:00:00"; + String endTime = getNextMonth(queryYear,queryMonth) + " 00:00:00"; + sql = " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") + " ,fd.formName,sum(qmi.amount) from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmd " + + " where qmi.id = fi.id and fi.formDefinition_id=fd.id and fd.id=qmd.id " + + " and qmd.responsibilityPart='" + responsibilityType + "' " + + " and fd.formType='" + type + "' " + + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startTime) + + " and "+dateQueryAdapter.dateAdapter(endTime) + + " group by " +dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") + " ,fd.formName"; + } + return sql; + } + /** * 获取表格的javaBean集合 * @param nameList @@ -13078,10 +13134,22 @@ * 通过监测项和细则，获取细则需要统计的结果名称的集合 * @param inspectItem * @param inspectDetail + * @param responseType 责任环节 * @return */ - private List getResultMameList(String monitoringType,String inspectItem,String inspectDetail){ + private List getResultMameList(String monitoringType,String inspectItem,String inspectDetail,String responseType){ List nameList = new ArrayList(); + if(StringUtils.isNotBlank(responseType)){ + List qmdList = qualityMonitoringDefinitionManager.loadFormDefinitionGroupByTupeAndResponsibilityPart(monitoringType,responseType); + if(CollectionUtils.isNotEmpty(qmdList)){ + for(QualityMonitoringDefinition qmd : qmdList){ + if(!nameList.contains(qmd.getFormName())){ + nameList.add(qmd.getFormName()); + } + } + } + return nameList; + } FormDefinition fd = formDefinitionManager.getFormDefinitionByTypeAndName(monitoringType, inspectItem); if(StringUtils.isBlank(inspectDetail)){ // 获取统计细则的项 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp =================================================================== diff -u -r16176 -r17831 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp (.../qualityMonitoringMonthView.jsp) (revision 16176) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp (.../qualityMonitoringMonthView.jsp) (revision 17831) @@ -1,4 +1,5 @@ <%@ page contentType="text/html; charset=UTF-8"%> +<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%> <%@ include file="/common/taglibs.jsp"%> @@ -17,6 +18,8 @@