Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/MuseumPictureController.java

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/MuseumFlowController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 @Tag(name = "博物馆-出回库管理")
 @RestController
@@ -50,26 +51,25 @@ public class MuseumFlowController {
         return CommonResult.success(result1);
     }
 
-    @PostMapping("/outbound")
-    @Operation(summary = "添加出库单")
-    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
-        String sample_id=saveVO.getNumber();
-        String number=saveVO.getNumber();
-        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
-        MuseumFlowDO event =  museumFlowService.selectMuseumFlowNumber(number);
-        if(result == null){
-            return CommonResult.error(200,"样品不存在");
-        }
-        int Save=result.getSave();
-        if(Save == 0){
-            return CommonResult.error(200,"样品不在库中");
-        }
-        else {
-            museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowStateOutbound2(saveVO);
-            return CommonResult.success(true);
-        }
-    }
+//    @PostMapping("/outbound")
+//    @Operation(summary = "添加出库单")
+//    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
+//        List<String>sample_id=saveVO.getNumber();
+//        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+//        if(result == null){
+//            return CommonResult.error(200,"样品不存在");
+//        }else if(result != null){
+//            int Save=result.getSave();
+//            if (Save == 0) {
+//                return CommonResult.error(200, "样品不在库中");
+//            } else {
+//                museumFlowService.createMuseumFlow(saveVO);
+//                museumFlowService.updateMuseumFlowStateOutbound2(saveVO);
+//                return CommonResult.success(true);
+//            }
+//        }
+//        return CommonResult.success(true);
+//    }
 
     @GetMapping("/pagePerson")
     @Operation(summary = "获取关于出库员的分页")
@@ -78,16 +78,18 @@ public class MuseumFlowController {
     }
 
     @PostMapping("/review")
-    @Operation(summary = "新增通过的审批单")
+    @Operation(summary = "通过的审批单")
     public CommonResult<Boolean> createMuseumFlowReview(@RequestBody MuseumFlowReviewVO reviewVO) {
         String sample_id = reviewVO.getNumber();
         String number = reviewVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         MuseumFlowDO event = museumFlowService.selectMuseumFlowNumber(number);
+
         int Save = result.getSave();
         int State = event.getState();
 //             Save中 0现为未出库或已回库，1为已出库
 //             State中 0现为未出库或已回库，1为已出库，2为审批中，3为审批通过，4为审批驳回
+        //TODO 你这里上面获取了result和event的值再判断他为空，怎么可能为空 ，所以如果为空的话，上面两句就直接报错了
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
         } else if (event == null) {

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowPageVO.java

@@ -31,7 +31,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime[] outboundTime;
+    private LocalDateTime []outboundTime;
 
     @Schema(description = "目的")
     private String purpose;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowRespVO.java

@@ -51,7 +51,7 @@ public class MuseumFlowRespVO {
     private Integer stateReview;
 
     @Schema(description = "审批时间")
-    private LocalDateTime[] reviewTime;
+    private LocalDateTime reviewTime;
 
     @Schema(description = "拒绝原因")
     private String rejectSeason;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowReturnVO.java

@@ -51,7 +51,7 @@ public class MuseumFlowReturnVO {
     private Integer stateReview;
 
     @Schema(description = "审批时间")
-    private LocalDateTime[] reviewTime;
+    private LocalDateTime reviewTime;
 
     @Schema(description = "拒绝原因")
     private String rejectSeason;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowReviewVO.java

@@ -24,7 +24,7 @@ public class MuseumFlowReviewVO {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime[] outboundTime;
+    private LocalDateTime outboundTime;
 
     @Schema(description = "目的")
     private String purpose;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumflow/vo/MuseumFlowSaveVO.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "博物馆-申请表信息 save VO")
 @Data
@@ -15,7 +16,7 @@ public class MuseumFlowSaveVO {
     private Integer id;
 
     @Schema(description = "样品编号")
-    private String number;
+    private List<String> number;
 
     @Schema(description = "样品名称")
     private String sampleName;
@@ -24,7 +25,7 @@ public class MuseumFlowSaveVO {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime[] outboundTime;
+    private LocalDateTime outboundTime;
 
     @Schema(description = "目的")
     private String purpose;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museumflow/MuseumFlowDO.java

@@ -35,7 +35,7 @@ public class MuseumFlowDO extends BaseDO {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime[] outboundTime;
+    private LocalDateTime outboundTime;
 
     @Schema(description = "目的")
     private String purpose;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -29,11 +29,11 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 /**搜索功能
 
     /**根据编号在总表中进行查找**/
-    @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0  AND deleted =0 ")
+    @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0 ")
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
 
     /**根据编号在Flow库中进行查找*/
-    @Select("SELECT * FROM museum_outbound WHERE number = #{id} AND deleted = 0 AND deleted =0 ")
+    @Select("SELECT * FROM museum_outbound WHERE number = #{id} AND deleted = 0 ")
     MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
 

yudao-server/src/main/java/cn/iocoder/yudao/server/YudaoServerApplication.java

@@ -29,6 +29,7 @@ public class YudaoServerApplication {
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
         // 如果你碰到启动的问题，请认真阅读 https://doc.iocoder.cn/quick-start/ 文章
+
     }
 
 }