浏览代码

代码初始化

Crazy 3 月之前
父节点
当前提交
89455c9c30

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

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

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

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

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

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

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

@@ -71,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;