|
@@ -87,34 +87,7 @@ public class MuseumInfoController {
|
|
|
// TODO 1.2.3.代表哪种标本类型
|
|
|
// 返回某种标本类型的List数组
|
|
|
// Integer
|
|
|
-// Map<> 键值对
|
|
|
-// @GetMapping("/sampleTypeCount")
|
|
|
-// @Operation(summary = "标本类型计数")
|
|
|
-// public CommonResult<HashMap<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType) {
|
|
|
-// Integer result = museumInfoService.MuseumInfoBySampleType(1);
|
|
|
-// Integer result2 = museumInfoService.MuseumInfoBySampleType(2);
|
|
|
-// Integer result3 = museumInfoService.MuseumInfoBySampleType(3);
|
|
|
-// Integer result4 = museumInfoService.MuseumInfoBySampleType(4);
|
|
|
//
|
|
|
-//// 标本类型:矿石-1 岩石-2 矿物-3 陨石-4>
|
|
|
-// HashMap<String, Integer> Sites = new HashMap<String, Integer>();
|
|
|
-// Sites.put("矿石", result);
|
|
|
-// Sites.put("岩石", result2);
|
|
|
-// Sites.put("矿物", result3);
|
|
|
-// Sites.put("陨石", result4);
|
|
|
-// return CommonResult.success(Sites);
|
|
|
-// }
|
|
|
-
|
|
|
-// @GetMapping("/sampleTypeCount")
|
|
|
-// @Operation(summary = "标本类型计数")
|
|
|
-// public CommonResult<HashMap<String,List<MuseuminfoTypeVO>>> getMap(@RequestParam("sampleType") Integer sampleType) {
|
|
|
-// List<MuseuminfoTypeVO> result = museumInfoService.MuseumInfoBySampleType(sampleType);
|
|
|
-//// 标本类型:矿石-1 岩石-2 矿物-3 陨石-4>
|
|
|
-// HashMap<String,List<MuseuminfoTypeVO>> Sites = new HashMap<String,List<MuseuminfoTypeVO>>();
|
|
|
-// Sites.put("矿石", result);
|
|
|
-// return CommonResult.success(Sites);
|
|
|
-// }
|
|
|
-
|
|
|
@GetMapping("/sampleTypeCount")
|
|
|
@Operation(summary = "标本类型计数")
|
|
|
public CommonResult<List<MuseuminfoTypeVO>> getMap(@RequestParam("sampleType") Integer sampleType) {
|
|
@@ -124,16 +97,7 @@ public class MuseumInfoController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-// @GetMapping("/saveCount")
|
|
|
-// @Operation(summary = "标本出入库状态计数(每月)")
|
|
|
-// public CommonResult<HashMap<Integer,List<MuseuminfoMonthSaveVO>>> getSave(@RequestParam("save") Integer save){
|
|
|
-// List<MuseuminfoMonthSaveVO> result1 =museumInfoService.MuseumInfoBySave(save);
|
|
|
-//// 状态:在库-1 出库-0
|
|
|
-// HashMap<Integer, List<MuseuminfoMonthSaveVO>> result2 = new HashMap<Integer,List<MuseuminfoMonthSaveVO>>();
|
|
|
-//// Integer Condition = save;
|
|
|
-// result2.put(save,result1);
|
|
|
-// return CommonResult.success(result2);
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
@GetMapping("/joinSaveCount")
|
|
|
@Operation(summary = "标本出入库状态计数(每月)(入库)")
|
|
@@ -172,16 +136,4 @@ public class MuseumInfoController {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-// public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
|
|
|
-// MuseumTextRespVO DO =new MuseumTextRespVO();
|
|
|
-//// Integer Ynmber = selectMuseumInfoBySampleType(1)
|
|
|
-//// Integer hs = selectMuseumInfoBySampleType(2)
|
|
|
-//// DO.setYnumber(Ynmber);
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|