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

@@ -53,14 +53,14 @@ public class MuseumFlowController {
     }
 
     @PostMapping("/1")
-    @Operation(summary = "1")
+    @Operation(summary = "添加出库单")
     public CommonResult<Boolean>  createMuseumFlowState(@RequestBody MuseumFlowSaveVO saveVO){
         String sample_id=saveVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         if(result == null){
             return CommonResult.error(200,"样品不存在");
         }
-        int condition=result.getSave();
+        int condition=result.getState();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
         if(condition == 0){
             return CommonResult.error(200,"样品不在库中");
@@ -81,7 +81,61 @@ public class MuseumFlowController {
         return  museumFlowService.selectPageS(pageVO);
     }
 
+    @PostMapping("/review")
+    @Operation(summary = "新增通过的审批单")
+    public CommonResult<Boolean> createMuseumAFlowReview(@RequestBody MuseumFlowSaveVO saveVO) {
+        String sample_id = saveVO.getNumber();
+        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        if (result == null) {
+            return CommonResult.error(200, "样品不存在");
+        }
+        int condition = result.getCondition();
+        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
+        if (condition == 4) {
+            return CommonResult.error(200, "样品审批已被驳回");
+        }
+        else if (condition == 3) {
+            return CommonResult.error(200, "样品已审批通过");
+        }
+        else if (condition == 1) {
+            return CommonResult.error(200, "样品并未申请出库");
+        }
+        else if (condition == 2) {
+            museumFlowService.createMuseumFlow(saveVO);
+            museumFlowService.updateMuseumFlowState3(saveVO);
+            return CommonResult.success(true);
+        }
+        else {
+            return CommonResult.error(200,"样品已审批通过并出库");
+        }
+    }
 
-
-
-}
+    @PostMapping("/reject")
+    @Operation(summary = "新增拒绝的审批单")
+    public CommonResult<Boolean> createMuseumAFlowReject(@RequestBody MuseumFlowSaveVO saveVO) {
+        String sample_id = saveVO.getNumber();
+        MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        if (result == null) {
+            return CommonResult.error(200, "样品不存在");
+        }
+        int condition = result.getCondition();
+        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
+        if (condition == 4) {
+            return CommonResult.error(200, "样品审批已被驳回");
+        }
+        else if (condition == 3) {
+            return CommonResult.error(200, "样品已审批通过");
+        }
+        else if (condition == 1) {
+            return CommonResult.error(200, "样品并未申请出库");
+        }
+        else if (condition == 2) {
+            museumFlowService.createMuseumFlow(saveVO);
+            museumFlowService.updateMuseumFlowState4(saveVO);
+            return CommonResult.success(true);
+        }
+        else {
+            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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 
 @Schema(description ="博物馆-申请表分页")
@@ -15,48 +16,87 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 public class MuseumFlowPageVO extends PageParam {
-
+    /**
+     * 样品ID
+     */
     private Integer id;
-
+    /**
+     * 样品编号
+     */
     @Schema(description = "标本编号")
     private String number;
-
+    /**
+     * 样品名称
+     */
     private String sampleName;
-
-    @Schema(description = "出库员")
+    /**
+     * 出库人员
+     */
+    @NotEmpty(message = "出库员不能为空")
     private String outboundPerson;
-
-    @Schema(description = "出库时间")
+    /**
+     * 出库时间
+     */
     private LocalDateTime[] outboundTime;
-
+    /**
+     * 目的
+     */
     private String purpose;
-
+    /**
+     * 出库附件
+     */
     private String annexOut;
-
+    /**
+     * 申请人
+     */
     private String applyPerson;
-
+    /**
+     * 申请单位
+     */
     private String applyUnit;
-
+    /**
+     * 申请时间
+     */
     private LocalDateTime applyTime;
-
+    /**
+     * 预计退还时间
+     */
     private String returnExpect;
-
+    /**
+     * 审批人
+     */
     private String reviewPerson;
-
+    /**
+     * 状态
+     */
     private Integer state;
-
+    /**
+     * 审批时间
+     */
     private LocalDateTime reviewTime;
-
+    /**
+     * 拒绝原因
+     */
     private String rejectSeason;
-
+    /**
+     * 退还员
+     */
     private String returnPerson;
-
+    /**
+     * 退还时间
+     */
     private LocalDateTime returnTime;
-
+    /**
+     * 点收人
+     */
     private String receviePerson;
-
+    /**
+     * 回库附件
+     */
     private String annexReturn;
-
+    /**
+     * 备注
+     */
     private String nots;
 
 }

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

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

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

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

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

@@ -19,46 +19,86 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class MuseumFlowDO extends BaseDO {
-
+    /**
+     * 样品ID
+     */
     @TableId
     private Integer id;
-
+    /**
+     * 样品编号
+     */
     private String number;
-
+    /**
+     * 样品名称
+     */
     private String sampleName;
-
+    /**
+     * 出库人员
+     */
     private String outboundPerson;
-
+    /**
+     * 出库时间
+     */
     private LocalDateTime outboundTime;
-
+    /**
+     * 目的
+     */
     private String purpose;
-
+    /**
+     * 出库附件
+     */
     private String annexOut;
-
+    /**
+     * 申请人
+     */
     private String applyPerson;
-
+    /**
+     * 申请单位
+     */
     private String applyUnit;
-
+    /**
+     * 申请时间
+     */
     private LocalDateTime applyTime;
-
+    /**
+     * 预计退还时间
+     */
     private String returnExpect;
-
+    /**
+     * 审批人
+     */
     private String reviewPerson;
-
+    /**
+     * 状态
+     */
     private Integer state;
-
+    /**
+     * 审批时间
+     */
     private LocalDateTime reviewTime;
-
+    /**
+     * 拒绝原因
+     */
     private String rejectSeason;
-
+    /**
+     * 退还员
+     */
     private String returnPerson;
-
+    /**
+     * 退还时间
+     */
     private LocalDateTime returnTime;
-
+    /**
+     * 点收人
+     */
     private String receviePerson;
-
+    /**
+     * 回库附件
+     */
     private String annexReturn;
-
+    /**
+     * 备注
+     */
     private String nots;
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museuminfo/MuseumInfoDO.java

@@ -85,6 +85,10 @@ public class MuseumInfoDO extends BaseDO {
      * 来源
      */
     private String origin;
+    /**
+     * 标本提供者
+     */
+    private String offerMan;
     /**
      * 描述
      */
@@ -92,58 +96,30 @@ public class MuseumInfoDO extends BaseDO {
     /**
      * 馆藏状态
      */
-    private Integer save;
-    /**
-     * 入藏时间
-     */
-    private String saveTime;
-    /**
-     * 用途
-     */
-    private String Use;
-    /**
-     * 资产号
-     */
-    private String fundId;
-    /**
-     * 删除原因
-     */
-    private String reason;
-    /**
-     * 标本图片
-     */
-    private String picture;
-    /**
-     * 备注
-     */
-    private String sampleTip;
+//    private Integer condition;
+//    /**
+//     * 入藏时间
+//     */
+//    private String joinTime;
+//    /**
+//     * 用途
+//     */
+//    private String useWay;
+//    /**
+//     * 资产号
+//     */
+//    private String moneyId;
+//    /**
+//     * 删除原因
+//     */
+//    private String deleteReason;
+//    /**
+//     * 标本图片
+//     */
+//    private String samplePicture;
+//    /**
+//     * 备注
+//     */
+//    private String tip;
 
 }
-///**
-// * 馆藏状态
-// */
-//private Integer condition;
-///**
-// * 入藏时间
-// */
-//private String joinTime;
-///**
-// * 用途
-// */
-//private String useWay;
-///**
-// * 资产号
-// */
-//private String moneyId;
-///**
-// * 删除原因
-// */
-//private String deleteReason;
-///**
-// * 标本图片
-// */
-//private String samplePicture;
-///**
-// * 备注
-// */
-//private String tip;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.java

@@ -35,8 +35,15 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     @Update("UPDATE museum_outbound SET state=0  WHERE number =#{number}")
     void updateMuseumFlowState(MuseumFlowDO museumFlowDO);
 
+///**将样品状态更新为4**/
+    @Update("UPDATE museum_outbound SET state=4 WHERE number =#{number}")
+    void updateMuseumFlowState4(MuseumFlowDO museumFlowDO);
 
+///**将样品状态更新为4**/
+    @Update("UPDATE museum_outbound SET state=3 WHERE number =#{number}")
+    void updateMuseumFlowState3(MuseumFlowDO museumFlowDO);
 
+/**分页**/
    default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
 
    default PageResult<MuseumFlowDO> selectPage1(MuseumFlowPageVO pageVO){

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowService.java

@@ -39,9 +39,19 @@ public interface MuseumFlowService {
 
     /**
      * 将样品状态设置为1
-    * */
+     * */
     void updateMuseumFlowState(MuseumFlowSaveVO saveVO);
 
+    /**
+     * 将样品状态设置为4
+     * */
+    void updateMuseumFlowState4(MuseumFlowSaveVO saveVO);
+
+    /**
+     * 将样品状态设置为3
+     * */
+    void updateMuseumFlowState3(MuseumFlowSaveVO saveVO);
+
     /**
      * 根据出库员进行分页查找
      * */

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumflow/MuseumFlowServiceImpl.java

@@ -53,6 +53,17 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
         museumFlowMapper.updateMuseumFlowState(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
     }
 
+    /**将样品状态设置为4*/
+    @Override
+    public  void updateMuseumFlowState4(MuseumFlowSaveVO saveVO){
+        museumFlowMapper.updateMuseumFlowState4(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    }
+
+    /**将样品状态设置为3*/
+    @Override
+    public  void updateMuseumFlowState3(MuseumFlowSaveVO saveVO){
+        museumFlowMapper.updateMuseumFlowState3(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    }
 
     @Override
     public List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO){