project/qxlw.git

			@@ -9,6 +9,7 @@
			public static final String PRODUCT_PROJECT_ITEM="product_project_item"; //项目分项
			public static final String PRODUCT_PROJECT_BUDGET="product_project_budget"; //预算
			public static final String PRODUCT_PROJECT_BASE_MATERIAL="product_project_base_material"; //基础材料
			public static final String PRODUCT_PROJECT_BASE_MATERIAL_TYPE="product_project_base_material_type";
			public static final String PRODUCT_PROJECT_OUTBOUND="product_project_outbound"; //出库信息主表

			//字段名

			@@ -223,8 +223,7 @@
			* @return
			*/
			public List<List<String>> getReportMaterialType() {

			DataTableEntity dtMaterialType = baseDao.listTable("product_sys_dict", "dict_name = ?", new Object[] {Cmnconst.MATERIAL_TYPE}, new Object[] {"dict_value","dict_label"});
			DataTableEntity dtMaterialType = baseDao.listTable(Cmnconst.PRODUCT_PROJECT_BASE_MATERIAL_TYPE, null, new Object[] {}, new Object[] {"material_type_name","material_type_value"});
			if (!BaseUtil.dataTableIsEmpty(dtMaterialType)) {

			List<List<String>> returnList = new ArrayList<>();
			@@ -234,8 +233,8 @@
			List<String> listNotShowMaterialCodeName = new ArrayList<>();

			for (int i = 0; i < dtMaterialType.getRows(); i++) {
			String dictValue = dtMaterialType.getFieldSetEntity(i).getString("dict_value");
			String dictLabel = dtMaterialType.getFieldSetEntity(i).getString("dict_label");
			String dictValue = dtMaterialType.getFieldSetEntity(i).getString("material_type_value");
			String dictLabel = dtMaterialType.getFieldSetEntity(i).getString("material_type_name");
			if ("0".equals(dictValue)) {
			listSummary.add(dictValue);
			listShowMaterialCode.add(dictValue);

	product-server-project-management/src/main/java/com/product/project/management/config/Cmnconst.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史