更新了更新条件

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

@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -91,7 +92,7 @@ public class MuseumInfoPageReqVO extends PageParam {
     private String reason;
 
     @Schema(description = "标本图片")
-    private String picture;
+    private List<String> picture;
 
     @Schema(description = "备注")
     private String sampleTip;

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

@@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -88,7 +89,7 @@ public class MuseumInfoSaveVO {
     private String reason;
 
     @Schema(description = "标本图片")
-    private String picture;
+    private List<String> picture;
 
     @Schema(description = "备注")
     private String sampleTip;

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

@@ -101,7 +101,7 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
      * 标本回库状态计数
      */
     @Select("SELECT" +
-            " number"+
+            " number "+
             " FROM museum_outbound " +
             " WHERE deleted =0 "+
             " AND state =1"+
@@ -146,7 +146,7 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
      *        order by 按照某个字段进行排序 ;加上 desc 表示降序排序(默认为升序 asc);
      *     /**根据输入信息进行分页查找*/
     default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
-        return selectPage(pageReqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
+        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<MuseumInfoDO>()
                 .likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
                 .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
@@ -168,9 +168,14 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
                 .likeIfPresent(MuseumInfoDO::getWay, pageReqVO.getWay())
                 .likeIfPresent(MuseumInfoDO::getFundId, pageReqVO.getFundId())
                 .likeIfPresent(MuseumInfoDO::getReason, pageReqVO.getReason())
-                .likeIfPresent(MuseumInfoDO::getPicture, pageReqVO.getPicture())
                 .likeIfPresent(MuseumInfoDO::getSampleTip, pageReqVO.getSampleTip())
-                .orderByDesc(MuseumInfoDO::getId));
+                .orderByDesc(MuseumInfoDO::getId);
+
+                if (pageReqVO.getPicture() != null && !pageReqVO.getPicture().isEmpty()) {
+                    String picture = String.valueOf(pageReqVO.getPicture());
+                    queryWrapper.apply("JSON_CONTAINS(secretary_ids, CAST({0} AS JSON))", picture);
+                }
+        return selectPage(pageReqVO, queryWrapper);
     }
     /**
      * 分页(List)

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -38,7 +38,9 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
            success =  CREATE_SUB_TYPE_SUCCESS)
    public Integer createMuseumInfo(MuseumInfoSaveVO saveVO) {
       MuseumInfoDO sample = BeanUtils.toBean(saveVO, MuseumInfoDO.class);
-      sample.setStore(1);
+      if(sample.getStore()==null){
+         sample.setStore(1);
+      }
       museumInfoMapper.insert(sample);
       LogRecordContext.putVariable("sample", sample);
       return sample.getId();