Merge remote-tracking branch 'origin/master'

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

@@ -25,47 +25,47 @@ 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")
-    @Operation(summary = "1")
+    @PostMapping("/Outbound")
+    @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 Save=result.getSave();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
-        if(condition == 0){
+        if(Save == 0){
             return CommonResult.error(200,"样品不在库中");
         }
-        else if (condition == 2){
+        else if (Save == 2){
             return CommonResult.error(200,"样品正在审批");
         }
         else {
@@ -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 Save = result.getSave();
+        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
+        if (Save == 4) {
+            return CommonResult.error(200, "样品审批已被驳回");
+        }
+        else if (Save == 3) {
+            return CommonResult.error(200, "样品已审批通过");
+        }
+        else if (Save == 1) {
+            return CommonResult.error(200, "样品并未申请出库");
+        }
+        else if (Save == 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 Save = result.getSave();
+        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
+        if (Save == 4) {
+            return CommonResult.error(200, "样品审批已被驳回");
+        }
+        else if (Save == 3) {
+            return CommonResult.error(200, "样品已审批通过");
+        }
+        else if (Save == 1) {
+            return CommonResult.error(200, "样品并未申请出库");
+        }
+        else if (Save == 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

@@ -1,12 +1,14 @@
 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 ="博物馆-申请表分页")
@@ -16,47 +18,65 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class MuseumFlowPageVO extends PageParam {
 
+    @TableId
+    @Schema(description = "样品ID")
     private Integer id;
 
-    @Schema(description = "标本编号")
+    @Schema(description = "样品编号")
     private String number;
 
+    @Schema(description = "尺寸")
     private String sampleName;
 
-    @Schema(description = "出库员")
+    @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

@@ -1,53 +1,75 @@
 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 {
 
+    @TableId
+    @Schema(description = "样品ID")
     private Integer id;
 
-    @Schema(description = "标本编号")
+    @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;
 
 }

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;
 
@@ -11,46 +12,65 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumFlowSaveVO {
 
+    @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/museuminfo/MuseumInfoController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -47,7 +48,7 @@ public class MuseumInfoController {
     public CommonResult<Boolean> updateMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
         museumInfoService.updateMuseumInfo(saveVO);
         return CommonResult.success(true);
-//         saveVO.setSampleType(1);
+
 
     }
 
@@ -56,17 +57,16 @@ public class MuseumInfoController {
     @Operation(summary = "删除标本")
     public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id,@RequestParam("reason") String reason){
         museumInfoService.deleteMuseumInfo(id,reason);
-
-//        result.put("删除原因：",提取方法…);
+//        result.put("删除原因：",);
         return CommonResult.success(true);
     }
 
 
     @GetMapping("/get")
     @Operation(summary = "id查找")
-    public CommonResult<List<MuseumInfoRespVO>> selectMuseumInfo(@RequestParam("id") Integer id){
-        List<MuseumInfoDO> result = museumInfoService.selectMuseumInfo(id);
-        List<MuseumInfoRespVO> result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
+    public CommonResult<MuseumInfoRespVO> selectMuseumInfo(@RequestParam("id") Integer id){
+        MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
+        MuseumInfoRespVO result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
       return CommonResult.success(result1);
     }
 
@@ -90,13 +90,28 @@ public class MuseumInfoController {
 //            返回某种标本类型的List数组
 //            Integer
 //    Map<> 键值对
+    @GetMapping("/sampleTypeCount")
+    @Operation(summary = "标本类型计数")
+    public CommonResult<Map<MuseumInfoRespVO,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
+          Map<MuseumInfoRespVO,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+//          标本类型：矿石-1 岩石-2 矿物-3 陨石-4
+//          Integer Type = sampleType;
+//          result.put(Type);
+//        "标本类型:"
+          return CommonResult.success(result);
+    }
+
+    @GetMapping("/saveCount")
+    @Operation(summary = "标本出入库状态计数")
+    public CommonResult<Map<String,Integer>> getSave(@RequestParam("save") Integer save){
+        Map<String,Integer> result =museumInfoService.MuseumInfoBySave(save);
+//        状态：在库-1 出库-0
+        Integer Condition = save;
+        result.put("状态",Condition);
+        return CommonResult.success(result);
+    }
+
 
-//    public CommonResult<Map<String,Integer>> getMap(@RequestParam("id") Integer id){
-//          Map<String,Integer> result =new HashMap<>();
-//          Integer Ynmber = null;
-//          result.put("陨石数量",Ynmber);
-//          return CommonResult.success(result);
-//    }
 
 //   public CommonResult<MuseumTextRespVO> getdo(@RequestParam("id") Integer id){
 //          MuseumTextRespVO DO =new MuseumTextRespVO();

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

@@ -34,7 +34,7 @@ public class MuseumPictureController {
     private PicturePageReqVO pageVO;
 
     @PostMapping("/create")
-    @Operation(summary = "新增图片") 
+    @Operation(summary = "新增图片组图片")
     public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
         return museumPictureService.createMuseumPicture(saveVO);
     }
@@ -66,6 +66,19 @@ public class MuseumPictureController {
 //        }
     }
 
+    @GetMapping("/get")
+    @Operation(summary = "查找图片")
+    public CommonResult<MuseumPictureRespVO> getMuseumPictureGroup(@RequestParam("groupId") Integer groupId) {
+
+//        if (pictureId==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,21 +1,26 @@
 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/picture group")
+@RequestMapping("/museum/pictureGroup")
 @Validated
 
 public class PictureGroupController {
@@ -51,4 +56,11 @@ public class PictureGroupController {
         return CommonResult.success(result1);
     }
 
+    @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;
@@ -21,44 +22,64 @@ import java.time.LocalDateTime;
 public class MuseumFlowDO extends BaseDO {
 
     @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;
 
 }

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

@@ -119,31 +119,3 @@ public class MuseumInfoDO extends BaseDO {
     private String sampleTip;
 
 }
-///**
-// * 馆藏状态
-// */
-//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/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

@@ -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/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;
@@ -13,6 +14,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
@@ -30,21 +32,27 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
      * 查询标本
      * */
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
-    List<MuseumInfoDO> selectMuseumInfoById(@Param("id") Integer id);
+    MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
     /**
      * 查询标本编号
      * */
-    @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} ")
+    @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} AND deleted =0")
     MuseumInfoDO getMuseumInfoBySampleId(@Param("sampleId") String sampleId);
     /**
      * 查询标本类型
      */
-    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType}")
+    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0")
     List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
-
-//    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
-//    Integer countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
-
+    /**
+     * 标本类型计数
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
+    Map<MuseumInfoRespVO,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    /**
+     * 标本出入库状态计数
+     * */
+    @Select("SELECT COUNT(*)  FROM museum_info  WHERE save =#{save} AND deleted =0")
+    Map<String,Integer> countMuseumInfoBySave(@Param("save") Integer save);
 
     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/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){

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

@@ -2,12 +2,14 @@ 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.List;
+import java.util.Map;
 
 @Service
 public interface MuseumInfoService {
@@ -28,7 +30,7 @@ public interface MuseumInfoService {
    /**
     * 查询标本
     * */
-   List<MuseumInfoDO> selectMuseumInfo (Integer id);
+   MuseumInfoDO selectMuseumInfo (Integer id);
 
    /**
     * 查询标本编号
@@ -45,4 +47,12 @@ public interface MuseumInfoService {
     * @return 分页列表
     */
     PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO);
+   /**
+    * 标本类型计数
+    * */
+   Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType);
+   /**
+    * 标本出入库状态计数
+    * */
+   Map<String,Integer> MuseumInfoBySave(Integer save);
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
@@ -41,8 +43,8 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     */
    @Override
    public void deleteMuseumInfo(Integer id,String reason) {
-//      museumInfoMapper.deleteMuseumInfo(id);
-      museumInfoMapper.deleteById(id);
+      museumInfoMapper.deleteMuseumInfo(id,reason);
+//      museumInfoMapper.deleteById(id);
    }
    /**
     * 删除标本
@@ -52,7 +54,7 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 查询标本id
     */
    @Override
-   public List<MuseumInfoDO> selectMuseumInfo(Integer id) {
+   public MuseumInfoDO selectMuseumInfo(Integer id) {
       return museumInfoMapper.selectMuseumInfoById(id);
    }
 
@@ -77,8 +79,20 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO){
       return museumInfoMapper.selectPage(pageReqVO);
    }
-
-
+   /**
+    * 标本类型计数
+    * */
+   @Override
+   public Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType){
+      return museumInfoMapper.countMuseumInfoBySampleType(sampleType);
+   }
+   /**
+    * 标本出入库状态计数
+    * */
+   @Override
+   public Map<String,Integer> MuseumInfoBySave(Integer save) {
+      return museumInfoMapper.countMuseumInfoBySave(save);
+   }
 }
 
 

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

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.museum.service.museumpicture;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 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 org.springframework.stereotype.Service;
 
@@ -23,4 +25,5 @@ public interface PictureGroupService {
      * */
     PictureGroupDO selectPictureGroup(Integer id);
 
+    PageResult<PictureGroupDO> getPictureGroupPage(PicturePageReqVO pageVO);
 }