Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r33646 -r33649 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33646) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 33649) @@ -1467,11 +1467,11 @@ fromTime = dateQueryAdapter.dateAdapter(fromTime); toTime = dateQueryAdapter.dateAdapter(toTime); - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); String orgUnitCodingSql = ""; String taskGroups = ""; String tousseGroupIds = ""; - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1568,10 +1568,10 @@ toTime = dateQueryAdapter.dateAdapter(toTime); List departGroups = departmentGroupManager.getAll(); - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); String tdSql = ""; String orgUnitCodingSql = ""; - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1694,10 +1694,10 @@ orOrgUnitNameSQL = " and po.depart not in ('" + goodsOption.getValue().replace(";", "','") + "')"; } } - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); String tdSql = ""; String orgUnitCodingSql = ""; - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -1851,8 +1851,8 @@ toTime = dateQueryAdapter.dateAdapter(toTime); String orgUnitCodingSql = ""; String tdSql = ""; - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2066,8 +2066,8 @@ toTime = dateQueryAdapter.dateAdapter(toTime); String orgUnitCodingSql = ""; String tdSql = ""; - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2209,8 +2209,8 @@ String tdSql = ""; String departCodeSqlSql = ""; String departCodingSql = ""; - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes",""); @@ -2425,9 +2425,9 @@ StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, "回收清单参数配置有误!缺失tables")); return; } - boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails ", false); + boolean onlyShowBasicFieldsInPackingPrintRecyclingDetails = CssdUtils.getSystemSetConfigByNameBool("onlyShowBasicFieldsInPackingPrintRecyclingDetails", false); String extraSql = ""; - if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails ){ + if(!onlyShowBasicFieldsInPackingPrintRecyclingDetails){ String taskGroups = StrutsParamUtils.getPraramValue("taskGroups",""); String tousseGroupIds = StrutsParamUtils.getPraramValue("tousseGroupIds",""); String recyDepartmentGroupDepartCodes = StrutsParamUtils.getPraramValue("recyDepartmentGroupDepartCodes","");