Merge branch 'master' of http://gogs.gisvg.com/lsq/museum-java

# Conflicts:
#	yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/PictureGroupController.java

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

@@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.museum.controller.admin.museumflow;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowPageVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowRespVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.*;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.service.museumflow.MuseumFlowService;
@@ -25,52 +23,50 @@ public class MuseumFlowController {
     private MuseumFlowService museumFlowService;
 
     @PostMapping("/create")
-    @Operation(summary = "新增标本")
+    @Operation(summary = "新增表单")
     public Integer createMuseumFlow(MuseumFlowSaveVO saveVO) {
         return museumFlowService.createMuseumFlow(saveVO);
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新标本")
+    @Operation(summary = "更新表单")
     public CommonResult<Boolean> updateMuseumFlow(@RequestBody MuseumFlowSaveVO saveVO){
         museumFlowService.updateMuseumFlow(saveVO);
         return CommonResult.success(true);
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除标本")
+    @Operation(summary = "删除表单")
     public CommonResult<Boolean> deleteMuseumFlow(@RequestParam("id") Integer id){
         museumFlowService.deleteMuseumFlow(id);
         return CommonResult.success(true);
     }
 
     @GetMapping("/get")
-    @Operation(summary = "查找标本")
+    @Operation(summary = "查找表单")
     public CommonResult<MuseumFlowRespVO> getMuseumFlow(@RequestParam("id") Integer id){
         MuseumFlowDO result = museumFlowService.selectMuseumFlow(id);
         MuseumFlowRespVO result1 = BeanUtils.toBean(result,MuseumFlowRespVO.class);
         return CommonResult.success(result1);
     }
 
-    @PostMapping("/1")
+    @PostMapping("/Outbound")
     @Operation(summary = "添加出库单")
-    public CommonResult<Boolean>  createMuseumFlowState(@RequestBody MuseumFlowSaveVO saveVO){
+    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
         String sample_id=saveVO.getNumber();
+        String number=saveVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        MuseumFlowDO event =  museumFlowService.selectMuseumFlowNumber(number);
         if(result == null){
             return CommonResult.error(200,"样品不存在");
         }
-        int condition=result.getState();
-        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
-        if(condition == 0){
+        int Save=result.getSave();
+        if(Save == 0){
             return CommonResult.error(200,"样品不在库中");
         }
-        else if (condition == 2){
-            return CommonResult.error(200,"样品正在审批");
-        }
         else {
             museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowState(saveVO);
+            museumFlowService.updateMuseumFlowStateOutbound2(saveVO);
             return CommonResult.success(true);
         }
     }
@@ -83,59 +79,104 @@ public class MuseumFlowController {
 
     @PostMapping("/review")
     @Operation(summary = "新增通过的审批单")
-    public CommonResult<Boolean> createMuseumAFlowReview(@RequestBody MuseumFlowSaveVO saveVO) {
-        String sample_id = saveVO.getNumber();
+    public CommonResult<Boolean> createMuseumFlowReview(@RequestBody MuseumFlowReviewVO reviewVO) {
+        String sample_id = reviewVO.getNumber();
+        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为审批驳回
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
+        } else if (event == 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) {
+        else if (Save == 0) {
             return CommonResult.error(200, "样品并未申请出库");
+        } else if (Save == 1) {
+            if (State == 2) {
+                museumFlowService.createMuseumFlowReview(reviewVO);
+                museumFlowService.updateMuseumFlowStateReview3(reviewVO);
+                return CommonResult.success(true);
+            } else if (State == 3) {
+                return CommonResult.error(200, "样品已审批通过");
+            } else if (State == 4) {
+                return CommonResult.error(200, "样品审批已被驳回");
+            }
+        } else {
+            return CommonResult.error(200, "样品已审批通过并出库");
         }
-        else if (condition == 2) {
-            museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowState3(saveVO);
-            return CommonResult.success(true);
-        }
-        else {
-            return CommonResult.error(200,"样品已审批通过并出库");
-        }
+        return CommonResult.success(true);
     }
 
     @PostMapping("/reject")
-    @Operation(summary = "新增拒绝的审批单")
-    public CommonResult<Boolean> createMuseumAFlowReject(@RequestBody MuseumFlowSaveVO saveVO) {
-        String sample_id = saveVO.getNumber();
+    @Operation(summary = "新增驳回的审批单")
+    public CommonResult<Boolean> createMuseumFlowReject(@RequestBody MuseumFlowReviewVO reviewVO) {
+        String sample_id = reviewVO.getNumber();
+        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为审批驳回
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
+        } else if (event == null) {
+            return CommonResult.error(200, "样品在出入库的库中不存在");
+        }
+        else if (Save == 1) {
+            return CommonResult.error(200, "样品已出库");
+        } else if (Save == 0) {
+            if (State == 2) {
+                museumFlowService.createMuseumFlowReview(reviewVO);
+                museumFlowService.updateMuseumFlowStateReview4(reviewVO);
+                return CommonResult.success(true);
+            } else if (State == 3) {
+                return CommonResult.error(200, "样品已审批通过");
+            } else if (State == 4) {
+                return CommonResult.error(200, "样品审批已被驳回");
+            }
+        } else {
+            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,"样品已审批通过并出库");
+        return CommonResult.success(true);
+    }
+
+    @PostMapping("/return")
+    @Operation(summary = "新建回库单")
+    public CommonResult<Boolean> createMuseumFlowReturn(@RequestBody MuseumFlowReturnVO returnVO) {
+        String sample_id = returnVO.getNumber();
+        String number = returnVO.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为审批驳回
+        if (result == null) {
+            return CommonResult.error(200, "样品不存在");
+        } else if (event == null) {
+            return CommonResult.error(200, "样品在出入库的库中不存在");
+        }
+         if (Save == 1) {
+            return CommonResult.error(200, "样品已出库");
+        } else if (Save == 0) {
+            if (State == 2) {
+                museumFlowService.createMuseumFlowReturn(returnVO);
+                museumFlowService.updateMuseumFlowSave0(returnVO);
+                return CommonResult.success(true);
+            } else if (State == 3) {
+                return CommonResult.error(200, "样品已审批通过");
+            } else if (State == 4) {
+                return CommonResult.error(200, "样品审批已被驳回");
+            }
+        } else {
+            return CommonResult.error(200, "样品已审批通过并出库");
         }
+        return CommonResult.success(true);
     }
+
 }

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

@@ -1,102 +1,83 @@
 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;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 
-@Schema(description ="博物馆-申请表分页")
+@Schema(description ="博物馆-申请表分页 page VO")
 @Data
 @NoArgsConstructor
 @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;
-    /**
-     * 状态
-     */
-    private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批状态")
+    private Integer stateReview;
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
-    private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "点收人")
+    private String receivePerson;
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
+    @Schema(description = "状态")
+    private Integer state;
 }

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

@@ -4,93 +4,73 @@ 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
-     */
+
+    @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;
-    /**
-     * 状态
-     */
-    private Integer state;
-    /**
-     * 审批时间
-     */
-    private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "审批状态")
+    private Integer stateReview;
+
+    @Schema(description = "审批时间")
+    private LocalDateTime[] reviewTime;
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
-    private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "点收人")
+    private String receivePerson;
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
+    @Schema(description = "状态")
+    private Integer state;
 }

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

