Bladeren bron

新增了回库附件上传,图片路径传回数组形式

hyy 5 maanden geleden
bovenliggende
commit
b14d0b42a1
9 gewijzigde bestanden met toevoegingen van 21 en 39 verwijderingen
  1. 1 1
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photos/vo/PhotosSaveReqVO.java
  2. 1 1
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenInfoPageReqVO.java
  3. 0 1
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java
  4. 4 4
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundPageReqVO.java
  5. 5 6
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundRespVO.java
  6. 3 0
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundReturnReqVO.java
  7. 1 1
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundSaveReqVO.java
  8. 3 5
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/dataobject/specimenoutbound/SpecimenOutboundDO.java
  9. 3 20
      yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/photos/PhotosServiceImpl.java

+ 1 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photos/vo/PhotosSaveReqVO.java

@@ -15,7 +15,7 @@ public class PhotosSaveReqVO {
     private Integer id;
 
     @Schema(description = "照片组表id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5803")
-    @NotNull(message = "照片组表id不能为空")
+//    @NotNull(message = "照片组表id不能为空")
     private Integer groupId;
 
     @Schema(description = "照片存储路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")

+ 1 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenInfoPageReqVO.java

@@ -83,7 +83,7 @@ public class SpecimenInfoPageReqVO extends PageParam {
     private String imageName;
 
     @Schema(description = "图片路径")
-    private String imagePath;
+    private List<String> imagePath;
 
     @Schema(description = "入库操作员")
     private String operator;

+ 0 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/SpecimenOutboundController.java

@@ -96,7 +96,6 @@ public class SpecimenOutboundController {
         return success(true);
     }
 
-
     @DeleteMapping("/delete")
     @Operation(summary = "删除标本出库回库信息")
     @Parameter(name = "id", description = "编号", required = true)

+ 4 - 4
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundPageReqVO.java

@@ -34,7 +34,7 @@ public class SpecimenOutboundPageReqVO extends PageParam {
     @Schema(description = "申请出库的用途")
     private String applicationUsage;
 
-    @Schema(description = "附件上传")
+    @Schema(description = "出库附件上传")
     private String attachments;
 
     @Schema(description = "审批状态", example = "2")
@@ -54,8 +54,8 @@ public class SpecimenOutboundPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "标本状态(已出库、已回库、出库审批中)", example = "2")
-    private Integer sampleStatus;
+    @Schema(description = "回库附件上传")
+    private String sampleStatus;
 
     @Schema(description = "驳回原因", example = "27504")
     private String processInstanceId;
@@ -68,7 +68,7 @@ public class SpecimenOutboundPageReqVO extends PageParam {
 
     @Schema(description = "点收人")
     private String receiver;
-
+    
     @Schema(description = "退还日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] returnDate;

+ 5 - 6
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundRespVO.java

@@ -42,8 +42,8 @@ public class SpecimenOutboundRespVO {
     @ExcelProperty("申请出库的用途")
     private String applicationUsage;
 
-    @Schema(description = "附件上传")
-    @ExcelProperty("附件上传")
+    @Schema(description = "出库附件上传")
+    @ExcelProperty("出库附件上传")
     private String attachments;
 
     @Schema(description = "审批状态", example = "2")
@@ -67,10 +67,9 @@ public class SpecimenOutboundRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "标本状态(已出库、已回库、出库审批中)", example = "2")
-    @ExcelProperty(value = "标本状态(已出库、已回库、出库审批中)", converter = DictConvert.class)
-    @DictFormat("museums_specimen_info") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
-    private Integer sampleStatus;
+    @Schema(description = "出库附件上传", example = "2")
+    @ExcelProperty(value = "出库附件上传")
+    private String sampleStatus;
 
     @Schema(description = "驳回原因", example = "27504")
     @ExcelProperty("驳回原因")

+ 3 - 0
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundReturnReqVO.java

@@ -26,4 +26,7 @@ public class SpecimenOutboundReturnReqVO {
 
     @Schema(description = "备注信息")
     private String remarks;
+
+    @Schema(description = "回库附件上传")
+    private String sampleStatus;
 }

+ 1 - 1
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundSaveReqVO.java

@@ -37,7 +37,7 @@ public class SpecimenOutboundSaveReqVO {
     @NotEmpty(message = "申请出库的用途不能为空")
     private String applicationUsage;
 
-    @Schema(description = "附件上传")
+    @Schema(description = "出库附件上传")
     private String attachments;
 
 //    @Schema(description = "审批状态", example = "2")

+ 3 - 5
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/dataobject/specimenoutbound/SpecimenOutboundDO.java

@@ -52,7 +52,7 @@ public class SpecimenOutboundDO extends BaseDO {
      */
     private String applicationUsage;
     /**
-     * 附件上传
+     * 出库附件上传
      */
     private String attachments;
     /**
@@ -74,11 +74,9 @@ public class SpecimenOutboundDO extends BaseDO {
      */
     private String specimenCondition;
     /**
-     * 标本状态(已出库、已回库、出库审批中)
-     *
-     * 枚举 {@link TODO museums_specimen_info 对应的类}
+     * 回库附件上传
      */
-    private Integer sampleStatus;
+    private String sampleStatus;
     /**
      * 驳回原因
      */

+ 3 - 20
yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/photos/PhotosServiceImpl.java

@@ -30,29 +30,12 @@ public class PhotosServiceImpl implements PhotosService {
     @Resource
     private PhotosMapper photosMapper;
 
-//    @Override
-//    public Integer createPhotos(PhotosSaveReqVO createReqVO) {
-//        // 插入
-//        PhotosDO photos = BeanUtils.toBean(createReqVO, PhotosDO.class);
-//        photosMapper.insert(photos);
-//        // 返回
-//        return photos.getId();
-//    }
-
     @Override
     public Integer createPhotos(PhotosSaveReqVO createReqVO) {
-        // 通过 group_id 获取对应的照片组信息
-        Integer groupId = createReqVO.getGroupId(); // 从请求中获取 group_id
-        if (groupId == null) {
-            throw new IllegalArgumentException("groupId cannot be null"); // 检查 group_id 是否为空
-        }
-
-        // 插入照片信息
+        // 插入
         PhotosDO photos = BeanUtils.toBean(createReqVO, PhotosDO.class);
-        photos.setGroupId(groupId); // 设置 group_id
-        photosMapper.insert(photos); // 插入照片到数据库
-
-        // 返回插入的照片 ID
+        photosMapper.insert(photos);
+        // 返回
         return photos.getId();
     }