Merge remote-tracking branch 'origin/master'

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

@@ -77,9 +77,9 @@ public class MuseumInfoController {
 
     @GetMapping("/page")
     @Operation(summary = "获取分页")
-    public CommonResult<PageResult<MuseumInfoDO>> getPage(@Valid MuseumInfoPageReqVO pageReqVO){
+    public CommonResult<PageResult<MuseumInfoPageReqVO>> getPage(@Valid MuseumInfoPageReqVO pageReqVO){
         PageResult<MuseumInfoDO> PageResult = museumInfoService.getMuseumInfoPage(pageReqVO);
-        return success(BeanUtils.toBean(PageResult, MuseumInfoDO.class));
+        return success(BeanUtils.toBean(PageResult, MuseumInfoPageReqVO.class));
     }
 
 

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

@@ -20,26 +20,28 @@ import java.util.Map;
 public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     /**
      * 更新标本
-     * */
+     */
     @Update("UPDATE museum_info SET sample_type=#{sampleType}, place=#{place},chinese_name=#{chineseName} WHERE id =#{id}")
     void updateMuseumInfo(MuseumInfoDO museumInfoDO);
+
     /**
      * 删除标本
-     * */
+     */
     @Update("UPDATE museum_info SET deleted=1,reason=#{reason}  WHERE id =#{id}")
-    void deleteMuseumInfo(Integer id,String reason);
+    void deleteMuseumInfo(Integer id, String reason);
 
     /**
      * 查询标本
-     * */
+     */
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
     MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
 
     /**
      * 查询标本编号
-     * */
+     */
     @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} AND deleted =0")
     MuseumInfoDO getMuseumInfoBySampleId(@Param("sampleId") String sampleId);
+
     /**
      * 查询标本类型
      */
@@ -48,49 +50,39 @@ 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);
 
     /**
-     * 标本出入库状态计数
-     * */
-//    @Select("SELECT COUNT(*)  FROM museum_info  WHERE save =#{save} AND deleted =0")
-//    List<MuseuminfoMonthSaveVO> countMuseumInfoBySave(@Param("save") Integer save);
-
-//    @Select("SELECT "+
-//            " DATE_FORMAT(sample_save_time,'%y-%m')AS month,"+
-//            " COUNT(*) AS count "+
-//            " FROM museum_info "+
-//            " WHERE YEAR(sample_save_time) = #{save} "+
-//            " GROUP BY DATE_FORMAT(sample_save_time,'%Y-%m')")
-////            "ORDER BY month")
-//    List<MuseuminfoMonthSaveVO> countMuseumInfoBySave(@Param("save") Integer save);
-
-    @Select("SELECT"+
-            " DATE_FORMAT(sample_save_time,'%m')AS month,"+
-            " COUNT(*) AS count "+
-            " FROM museum_info "+
-            " WHERE deleted =0 AND save =1"+
-            " GROUP BY DATE_FORMAT(sample_save_time,'%m')"+
+     * 标本入库状态计数
+     */
+    @Select("SELECT" +
+            " DATE_FORMAT(sample_save_time,'%m')AS month," +
+            " COUNT(*) AS count " +
+            " FROM museum_info " +
+            " WHERE deleted =0 AND save =1" +
+            " GROUP BY DATE_FORMAT(sample_save_time,'%m')" +
             " ORDER BY month")
-    List<MuseuminfoMonthSaveVO>countMuseumInfoBySaveJoin(@Param("save") Integer save);
+    List<MuseuminfoMonthSaveVO> countMuseumInfoBySaveJoin(@Param("save") Integer save);
 
-    @Select("SELECT"+
-            " DATE_FORMAT(sample_save_time,'%m')AS month,"+
-            " COUNT(*) AS count "+
-            " FROM museum_info "+
-            " WHERE deleted =0 AND save =1"+
-            " GROUP BY DATE_FORMAT(sample_save_time,'%m')"+
+    /**
+     * 标本出库状态计数
+     */
+    @Select("SELECT" +
+            " DATE_FORMAT(sample_save_time,'%m')AS month," +
+            " COUNT(*) AS count " +
+            " FROM museum_info " +
+            " WHERE deleted =0 AND save =1" +
+            " GROUP BY DATE_FORMAT(sample_save_time,'%m')" +
             " ORDER BY month")
-    List<MuseuminfoMonthSaveVO>countMuseumInfoBySaveOut(@Param("save") Integer save);
+    List<MuseuminfoMonthSaveVO> countMuseumInfoBySaveOut(@Param("save") Integer save);
 
     /**
      * 标本来源计数（年）
-     * */
+     */
 //    @Select("SELECT COUNT(*)  FROM museum_info  WHERE origin =#{origin} AND deleted =0 AND sample_save_time >=2025-02")
 //    Integer countMuseumInfoByOrigin (@Param("origin") Integer origin);
     @Select("SELECT origin,DATE_FORMAT(sample_save_time,'%Y')AS year ,COUNT(*)AS count  FROM museum_info WHERE deleted =0 AND save =1 GROUP BY origin,DATE_FORMAT(sample_save_time,'%Y')")
@@ -98,17 +90,42 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
 
     /**
      * 分页
-     * */
+     */
+//    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
+//        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
+//        queryWrapper.likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
+//                .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+//                .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
+//                .orderByDesc(MuseumInfoDO::getId);
+//        return selectPage(pageReqVO, queryWrapper);}
+//
     default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
-        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
-        queryWrapper.likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
+                .likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
                 .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
-                .orderByDesc(MuseumInfoDO::getId);
-        return selectPage(pageReqVO, queryWrapper);
+                .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));
+//    }
+
+}