@@ -0,0 +1,76 @@
+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 java.time.LocalDateTime;
+
+@Schema(description = "博物馆-出库表信息 return VO")
+@Data
+public class MuseumFlowReturnVO {
+
+    @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 stateReview;
+
+    @Schema(description = "审批时间")
+    private LocalDateTime[] reviewTime;
+
+    @Schema(description = "拒绝原因")
+    private String rejectSeason;
+
+    @Schema(description = "退还员")
+    private String returnPerson;
+
+    @Schema(description = "退还时间")
+    private LocalDateTime returnTime;
+
+    @Schema(description = "点收人")
+    private String receivePerson;
+
+    @Schema(description = "回库附件")
+    private String annexReturn;
+
+    @Schema(description = "备注")
+    private String nots;
+
+    @Schema(description = "状态")
+    private Integer state;
+}

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

@@ -0,0 +1,64 @@
+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 java.time.LocalDateTime;
+
+@Schema(description = "博物馆-审批表信息 review VO")
+@Data
+public class MuseumFlowReviewVO {
+
+    @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 stateReview;
+
+    @Schema(description = "审批时间")
+    private LocalDateTime reviewTime;
+
+    @Schema(description = "拒绝原因")
+    private String rejectSeason;
+
+    @Schema(description = "备注")
+    private String nots;
+
+    @Schema(description = "状态")
+    private Integer state;
+}

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

@@ -1,96 +1,76 @@
 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 javax.validation.constraints.NotNull;
 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;
