inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
@@ -35,7 +35,6 @@ @GetMapping("/getTestSampleStatistics") @AuthHandler public Result<?> getTestSampleStatistics(SelectQualificationRateDto dto){ System.out.println("getTestSampleStatistics______________>"+dto); return Result.success(service.getTestSampleStatistics(dto)); } @@ -43,7 +42,6 @@ @GetMapping("/getSupplierNoPassStatistics") @AuthHandler public Result<?> getSupplierNoPassStatistics(SelectQualificationRateDto dto){ System.out.println("getSupplierNoPassStatistics++++++++++++++++>"+dto); return Result.success(service.getSupplierNoPassStatistics(dto)); } @@ -51,7 +49,6 @@ @GetMapping("/getNoPassProjectStatistics") @AuthHandler public Result<?> getNoPassProjectStatistics(SelectQualificationRateDto dto){ System.out.println("getNoPassProjectStatistics===============>"+dto); return Result.success(service.getNoPassProjectStatistics(dto)); }
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.limslaboratory.annotation.AuthHandler; import com.yuanchu.limslaboratory.enums.InterfaceType; import com.yuanchu.limslaboratory.enums.MenuEnums; import com.yuanchu.limslaboratory.pojo.RawMaterial; import com.yuanchu.limslaboratory.service.RawMaterialService; import com.yuanchu.limslaboratory.vo.Result; @@ -56,6 +58,7 @@ @ApiOperation("原材料报检添加") @PostMapping("/add") @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.reportForInspection,isAdd = true) public Result<?> insertRawMaterial(@Validated @RequestBody RawMaterial rawMaterial) { Integer integer = rawMaterialService.insertRawMaterial(rawMaterial); if (integer >= 1) { @@ -66,6 +69,7 @@ @ApiOperation("原材料报检删除") @PostMapping("/delete") @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.reportForInspection,isAdd = true) public Result<?> deleteRawMaterial(String deleteId) { Integer integer = rawMaterialService.deleteRawMaterial(deleteId); if (integer >= 1) { inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
@@ -88,7 +88,6 @@ list.add(mapNoPass); mapResult.put("series",list); mapResult.put("noData",true); //System.out.println(mapResult); return mapResult; } @@ -106,8 +105,10 @@ supplierDistinct.forEach(l -> { supplierList.add(String.valueOf(l.get("supplier"))); }); //x轴 allMap.put("xAxis", supplierList); List<SeriesDto> seriesDtoList = new ArrayList<SeriesDto>(2); //title SeriesDto seriesDto = new SeriesDto("合格数量"); SeriesDto seriesDto2 = new SeriesDto("不合格数量"); // 取出对应合格数量不合格数量 @@ -121,7 +122,7 @@ .forEach(l -> { if (Objects.equals(l.get("inspectionStatus"), 1)) { integerPass.incrementAndGet(); } else { } else if(Objects.equals(l.get("inspectionStatus"), 0)) { integerNoPass.incrementAndGet(); } }); @@ -158,12 +159,12 @@ public Map<String, Object> getNoPassProjectStatistics(SelectQualificationRateDto dto) { Map<String, Object> allMap = new HashMap<>(16); List<ImInfo> imInfos = qualificationRateStatisticsMapper.selectProjectionsByCondition(dto); List<String>NameList = new ArrayList<>(); List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>(); if(imInfos.size()<=0){ allMap.put("noData",false); return allMap; } List<String>NameList = new ArrayList<>(); List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>(); imInfos.forEach(l->{ NameList.add(l.getImCode()+"-"+l.getImName()); projectByCodeAndNameDtos.add(new SelectProjectByCodeAndNameDto(l.getImCode(),l.getImName())); laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -26,5 +26,5 @@ //分配-->选择设备 List<Map<String, Object>> chooseinstum(); List<Instrument> getInstrument(); List<Map<String, String>> getInstrument(); } laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -46,7 +46,7 @@ left join lims_laboratory.classify c on c.id = instrument.classify_id where conditions in(1,5) </select> <select id="getInstrument" resultType="com.yuanchu.limslaboratory.pojo.Instrument"> select id,equipment_name name from instrument where 1=1 and state=1 and conditions=5 <select id="getInstrument" resultType="map"> select id,equipment_name equipmentName from instrument where 1=1 and state=1 and conditions=5 </select> </mapper>
