预算材料分类调整

354798ggg

2023-08-06 d4975504453fa566d82b24a9b96972b0faf99370

 product-server-project-management/src/main/java/com/product/project/management/service/ProjectStatisticAnalysisService.java

@@ -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);