-    /**
-     * 出库时间
-     */
-    private LocalDateTime outboundTime;
-    /**
-     * 目的
-     */
+
+    @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;
-    /**
-     * 状态
-     */
-    private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批状态")
+    private Integer stateReview;
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
-    private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "点收人")
+    private String receivePerson;
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
+    @Schema(description = "状态")
+    private Integer state;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/MuseumInfoController.java

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -92,26 +94,80 @@ public class MuseumInfoController {
 //    Map<> 键值对
     @GetMapping("/sampleTypeCount")
     @Operation(summary = "标本类型计数")
-    public CommonResult<Map<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
-          Map<String,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
-//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4
-          Integer Type = sampleType;
-          result.put("标本类型:",Type);
-          return CommonResult.success(result);
+    public CommonResult<HashMap<Integer,Integer>> getMap(@RequestParam("sampleType") Integer sampleType) {
+        Integer result = museumInfoService.MuseumInfoBySampleType(sampleType);
+//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4>
+        HashMap<Integer, Integer> Sites = new HashMap<Integer, Integer>();
+        Integer Type = sampleType;
+        Sites.put(Type, result);
+        return CommonResult.success(Sites);
+
     }
+//        1(初版)
+//    public CommonResult<Map<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
+//        Map<String,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//        Integer Type = sampleType;
+//         result.put("标本类型:",Type);
+//        return CommonResult.success(result);
+
+
+//    2
+//    @GetMapping("/sampleTypeCount")
+//    @Operation(summary = "标本类型计数")
+//    public CommonResult<HashMap<Integer,List<Integer>>> getMap(@RequestParam("sampleType") Integer sampleType){
+//    List<Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//    HashMap<Integer,List<Integer>> Sites = new HashMap<Integer,List<Integer>>();
+//        Sites.put(1,result);
+//        Sites.put(2,result);
+//        Sites.put(3,result);
+//        Sites.put(4,result);
+//    return CommonResult.success(Sites);
+//
+//}
+//    3
+//@GetMapping("/sampleTypeCount")
+//@Operation(summary = "标本类型计数")
+//public CommonResult<HashMap<Integer,Integer>> getMap(@RequestParam("sampleType") Integer sampleType) {
+//    Integer result = museumInfoService.MuseumInfoBySampleType(sampleType);
+////          标本类型：矿石-1 岩石-2 矿物-3 陨石-4>
+//    HashMap<Integer, Integer> Sites = new HashMap<Integer, Integer>();
+//    Integer Type = sampleType;
+//    Sites.put(Type, result);
+//    return CommonResult.success(Sites);
+
+
+
 
     @GetMapping("/saveCount")
     @Operation(summary = "标本出入库状态计数")
-    public CommonResult<Map<String,Integer>> getSave(@RequestParam("save") Integer save){
-        Map<String,Integer> result =museumInfoService.MuseumInfoBySave(save);
+    public CommonResult<HashMap<Integer,Integer>> getSave(@RequestParam("save") Integer save){
+        Integer result1 =museumInfoService.MuseumInfoBySave(save);
 //        状态：在库-1 出库-0
+        HashMap<Integer, Integer> result2 = new HashMap<Integer, Integer>();
         Integer Condition = save;
-        result.put("状态",Condition);
-        return CommonResult.success(result);
+        result2.put(Condition,result1);
+        return CommonResult.success(result2);
+    }
+
+    @GetMapping("/originCount")
+    @Operation(summary = "标本来源计数")
+    public CommonResult<HashMap<Integer,Integer>> getOrigin(@RequestParam("origin") Integer origin){
+        Integer result1 =museumInfoService.MuseumInfoByOrigin(origin);
+//        来源：采购-1 捐赠-2 采集-3
+        HashMap<Integer, Integer> result2 = new HashMap<Integer, Integer>();
+        Integer Origin = origin;
+//        LocalDateTime SampleSaveTime = sampleSaveTime;
+        result2.put(Origin, result1);
+
+        return CommonResult.success(result2);
     }
 
 
 
+
+
+
+
 //   public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
 //          MuseumTextRespVO DO =new MuseumTextRespVO();
 ////          Integer Ynmber =  selectMuseumInfoBySampleType(1)

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoRespVO.java

@@ -67,7 +67,7 @@ public class MuseumInfoRespVO {
     private Integer save;
 
     @Schema(description = "入馆时间")
-    private String saveTime;
+    private LocalDateTime sampleSaveTime;
 
     @Schema(description = "用途")
     private String Use;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museuminfo/vo/MuseumInfoSaveVO.java

@@ -64,7 +64,7 @@ public class MuseumInfoSaveVO {
     private Integer save;
 
     @Schema(description = "入馆时间")
-    private String saveTime;
+    private LocalDateTime sampleSaveTime;
 
     @Schema(description = "用途")
     private String Use;

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/MuseummodelController.java

@@ -34,6 +34,9 @@ public class MuseummodelController {
     @PostMapping("/create")
     @Operation(summary = "新增模型")
     public Integer createMuseumModel(@RequestBody MuseummodelSaveVO saveVO) {
+        if (saveVO == null) {
+            return -1;
+        }
         return museumModelService.createMuseumModel(saveVO);
     }
 
@@ -70,15 +73,15 @@ public class MuseummodelController {
 //        }
 //        return null;
 //    }
- //
 
-@GetMapping("/page")
-@Operation(summary = "获得模型分页")
-@PreAuthorize("@ss.hasPermission('system:tenant:query')")
-public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
-    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
-    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
-}
+
+//@GetMapping("/page")
+//@Operation(summary = "获得模型分页")
+//@PreAuthorize("@ss.hasPermission('system:tenant:query')")
+//public CommonResult<PageResult<MuseummodelRespVO>> getPage(@Valid MuseummodelPageReqVO pageVO) {
+//    PageResult<MuseummodelDO> pageResult = museumModelService.getMuseummodelPage(pageVO);
+//    return success(BeanUtils.toBean(pageResult,MuseummodelRespVO.class));
+//}
 
 }
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museummodel/vo/MuseummodelPageReqVO.java

@@ -23,6 +23,10 @@ public class MuseummodelPageReqVO extends PageParam {
     @Schema(description = "模型编号")
     private Integer specimenNumber;
 
+    //额外添加
+    @Schema(description = "模型类型")
+    private String specimenType;
+
     @Schema(description = "模型图片")
     private String modelPhoto;
 

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

@@ -39,7 +39,7 @@ public class MuseumPictureController {
     //          2.这里的新增是需要同时对照片组下新增多个的照片的，前端传的是个list的url，通过遍历调用上面的方法进行插入
 
     @PostMapping("/create")
-    @Operation(summary = "新增图片") 
+    @Operation(summary = "新增图片组图片")
     public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
         return museumPictureService.createMuseumPicture(saveVO);
     }
@@ -71,6 +71,19 @@ public class MuseumPictureController {
 //        }
     }
 
+    @GetMapping("/get")
+    @Operation(summary = "查找图片")
+    public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
+
+//        if (groupId==null) {
+//            return CommonResult.error(1,"没有符合的照片组图片");
+//        }else {
+        MuseumPictureDO result = museumPictureService.selectMuseumPicture(groupId);
+        MuseumPictureRespVO list1 = BeanUtils.toBean(result, MuseumPictureRespVO.class);
+        return CommonResult.success(list1);
+//        }
+    }
+
 
     @GetMapping("/page")
     @Operation(summary = "获得照片分页")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/PictureGroupController.java

@@ -1,67 +0,0 @@
-package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupRespVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
-import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
-import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
-import cn.iocoder.yudao.module.museum.service.museumpicture.PictureGroupService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "博物馆-图片组")
-@RestController
-@RequestMapping("/museum/pictureGroup")
-@Validated
-
-public class PictureGroupController {
-
-    @Resource
-    private PictureGroupService PictureGroupService;
-
-    @PostMapping("/create")
-    @Operation(summary = "新增图片组")
-    public Integer createPictureGroup(@RequestBody PictureGroupSaveVO saveVO){
-        return PictureGroupService.createPictureGroup(saveVO);
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新图片组")
-    public CommonResult<Boolean> updatePictureGroup(@RequestBody PictureGroupSaveVO saveVO) {
-        PictureGroupService.updatePictureGroup(saveVO);
-        return CommonResult.success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除标本")
-    public CommonResult<Boolean> deletePictureGroup(@RequestParam("id") Integer id){
-        PictureGroupService.deletePictureGroup(id);
-        return CommonResult.success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "查找图片组")
-    public CommonResult<PictureGroupRespVO> getPictureGroup(@RequestParam("id") Integer id) {
-        PictureGroupDO result = PictureGroupService.selectPictureGroup(id);
-        PictureGroupRespVO result1 = BeanUtils.toBean(result, PictureGroupRespVO.class);
-        return CommonResult.success(result1);
-    }
-    //TODO 需要一个查·
-
-    @GetMapping("/page")
-    @Operation(summary = "获得照片组分页")
-    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
-    public CommonResult<PageResult<PictureGroupRespVO>> getPictureGroupPage(@Validated PicturePageReqVO pageVO) {
-        PageResult<PictureGroupDO> pageResult = PictureGroupService.getPictureGroupPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, PictureGroupRespVO.class));
-    }
-}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/MuseumPictureRespVO.java

@@ -13,6 +13,6 @@ public class MuseumPictureRespVO {
 
     private Integer groupId;
 
-    private String picturePath;
+    private String pictureUrl;
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/controller/admin/museumpicture/vo/MuseumPictureSaveVO.java

@@ -14,6 +14,6 @@ public class MuseumPictureSaveVO {
 
     private Integer groupId;
 
-    private String picturePath;
+    private String pictureUrl;
 
 }

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,68 @@ 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;
-    /**
-     * 出库时间
-     */
-    private LocalDateTime outboundTime;
-    /**
-     * 目的
-     */
+
+    @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;
-    /**
-     * 状态
-     */
-    private Integer state;
-    /**
-     * 审批时间
-     */
+
+    @Schema(description = "审批状态")
+    private Integer stateReview;
+
+    @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
-    /**
-     * 拒绝原因
-     */
+
+    @Schema(description = "拒绝原因")
     private String rejectSeason;
-    /**
-     * 退还员
-     */
+
+    @Schema(description = "退还员")
     private String returnPerson;
-    /**
-     * 退还时间
-     */
+
+    @Schema(description = "退还时间")
     private LocalDateTime returnTime;
-    /**
-     * 点收人
-     */
-    private String receviePerson;
-    /**
-     * 回库附件
-     */
+
+    @Schema(description = "点收人")
+    private String receivePerson;
+
+    @Schema(description = "回库附件")
     private String annexReturn;
-    /**
-     * 备注
-     */
+
+    @Schema(description = "备注")
     private String nots;
 
+    @Schema(description = "状态")
+    private Integer state;
 }

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

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

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDO.java

@@ -30,7 +30,8 @@ public class MuseummodelDO extends BaseDO {
 
     @Schema(description = "模型编号")
     private String specimenNumber;
-    
+
+    @Schema(description = "模型类型")
     private String specimenType;
 
     @Schema(description = "模型图片")

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museummodel/MuseummodelDetailDO.java

@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.museum.dal.database.museummodel;
+
+import lombok.Data;
+
+
+    @Data
+    public class MuseummodelDetailDO extends MuseummodelDO{
+
+        private String deptName;
+
+}

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/database/museumpicture/MuseumPictureDO.java

@@ -24,5 +24,5 @@ public class MuseumPictureDO extends BaseDO {
 
     private Integer groupId;
 
-    private String picturePath;
+    private String pictureUrl;
 }

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

@@ -6,13 +6,11 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowPageVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
-import java.util.Collection;
 import java.util.List;
 
 @Mapper
@@ -27,25 +25,27 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     @Select("SELECT * FROM museum_outbound WHERE id = #{id} AND deleted =0 ")
     MuseumFlowDO selectMuseumFlowById(@Param("id") Integer id);
 
-/**根据编号在总表中进行查找**/
-    @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0 ")
+
+/**搜索功能
+
+    /**根据编号在总表中进行查找**/
+    @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0  AND deleted =0 ")
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
 
-/**将样品状态更新为1**/
-    @Update("UPDATE museum_outbound SET state=0  WHERE number =#{number}")
-    void updateMuseumFlowState(MuseumFlowDO museumFlowDO);
+    /**根据编号在Flow库中进行查找*/
+    @Select("SELECT * FROM museum_outbound WHERE number = #{id} AND deleted = 0 AND deleted =0 ")
+    MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
-///**将样品状态更新为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);}
+    /**将主库样品状态更新为1 已出库**/
+    @Update("UPDATE museum_info SET save=1  WHERE sample_id = #{sample_id} AND deleted =0 ")
+    void updateMuseumFlowSave1(MuseumFlowDO museumFlowDO);
 
+
+//   default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
+/**分页**/
    default PageResult<MuseumFlowDO> selectPage1(MuseumFlowPageVO pageVO){
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
@@ -62,6 +62,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 //               .inIfPresent(MuseumFlowDO::getId, id)
 //               .orderByDesc(MuseumFlowDO::getId));
    }
+    /**根据出库员进行分页查找*/
     default List<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
 
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
@@ -72,5 +73,24 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
         return selectList(queryWrapper);
     }
 
+/**审批功能
+
+    /**将样品状态更新为2 审批中**/
+    @Update("UPDATE museum_outbound SET state=2  WHERE number =#{number} AND deleted =0 ")
+    void updateMuseumFlowStateReview2(MuseumFlowDO MuseumFlowDO);
+
+    /**将样品状态更新为3 审批通过**/
+    @Update("UPDATE museum_outbound SET state=3  WHERE number =#{number} AND deleted =0 ")
+    void updateMuseumFlowStateReview3(MuseumFlowDO MuseumFlowDO);
+
+    /**将样品状态更新为4 审批驳回**/
+    @Update("UPDATE museum_outbound SET state=4  WHERE number =#{number} AND deleted =0 ")
+    void updateMuseumFlowStateReview4(MuseumFlowDO MuseumFlowDO);
+
+
+/**回库功能
 
+    /**将总库中样品状态更新为0 未出库或已回库**/
+    @Update("UPDATE museum_outbound SET save=0  WHERE number =#{number} AND deleted =0 ")
+    void updateMuseumFlowSave0(MuseumFlowDO MuseumFlowDO);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,15 +45,21 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0")
     List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
     /**
-     * 标本类型计数
+     * 标本类型计数1
      * */
     @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
-    Map<String,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    Integer countMuseumInfoBySampleType1(@Param("sampleType") Integer sampleType);
     /**
      * 标本出入库状态计数
      * */
     @Select("SELECT COUNT(*)  FROM museum_info  WHERE save =#{save} AND deleted =0")
-    Map<String,Integer> countMuseumInfoBySave(@Param("save") Integer save);
+    Integer countMuseumInfoBySave(@Param("save") Integer save);
+    /**
+     * 标本来源计数（年）
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info  WHERE origin =#{origin} AND deleted =0 AND sample_save_time >=2024-02-09 22:07:31")
+    Integer countMuseumInfoByOrigin (@Param("origin") Integer origin);
+
 
     default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
         LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museummodel/MuseummodelMapper.java

@@ -1,9 +1,13 @@
 package cn.iocoder.yudao.module.museum.dal.mysql.museummodel;
 
+import ch.qos.logback.core.status.Status;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museummodel.vo.MuseummodelPageReqVO;
 import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDO;
+import cn.iocoder.yudao.module.museum.dal.database.museummodel.MuseummodelDetailDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -21,5 +25,36 @@ public interface MuseummodelMapper extends BaseMapperX<MuseummodelDO> {
     @Select("SELECT * FROM museum_model WHERE id = #{id} AND deleted =0 ")
     MuseummodelDO selectMuseumModelById(@Param("id") Integer id);
 
-    PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO pageReqVO);
-}
+    //分页查询
+//    default PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseummodelDO>()
+//                .likeIfPresent(MuseummodelDO::getSpecimenName, reqVO.getSpecimenName())// 如果 SpecimenName 不为空，则进行 like 查询
+//                .likeIfPresent(MuseummodelDO::getSpecimenType, reqVO.getSpecimenType())
+//                .likeIfPresent(MuseummodelDO::getModelWay, reqVO.getModelWay())
+//                .likeIfPresent(MuseummodelDO::getRemark, reqVO.getRemark())
+//                .eqIfPresent(MuseummodelDO::getSpecimenNumber, reqVO.getSpecimenNumber()) // 如果 SpecimenNumber 不为空，则进行 = 查询
+//                .betweenIfPresent(MuseummodelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) // 如果 create 不为空，则进行 between 查询
+//                .orderByDesc(MuseummodelDO::getId)); // 按照 id 倒序
+    }
+
+    //联表查询
+//    default list<MuseummodelDetailDO> selectListByStatusAndDeptName(Integer status, String deptName) {
+//        return SelectJoinList(MuseummodelDO.class, new MPJLambdaWrapper<MuseummodelDO>()
+//                .selectAll(MuseummodelDO.class)// 查询 List
+//                .selectAs(DeptDO::getName, MuseummodelDetailDO::getDeptName)// 查询 system 表的 all 所有字段
+//                .eq(MuseummodelDO::getSpecimenNumber,Number)// 查询  表的 name 字段，使用  字段“部分”返回
+//                .leftJoin(DeptDO.class, DeptDO::getId, MuseummodelDO::getId)// 联表 WHERE system_users.dept_id = system_dept.id
+//                .eq(DeptDO.getName, deptName) // WHERE system_dept.name = ? 【用户状态为开启】
+//        );
+
+      /*   PageResult<MuseummodelDO> selectPage(MuseummodelPageReqVO pageReqVO);
+   }
+   */
+
+//    }
+//}
+
+
+
+
+

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumpicture/MuseumPictureMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Mapper
 public interface MuseumPictureMapper extends BaseMapperX<MuseumPictureDO> {
 
-    @Update("UPDATE museum_picture_dan SET picture_path=#{picture_path} WHERE picture_id =#{picture_id}")
+    @Update("UPDATE museum_picture_dan SET picture_url=#{picture_url} WHERE picture_id =#{picture_id}")
     void updateMuseumPicture(MuseumPictureDO museumPictureDO);
 
     @Update("UPDATE museum_picture_dan SET deleted=1  WHERE picture_id =#{picture_id}")

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

@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.museum.service.museumflow;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowPageVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowReturnVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowReviewVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface MuseumFlowService {
@@ -32,33 +33,53 @@ public interface MuseumFlowService {
     MuseumFlowDO selectMuseumFlow(Integer id);
 
 
-    /**
-     * 根据样本编号查找
-     * */
+/**搜索功能
+
+    /**根据标号在Flow库中进行查找*/
+    MuseumFlowDO selectMuseumFlowNumber(String number);
+
+    /**根据编号在总表中进行查找*/
     MuseumInfoDO selectMuseumFlowSampleId(String sample_id);
 
-    /**
-     * 将样品状态设置为1
-     * */
-    void updateMuseumFlowState(MuseumFlowSaveVO saveVO);
 
-    /**
-     * 将样品状态设置为4
-     * */
-    void updateMuseumFlowState4(MuseumFlowSaveVO saveVO);
+/**出库功能
 
-    /**
-     * 将样品状态设置为3
-     * */
-    void updateMuseumFlowState3(MuseumFlowSaveVO saveVO);
+    /**将主库中样品状态设置为1*/
+    void updateMuseumFlowSave1(MuseumFlowSaveVO saveVO);
 
-    /**
-     * 根据出库员进行分页查找
-     * */
-    List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);
+    /**将样品状态设置为2 审批中*/
+    void updateMuseumFlowStateOutbound2(MuseumFlowSaveVO saveVO);
 
-    /**
-     * 根据分页长度进行排序
-     * */
+
+/**分页功能
+
+    /**根据分页长度进行排序**/
     PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
+
+    /**根据出库员进行分页查找*/
+    List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);
+
+
+/**审批功能
+
+    /**新建审批单*/
+    Integer createMuseumFlowReview(MuseumFlowReviewVO reviewVO);
+
+    /**将样品状态设置为2 审批中*/
+    void updateMuseumFlowStateReview2(MuseumFlowReviewVO reviewVO);
+
+    /**将样品状态设置为2 审批通过*/
+    void updateMuseumFlowStateReview3(MuseumFlowReviewVO reviewVO);
+
+    /**将样品状态设置为2 审批驳回*/
+    void updateMuseumFlowStateReview4(MuseumFlowReviewVO reviewVO);
+
+
+/**回库功能
+
+    /**新建出库单**/
+    Integer createMuseumFlowReturn(MuseumFlowReturnVO returnVO);
+
+    /**将主库中样品状态设置为1*/
+    void updateMuseumFlowSave0(MuseumFlowReturnVO returnVO);
 }

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

@@ -2,13 +2,13 @@ package cn.iocoder.yudao.module.museum.service.museumflow;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowPageVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowReturnVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowReviewVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.mysql.museumflow.MuseumFlowMapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -42,36 +42,88 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
         return museumFlowMapper.selectMuseumFlowById(id);
     }
 
-    /**根据样本编号查找**/
+
+/**搜索功能
+
+    /**根据编号在总表中进行查找**/
     public MuseumInfoDO selectMuseumFlowSampleId(String sample_id) {
         return museumFlowMapper.selectMuseumFlowBySampleId(sample_id);
     }
 
-    /**将样品状态设置为1*/
-    @Override
-    public void updateMuseumFlowState(MuseumFlowSaveVO saveVO){
-        museumFlowMapper.updateMuseumFlowState(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    /**根据编号在Flow库中进行查找**/
+    public MuseumFlowDO selectMuseumFlowNumber(String number){
+        return museumFlowMapper.selectMuseumFlowByNumber(number);
     }
 
-    /**将样品状态设置为4*/
+/**出库功能
+
+    /**将主库中样品状态设置为1*/
     @Override
-    public  void updateMuseumFlowState4(MuseumFlowSaveVO saveVO){
-        museumFlowMapper.updateMuseumFlowState4(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    public void updateMuseumFlowSave1(MuseumFlowSaveVO saveVO){
+        museumFlowMapper.updateMuseumFlowSave1(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
     }
 
-    /**将样品状态设置为3*/
-    @Override
-    public  void updateMuseumFlowState3(MuseumFlowSaveVO saveVO){
-        museumFlowMapper.updateMuseumFlowState3(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    /**将样品状态设置为2 审批中*/
+    public void updateMuseumFlowStateOutbound2(MuseumFlowSaveVO saveVO){
+        museumFlowMapper.updateMuseumFlowStateReview2(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
     }
 
+
+
+    /**根据出库员进行分页查找*/
     @Override
     public List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO){
         return museumFlowMapper.selectPageMuseumFlowByOutboundPerson(pageVO);
     }
 
+
+/**分页功能
+
+    /**根据分页长度进行排序**/
     @Override
     public PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
         return  museumFlowMapper.selectPage1(pageVO);
     }
-}
+
+
+/**审批功能
+
+    /**新建审批单**/
+    @Override
+    public Integer createMuseumFlowReview(MuseumFlowReviewVO reviewVO){
+    MuseumFlowDO result = BeanUtils.toBean(reviewVO, MuseumFlowDO.class);
+    return museumFlowMapper.insert(result);
+    }
+
+    /**将样品状态设置为2 审批中*/
+    @Override
+    public void updateMuseumFlowStateReview2(MuseumFlowReviewVO reviewVO){
+        museumFlowMapper.updateMuseumFlowStateReview2(BeanUtils.toBean(reviewVO,MuseumFlowDO.class));
+    }
+    /**将样品状态设置为3 审批通过*/
+    @Override
+    public void updateMuseumFlowStateReview3(MuseumFlowReviewVO reviewVO){
+        museumFlowMapper.updateMuseumFlowStateReview3(BeanUtils.toBean(reviewVO,MuseumFlowDO.class));
+    }
+    /**将样品状态设置为4 审批驳回*/
+    @Override
+    public void updateMuseumFlowStateReview4(MuseumFlowReviewVO reviewVO){
+        museumFlowMapper.updateMuseumFlowStateReview4(BeanUtils.toBean(reviewVO,MuseumFlowDO.class));
+    }
+
+
+/**出库功能
+
+    /**新建出库单**/
+    @Override
+    public Integer createMuseumFlowReturn(MuseumFlowReturnVO returnVO){
+        MuseumFlowDO result = BeanUtils.toBean(returnVO, MuseumFlowDO.class);
+        return museumFlowMapper.insert(result);
+    }
+
+    /**将主库中样品状态设置为1*/
+    @Override
+    public void updateMuseumFlowSave0(MuseumFlowReturnVO returnVO){
+        museumFlowMapper.updateMuseumFlowSave0(BeanUtils.toBean(returnVO,MuseumFlowDO.class));
+    }
+ }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoService.java

@@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.museum.service.museuminfo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,9 +51,13 @@ public interface MuseumInfoService {
    /**
     * 标本类型计数
     * */
-   Map<String,Integer> MuseumInfoBySampleType(Integer sampleType);
+   Integer MuseumInfoBySampleType(Integer sampleType);
    /**
     * 标本出入库状态计数
     * */
-   Map<String,Integer> MuseumInfoBySave(Integer save);
+   Integer MuseumInfoBySave(Integer save);
+   /**
+    * 标本来源计数（年）
+    * */
+   Integer MuseumInfoByOrigin(Integer origin);
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museuminfo/MuseumInfoServiceImpl.java

@@ -3,12 +3,14 @@ package cn.iocoder.yudao.module.museum.service.museuminfo;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.mysql.museuminfo.MuseumInfoMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -82,16 +84,23 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 标本类型计数
     * */
    @Override
-   public Map<String,Integer> MuseumInfoBySampleType(Integer sampleType){
-      return museumInfoMapper.countMuseumInfoBySampleType(sampleType);
+   public Integer MuseumInfoBySampleType(Integer sampleType){
+      return museumInfoMapper.countMuseumInfoBySampleType1(sampleType);
    }
    /**
     * 标本出入库状态计数
     * */
    @Override
-   public Map<String,Integer> MuseumInfoBySave(Integer save) {
+   public Integer MuseumInfoBySave(Integer save) {
       return museumInfoMapper.countMuseumInfoBySave(save);
    }
+   /**
+    * 标本来源计数（年）
+    * */
+   @Override
+   public Integer MuseumInfoByOrigin(Integer origin) {
+      return museumInfoMapper.countMuseumInfoByOrigin(origin);
+   }
 }
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelService.java

@@ -36,7 +36,7 @@ public interface MuseummodelService {
     * @param pageReqVO 分页查询
     * @return 分页
     */
-   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
+//   PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO);
 
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museummodel/MuseummodelServiceImpl.java

@@ -41,10 +41,10 @@ public  class MuseummodelServiceImpl implements MuseummodelService {
       return museumModelMapper.selectMuseumModelById(id);
    }
 
-   @Override
-   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
-      return museumModelMapper.selectPage(pageReqVO);
-   }
+//   @Override
+//   public PageResult<MuseummodelDO> getMuseummodelPage(MuseummodelPageReqVO pageReqVO) {
+//      return museumModelMapper.selectPage(pageReqVO);
+//   }
 
 
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/MuseumPictureServiceImpl.java

@@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.MuseumPictureMappe
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
 
 @Service
 public  class MuseumPictureServiceImpl implements MuseumPictureService {
@@ -16,9 +18,24 @@ public  class MuseumPictureServiceImpl implements MuseumPictureService {
     @Resource
     private MuseumPictureMapper museumPictureMapper;
 
+//    @Override
+//    public Integer createMuseumPicture(MuseumPictureSaveVO saveVO){
+//        return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
+//    }
+
     @Override
-    public Integer createMuseumPicture(MuseumPictureSaveVO saveVO){
-        return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
+    public Integer createMuseumPicture(MuseumPictureSaveVO saveVO) {
+        Integer photoGroupId = saveVO.getGroupId();
+        List<String> urls = Collections.singletonList(saveVO.getPictureUrl());
+
+        for (String url : urls) {
+            MuseumPictureSaveVO museumPicture = new MuseumPictureSaveVO();
+            museumPicture.setGroupId(photoGroupId);
+            museumPicture.setPictureUrl(url);
+            return museumPictureMapper.insert(BeanUtils.toBean(saveVO, MuseumPictureDO.class));
+        }
+
+        return photoGroupId; // 返回照片组ID作为操作成功的标识
     }
 
     @Override

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/service/museumpicture/PictureGroupService.java

@@ -25,5 +25,5 @@ public interface PictureGroupService {
      * */
     PictureGroupDO selectPictureGroup(Integer id);
 
-    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
+//    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
 }