审批程序

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

@@ -60,7 +60,7 @@ public class MuseumFlowController {
         if(result == null){
             return CommonResult.error(200,"样品不存在");
         }
-        int condition=result.getState();
+        int condition=result.getCondition();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
         if(condition == 0){
             return CommonResult.error(200,"样品不在库中");

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

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,87 +17,66 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class MuseumFlowPageVO extends PageParam {
-    /**
-     * 样品ID
-     */
+
+    @TableId
+    @Schema(description = "样品ID")
     private Integer id;
-    /**
-     * 样品编号
-     */
-    @Schema(description = "标本编号")
+
+    @Schema(description = "样品编号")
     private String number;
-    /**
-     * 样品名称
-     */
+
+    @Schema(description = "尺寸")
     private String sampleName;
-    /**
-     * 出库人员
-     */
-    @NotEmpty(message = "出库员不能为空")
+
+    @Schema(description = "样品名称")
     private String outboundPerson;
-    /**
-     * 出库时间
-     */
+
+    @Schema(description = "出库时间")
     private LocalDateTime[] outboundTime;
-    /**
-     * 目的
-     */
+
+    @Schema(description = "目的")
     private String purpose;
-    /**
-     * 出库附件
-     */
+
+    @Schema(description = "出库附件")
     private String annexOut;
-    /**
-     * 申请人
-     */
+
+    @Schema(description = "申请人")
     private String applyPerson;
-    /**
-     * 申请单位
-     */
+
+    @Schema(description = "申请单位")
     private String applyUnit;
-    /**
-     * 申请时间
-     */
+
+    @Schema(description = "申请时间")
     private LocalDateTime applyTime;
-    /**
-     * 预计退还时间
-     */
+
+    @Schema(description = "预计退还时间")
     private String returnExpect;
-    /**
-     * 审批人
-     */
+
+    @Schema(description = "审批人")
     private String reviewPerson;
-    /**
-     * 状态
-     */
+
+    @Schema(description = "状态")
     private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
+
+    @Schema(description = "点收人")
     private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
 }

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

@@ -10,87 +10,66 @@ import java.time.LocalDateTime;
 @Schema(description = "博物馆-申请表信息 resp VO")
 @Data
 public class MuseumFlowRespVO {
-    /**
-     * 样品ID
-     */
+
+    @TableId
+    @Schema(description = "样品ID")
     private Integer id;
-    /**
-     * 样品编号
-     */
-    @Schema(description = "标本编号")
+
+    @Schema(description = "样品编号")
     private String number;
-    /**
-     * 样品名称
-     */
+
+    @Schema(description = "尺寸")
     private String sampleName;
-    /**
-     * 出库人员
-     */
-    @NotEmpty(message = "出库员不能为空")
+
+    @Schema(description = "样品名称")
     private String outboundPerson;
-    /**
-     * 出库时间
-     */
+
+    @Schema(description = "出库时间")
     private LocalDateTime outboundTime;
-    /**
-     * 目的
-     */
+
+    @Schema(description = "目的")
     private String purpose;
-    /**
-     * 出库附件
-     */
+
+    @Schema(description = "出库附件")
     private String annexOut;
-    /**
-     * 申请人
-     */
+
+    @Schema(description = "申请人")
     private String applyPerson;
-    /**
-     * 申请单位
-     */
+
+    @Schema(description = "申请单位")
     private String applyUnit;
-    /**
-     * 申请时间
-     */
+
+    @Schema(description = "申请时间")
     private LocalDateTime applyTime;
-    /**
-     * 预计退还时间
-     */
+
+    @Schema(description = "预计退还时间")
     private String returnExpect;
-    /**
-     * 审批人
-     */
+
+    @Schema(description = "审批人")
     private String reviewPerson;
-    /**
-     * 状态
-     */
+
+    @Schema(description = "状态")
     private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
+
+    @Schema(description = "点收人")
     private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
 }

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,87 +11,66 @@ import java.time.LocalDateTime;
 @Schema(description = "博物馆-申请表信息 save VO")
 @Data
 public class MuseumFlowSaveVO {
-    /**
-     * 样品ID
-     */
+
+    @TableId
+    @Schema(description = "样品ID")
     private Integer id;
-    /**
-     * 样品编号
-     */
-    @Schema(description = "标本编号")
+
+    @Schema(description = "样品编号")
     private String number;
-    /**
-     * 样品名称
-     */
+
+    @Schema(description = "尺寸")
     private String sampleName;
-    /**
-     * 出库人员
-     */
-    @NotEmpty(message = "出库员不能为空")
+
+    @Schema(description = "样品名称")
     private String outboundPerson;
-    /**
-     * 出库时间
-     */
+
+    @Schema(description = "出库时间")
     private LocalDateTime outboundTime;
-    /**
-     * 目的
-     */
+
+    @Schema(description = "目的")
     private String purpose;
-    /**
-     * 出库附件
-     */
+
+    @Schema(description = "出库附件")
     private String annexOut;
-    /**
-     * 申请人
-     */
+
+    @Schema(description = "申请人")
     private String applyPerson;
-    /**
-     * 申请单位
-     */
+
+    @Schema(description = "申请单位")
     private String applyUnit;
-    /**
-     * 申请时间
-     */
+
+    @Schema(description = "申请时间")
     private LocalDateTime applyTime;
-    /**
-     * 预计退还时间
-     */
+
+    @Schema(description = "预计退还时间")
     private String returnExpect;
-    /**
-     * 审批人
-     */
+
+    @Schema(description = "审批人")
     private String reviewPerson;
-    /**
-     * 状态
-     */
+
+    @Schema(description = "状态")
     private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
+
+    @Schema(description = "点收人")
     private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
 }

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.museum.dal.database.museumflow;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -19,86 +20,66 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class MuseumFlowDO extends BaseDO {
-    /**
-     * 样品ID
-     */
+
     @TableId
+    @Schema(description = "样品ID")
     private Integer id;
-    /**
-     * 样品编号
-     */
+
+    @Schema(description = "样品编号")
     private String number;
-    /**
-     * 样品名称
-     */
+
+    @Schema(description = "尺寸")
     private String sampleName;
-    /**
-     * 出库人员
-     */
+
+    @Schema(description = "样品名称")
     private String outboundPerson;
-    /**
-     * 出库时间
-     */
+
+    @Schema(description = "出库时间")
     private LocalDateTime outboundTime;
-    /**
-     * 目的
-     */
+
+    @Schema(description = "目的")
     private String purpose;
-    /**
-     * 出库附件
-     */
+
+    @Schema(description = "出库附件")
     private String annexOut;
-    /**
-     * 申请人
-     */
+
+    @Schema(description = "申请人")
     private String applyPerson;
-    /**
-     * 申请单位
-     */
+
+    @Schema(description = "申请单位")
     private String applyUnit;
-    /**
-     * 申请时间
-     */
+
+    @Schema(description = "申请时间")
     private LocalDateTime applyTime;
-    /**
-     * 预计退还时间
-     */
+
+    @Schema(description = "预计退还时间")
     private String returnExpect;
-    /**
-     * 审批人
-     */
+
+    @Schema(description = "审批人")
     private String reviewPerson;
-    /**
-     * 状态
-     */
+
+    @Schema(description = "状态")
     private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
+
+    @Schema(description = "点收人")
     private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
 }