value
2023-08-28 1ab5a65898b12ca07cbf38eaf2028eeae2ce790c
Merge remote-tracking branch 'origin/master'
已修改3个文件
11 ■■■■ 文件已修改
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
@@ -70,7 +70,6 @@
            int finalI = i;
            mapList.stream().filter(m->Objects.equals(String.valueOf(m.get("type")),String.valueOf(TYPE_INT_LIST.get(finalI))))
                    .forEach(m->{
                        System.out.println(m.get("type"));
                        if(Objects.equals(m.get("inspectionStatus"),0)){
                            integerNoPass.incrementAndGet();
                        }
@@ -89,7 +88,6 @@
        list.add(mapNoPass);
        mapResult.put("series",list);
        mapResult.put("noData",true);
        System.out.println("执行结束getTestSampleStatistics________________>"+mapResult);
        //System.out.println(mapResult);
        return mapResult;
    }
@@ -153,7 +151,6 @@
        seriesDtoList.add(seriesDto2);
        allMap.put("series", seriesDtoList);
        allMap.put("noData",true);
        System.out.println("getSupplierNoPassStatistics结果++++++++++++++++>"+allMap);
        return allMap;
    }
@@ -194,7 +191,6 @@
        allMap.put("legend",NameList);
        allMap.put("series",doubleList);
        allMap.put("noData",true);
        System.out.println("getNoPassProjectStatistics结果==========================>"+allMap);
        return allMap;
    }
pom.xml
@@ -41,7 +41,7 @@
        <commons.lang3>3.12.0</commons.lang3>
        <hutool.version>5.8.18</hutool.version>
        <!-- 打包后导出的路径 -->
        <package.path>${project.build.directory}/LIMS</package.path>
        <package.path>C:/LIMS</package.path>
    </properties>
    <dependencies>
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.exception.AuthException;
import com.yuanchu.limslaboratory.mapper.MenuMapper;
import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
import com.yuanchu.limslaboratory.pojo.Menu;
@@ -147,6 +148,9 @@
    public Map<String, Object> getUrlType(String url) {
        String type=null;
        Map<String, Object> stringIntegerMap = roleManageMapper.selctInterFaceType(url);
        if(Objects.isNull(stringIntegerMap)){
            throw new AuthException("403","没有该资源");
        }
        String of = String.valueOf(stringIntegerMap.get("type"));
        switch (of) {
            case "0":
@@ -165,7 +169,6 @@
                break;
        }
        stringIntegerMap.put("type",type);
        System.out.println(type);
        return stringIntegerMap;
    }