소스 검색

删除多余备注

lwh 1 개월 전
부모
커밋
d390fb871f

+ 1 - 49
yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

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

+ 0 - 22
yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -51,8 +51,6 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     /**
      * 标本类型计数1
      */
-//    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
-//    Integer countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
     @Select("SELECT sample_type ,COUNT(*)AS count FROM museum_info WHERE deleted =0 GROUP BY sample_type")
     List<MuseuminfoTypeVO> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
 
@@ -106,26 +104,6 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
                 .orderByDesc(MuseumInfoDO::getId));
     }
-//
-
-//    @Select("SELECT *"+
-//    "FROM museum_info "+
-////        -- 条件判断,如果有sample_id参数,模糊查询
-//    "WHERE (ISNULL(sampleId, '') = '' OR museum_info.sample_id LIKE '%' || sampleId ||  '%')"+
-////            LIKE '%' || :sampleId || '%'
-////            -- 条件判断,如果有sample_type参数,精确查询
-//    "AND (ISNULL(sampleType, '') = '' OR museum_info.sample_type LIKE '%' || sampleType || '%')"+
-////            -- 条件判断,如果有place参数,模糊查询
-//    "AND (ISNULL(place, '') = '' OR museum_info.place LIKE '%' || place || '%')"+
-//     "ORDER BY museum_info.id DESC")
-//    PageResult<MuseumInfoDO> selectPage(@Param("origin") MuseumInfoPageReqVO pageReqVO);
-//
 
-//    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO reqVO) {
-//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
-//                .eqIfPresent(MuseumInfoDO::getSampleType, reqVO.getSampleType())
-//                .likeIfPresent(MuseumInfoDO::getPlace, reqVO.getPlace())
-//                .orderByDesc(MuseumInfoDO::getId));
-//    }
 
 }