11 Commits c6908a0036 ... 76febca828

Author SHA1 Message Date
  Crazy 76febca828 Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy 8a73d09661 Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy 89455c9c30 代码初始化 5 months ago
  Crazy ad9aa61429 Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy ce974622e9 Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy 0a33cfd29b Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy 96654ec977 代码初始化 5 months ago
  Crazy e277b372d7 Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy af162c5c8b Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 5 months ago
  Crazy 403f44344e Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java 6 months ago
  Crazy 8f53ae3542 代码初始化 6 months ago

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

@@ -84,10 +84,12 @@ public class MuseumFlowController {
         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) {

+ 1 - 1
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;

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

@@ -33,6 +33,11 @@ public class MuseumPictureController {
     private PictureGroupService pictureGroupService;
     private PicturePageReqVO pageVO;
 
+
+
+    //    TODO  1.创建新增照片组照片是需要用过照片组id 获取再新增的,也就是说需要一个通过照片组id和url进行插入的服务层方法
+    //          2.这里的新增是需要同时对照片组下新增多个的照片的,前端传的是个list的url,通过遍历调用上面的方法进行插入
+
     @PostMapping("/create")
     @Operation(summary = "新增图片组图片")
     public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
@@ -66,7 +71,7 @@ public class MuseumPictureController {
 //        }
     }
 
-    @GetMapping("/get")
+    @GetMapping("/getPictures")
     @Operation(summary = "查找图片")
     public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
 

+ 1 - 1
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;

+ 1 - 0
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/ 文章
+
     }
 
 }