Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-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,7 +78,7 @@ 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();

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;

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

@@ -58,7 +58,7 @@ public class MuseumPictureController {
         return CommonResult.success(true);
     }
 
-    @GetMapping("/get")
+    @GetMapping("/getp")
     @Operation(summary = "查找图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
 

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);