Merge remote-tracking branch 'origin/master'

pom.xml

@@ -17,7 +17,8 @@
         <module>yudao-module-infra</module>
 <!--        <module>yudao-server/src/main/yudao-module-museum</module>-->
         <module>yudao-module-museum</module>
-<!--        <module>yudao-module-museum/yudao-module-museum-biz</module>-->
+<!--        <module>yudao-module-museum/yudao-module-museum-biz/scr/java</module>-->
+        <!--        <module>yudao-module-museum/yudao-module-museum-biz</module>-->
         <!--        <module>yudao-module-member</module>-->
 <!--        <module>yudao-module-bpm</module>-->
 <!--        <module>yudao-module-report</module>-->
@@ -166,9 +167,9 @@
             </releases>
         </repository>
     </repositories>
-    <dependency>
-        <grouId>cn.iocoder.boot</grouId>
-        <artifactId>yudao-module-museum-biz</artifactId>
-        <version>${revision}</version>
-    </dependency>
+<!--    <dependency>-->
+<!--        <grouId>cn.iocoder.boot</grouId>-->
+<!--        <artifactId>yudao-module-museum-biz</artifactId>-->
+<!--        <version>${revision}</version>-->
+<!--    </dependency>-->
 </project>

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

@@ -0,0 +1,87 @@
+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.dal.database.museumflow.MuseumFlowDO;
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
+import cn.iocoder.yudao.module.museum.service.museumflow.MuseumFlowService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+@Tag(name = "博物馆-出回库管理")
+@RestController
+@RequestMapping("/museum/flow")
+public class MuseumFlowController {
+
+    @Resource
+    private MuseumFlowService museumFlowService;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增标本")
+    public Integer createMuseumFlow(MuseumFlowSaveVO saveVO) {
+        return museumFlowService.createMuseumFlow(saveVO);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新标本")
+    public CommonResult<Boolean> updateMuseumFlow(@RequestBody MuseumFlowSaveVO saveVO){
+        museumFlowService.updateMuseumFlow(saveVO);
+        return CommonResult.success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除标本")
+    public CommonResult<Boolean> deleteMuseumFlow(@RequestParam("id") Integer id){
+        museumFlowService.deleteMuseumFlow(id);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @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")
+    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();
+        //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
+        if(condition == 0){
+            return CommonResult.error(200,"样品不在库中");
+        }
+        else if (condition == 2){
+            return CommonResult.error(200,"样品正在审批");
+        }
+        else {
+            museumFlowService.createMuseumFlow(saveVO);
+            museumFlowService.updateMuseumFlowState(saveVO);
+            return CommonResult.success(true);
+        }
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获取分页")
+    public PageResult<MuseumFlowDO> selectPageS(@Valid MuseumFlowPageVO pageVO){
+        return  museumFlowService.selectPageS(pageVO);
+    }
+
+
+
+
+}

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

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Schema(description ="博物馆-申请表分页")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class MuseumFlowPageVO extends PageParam {
+
+    private Integer id;
+
+    @Schema(description = "标本编号")
+    private String number;
+
+    private String sampleName;
+
+    @Schema(description = "出库员")
+    private String outboundPerson;
+
+    @Schema(description = "出库时间")
+    private LocalDateTime[] outboundTime;
+
+    private String purpose;
+
+    private String annexOut;
+
+    private String applyPerson;
+
+    private String applyUnit;
+
+    private LocalDateTime applyTime;
+
+    private String returnExpect;
+
+    private String reviewPerson;
+
+    private Integer state;
+
+    private LocalDateTime reviewTime;
+
+    private String rejectSeason;
+
+    private String returnPerson;
+
+    private LocalDateTime returnTime;
+
+    private String receviePerson;
+
+    private String annexReturn;
+
+    private String nots;
+
+}

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

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-申请表信息 resp VO")
+@Data
+public class MuseumFlowRespVO {
+
+    private Integer id;
+
+    @Schema(description = "标本编号")
+    private String number;
+
+    private String sampleName;
+
+    private String outboundPerson;
+
+    private LocalDateTime outboundTime;
+
+    private String purpose;
+
+    private String annexOut;
+
+    private String applyPerson;
+
+    private String applyUnit;
+
+    private LocalDateTime applyTime;
+
+    private String returnExpect;
+
+    private String reviewPerson;
+
+    private Integer state;
+
+    private LocalDateTime reviewTime;
+
+    private String rejectSeason;
+
+    private String returnPerson;
+
+    private LocalDateTime returnTime;
+
+    private String receviePerson;
+
+    private String annexReturn;
+
+    private String nots;
+
+}

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

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
+
+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 {
+
+    private Integer id;
+
+    @Schema(description = "标本编号")
+    private String number;
+
+    private String sampleName;
+
+    @NotEmpty(message = "出库员不能为空")
+    private String outboundPerson;
+
+    private LocalDateTime outboundTime;
+
+    private String purpose;
+
+    private String annexOut;
+
+    private String applyPerson;
+
+    private String applyUnit;
+
+    private LocalDateTime applyTime;
+
+    private String returnExpect;
+
+    private String reviewPerson;
+
+    private Integer state;
+
+    private LocalDateTime reviewTime;
+
+    private String rejectSeason;
+
+    private String returnPerson;
+
+    private LocalDateTime returnTime;
+
+    private String receviePerson;
+
+    private String annexReturn;
+
+    private String nots;
+
+}

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

@@ -54,72 +54,37 @@ public class MuseumInfoController {
     //TODO 需要提供原因，调用更新方法
     @DeleteMapping("/delete")
     @Operation(summary = "删除标本")
-    public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id){
-        museumInfoService.deleteMuseumInfo(id);
+    public CommonResult<Boolean> deleteMuseumInfo(@RequestParam("id") Integer id,@RequestParam("reason") String reason){
+        museumInfoService.deleteMuseumInfo(id,reason);
+
+//        result.put("删除原因：",提取方法…);
         return CommonResult.success(true);
     }
-    //    @DeleteMapping("/delete")
-//    @Operation(summary = "删除")
-//    public CommonResult<Boolean> deleteMuseumText(@RequestParam("id") Integer id ){
-//        MuseumTextSaveVO saveVO =new MuseumTextSaveVO();
-////        saveVO.setId();
-////        saveVO.set()
-////        museumTextService.updateMuseumText(saveVO);
-//
-//        museumTextService.deleteMuseumText(id);
-//        return CommonResult.success(true);
 
 
     @GetMapping("/get")
-    @Operation(summary = "查找标本")
-    public CommonResult<MuseumInfoRespVO> selectMuseumInfo(@RequestParam("id") Integer id){
-        MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
-        MuseumInfoRespVO result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
+    @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);
       return CommonResult.success(result1);
     }
 
     @GetMapping("/selectMuseumInfoList")
-    @Operation(summary = "查询SampleTypeList")
-    public CommonResult<List<MuseumInfoDO>> getMuseumInfoList(@RequestParam("sampleType") Integer sampleType){
+    @Operation(summary = "标本类型查找")
+    public CommonResult<List<MuseumInfoRespVO>> getMuseumInfoList(@RequestParam("sampleType") Integer sampleType){
         List<MuseumInfoDO> result = museumInfoService.selectMuseumInfoListBySampleType(sampleType);
-        return CommonResult.success(result);
+        List<MuseumInfoRespVO> result1 = BeanUtils.toBean(result,MuseumInfoRespVO.class);
+        return CommonResult.success(result1);
     }
 
     @GetMapping("/page")
     @Operation(summary = "获取分页")
-    @PreAuthorize("@ss.hasPermission('museum:museuminfo:query')")
-    public CommonResult<PageResult<MuseumInfoRespVO>> getMuseumInfoPage(@Valid MuseumInfoPageReqVO pageVO){
-        PageResult<MuseumInfoDO> pageResult = museumInfoService.getMuseumInfoPage(pageVO);
-        return success(BeanUtils.toBean(pageResult, MuseumInfoRespVO.class));
+    public PageResult<MuseumInfoDO> getMuseumInfoPage(@Valid MuseumInfoPageReqVO pageReqVO){
+        return  museumInfoService.getMuseumInfoPage(pageReqVO);
     }
 
 
-
-
-
-
-//    @GetMapping("/get")
-//    @Operation(summary = "list数组")
-//   public CommonResult<MuseumInfoRespVO> getdo(@RequestParam("sampleType") Integer sampleType){
-//          MuseumInfoRespVO list =new MuseumInfoRespVO();
-//          Integer Ynmber =  selectMuseumInfoBySampleType(1)
-//          Integer  hs =  selectMuseumInfoBySampleType(2)
-
-//          DO.setYnmber(Ynmber);
-
-
-//    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("sampleId") String sampleId){
-//
-//    }
-
-
-    //@GetMapping("/get")
-//    @Operation(summary = "查询")
-//    public CommonResult<List<MuseumTextRespVO>> getMuseumText(@RequestParam("id") Integer id){
-//
-//    }
-
-//    1.
     //TODO LIST Map
 //    TODO     1.2.3.代表哪种标本类型
 //            返回某种标本类型的List数组

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

@@ -14,13 +14,17 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class MuseumInfoPageReqVO extends PageParam {
+
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
     
 }

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

@@ -10,56 +10,77 @@ import java.time.LocalDateTime;
 @Data
 @ExcelIgnoreUnannotated
 public class MuseumInfoRespVO {
+//private Integer Ynumber;
 
-    //    private Integer Ynumber;
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
 
+    @Schema(description = "中文名称")
     private String chineseName;
 
+    @Schema(description = "英文名称")
     private String englishName;
 
+    @Schema(description = "国际名称")
     private String internationName;
 
+    @Schema(description = "保存类型")
     private Integer keepType;
 
+    @Schema(description = "成份")
     private String element;
 
+    @Schema(description = "产地")
     private String  local;
 
+    @Schema(description = "时代")
     private LocalDateTime bronTime ;
 
+    @Schema(description = "保存地层")
     private String stratum;
 
+    @Schema(description = "发现时间")
     private LocalDateTime findTime;
 
+    @Schema(description = "尺寸")
     private String size;
 
+    @Schema(description = "重量")
     private Long weight;
 
+    @Schema(description = "来源")
     private String origin;
 
-    private String offerMan;
-
+    @Schema(description = "描述")
     private String character;
 
-//    private Integer condition;
+    @Schema(description = "馆藏状态")
+    private Integer save;
+
+    @Schema(description = "入馆时间")
+    private String saveTime;
+
+    @Schema(description = "用途")
+    private String Use;
 
-//    private String joinTime;
+    @Schema(description = "资产号")
+    private String fundId;
 
-//    private String useWay;
+    @Schema(description = "删除原因")
+    private String reason;
 
-//    private String moneyId;
+    @Schema(description = "标本图片")
+    private String picture;
 
-//    private String deleteReason;
-//
-//    private String samplePicture;
-//
-//    private String tip;
+    @Schema(description = "备注")
+    private String sampleTip;
 }

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

@@ -9,54 +9,75 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumInfoSaveVO {
 
+    @Schema(description = "标本id")
     private Integer id;
 
     @Schema(description = "标本编号")
     private String sampleId;
 
+    @Schema(description = "标本类型")
     private Integer sampleType;
 
+    @Schema(description = "存放位置")
     private String place;
 
+    @Schema(description = "中文名称")
     private String chineseName;
 
+    @Schema(description = "英文名称")
     private String englishName;
 
+    @Schema(description = "国际名称")
     private String internationName;
 
+    @Schema(description = "保存类型")
     private Integer keepType;
 
+    @Schema(description = "成份")
     private String element;
 
+    @Schema(description = "产地")
     private String  local;
 
+    @Schema(description = "时代")
     private LocalDateTime bronTime ;
 
+    @Schema(description = "保存地层")
     private String stratum;
 
+    @Schema(description = "发现时间")
     private LocalDateTime findTime;
 
+    @Schema(description = "尺寸")
     private String size;
 
+    @Schema(description = "重量")
     private Long weight;
 
+    @Schema(description = "来源")
     private String origin;
 
-    private String offerMan;
-
+    @Schema(description = "描述")
     private String character;
 
-//    private Integer condition;
-//
-//    private String joinTime;
-//
-//    private String useWay;
-//
-//    private String moneyId;
-//
-//    private String deleteReason;
-//
-//    private String samplePicture;
-//
-//    private String tip;
+    @Schema(description = "馆藏状态")
+    private Integer save;
+
+    @Schema(description = "入馆时间")
+    private String saveTime;
+
+    @Schema(description = "用途")
+    private String Use;
+
+    @Schema(description = "资产号")
+    private String fundId;
+
+    @Schema(description = "删除原因")
+    private String reason;
+
+    @Schema(description = "标本图片")
+    private String picture;
+
+    @Schema(description = "备注")
+    private String sampleTip;
 }

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

@@ -0,0 +1,78 @@
+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.MuseumPictureRespVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import cn.iocoder.yudao.module.museum.service.museumpicture.MuseumPictureService;
+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.beans.factory.annotation.Autowired;
+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")
+@Validated
+
+public class MuseumPictureController {
+
+    @Resource
+    private MuseumPictureService museumPictureService;
+    @Autowired
+    private PictureGroupService pictureGroupService;
+    private PicturePageReqVO pageVO;
+
+    @PostMapping("/create")
+    @Operation(summary = "新增图片") 
+    public Integer createMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
+        return museumPictureService.createMuseumPicture(saveVO);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新图片")
+    public CommonResult<Boolean> updateMuseumPicture(@RequestBody MuseumPictureSaveVO saveVO) {
+        museumPictureService.updateMuseumPicture(saveVO);
+        return CommonResult.success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除图片")
+    public CommonResult<Boolean> deleteMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
+        museumPictureService.deleteMuseumPicture(pictureId);
+        return CommonResult.success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "查找图片")
+    public CommonResult<MuseumPictureRespVO> getMuseumPicture(@RequestParam("pictureId") Integer pictureId) {
+
+//        if (pictureId==null) {
+//            return CommonResult.error(1,"照片id不存在");
+//        }else {
+        MuseumPictureDO result = museumPictureService.selectMuseumPicture(pictureId);
+        MuseumPictureRespVO result1 = BeanUtils.toBean(result, MuseumPictureRespVO.class);
+        return CommonResult.success(result1);
+//        }
+    }
+
+
+    @GetMapping("/page")
+    @Operation(summary = "获得照片分页")
+    @PreAuthorize("@ss.hasPermission('system:tenant:query')")
+    public CommonResult<PageResult<MuseumPictureRespVO>> getPicturePage(@Validated PicturePageReqVO pageVO) {
+        PageResult<MuseumPictureDO> pageResult = museumPictureService.getPicturePage(pageVO);
+        return success(BeanUtils.toBean(pageResult, MuseumPictureRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+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.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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Tag(name = "博物馆-图片组")
+@RestController
+@RequestMapping("/museum/picture group")
+@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);
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Schema(description = "博物馆-图片信息 Resp VO")
+@Data
+public class MuseumPictureRespVO {
+
+    private Integer pictureId;
+    @Schema(description = "图片编号")
+
+    private Integer groupId;
+
+    private String picturePath;
+
+}

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

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+@Schema(description = "博物馆-图片信息 save VO")
+@Data
+public class MuseumPictureSaveVO {
+
+    private Integer pictureId;
+
+    @Schema(description = "图片编号")
+
+    private Integer groupId;
+
+    private String picturePath;
+
+}

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

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-图片组信息 Resp VO")
+@Data
+public class PictureGroupRespVO {
+    private Integer id;
+    @Schema(description = "照片组编号")
+
+    private String pictureSetIntroduce;
+
+    private LocalDateTime pictureSetTime;
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-图片组信息 Save VO")
+@Data
+public class PictureGroupSaveVO {
+    private Integer id;
+    @Schema(description = "照片组编号")
+
+    private String pictureSetIntroduce;
+
+    private LocalDateTime pictureSetTime;
+
+
+
+}

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

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 用户分页 Request VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class PicturePageReqVO extends PageParam {
+
+    @Schema(description = "图片组id,模糊搜索",example = "1")
+    private Integer groupId;
+
+    @Schema(description = "创建时间",example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+
+}

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

@@ -0,0 +1,64 @@
+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 lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 博物馆的出/回库-数据库
+ *
+ * @author 芋道源码
+ */
+@TableName(value = "museum_outbound", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MuseumFlowDO extends BaseDO {
+
+    @TableId
+    private Integer id;
+
+    private String number;
+
+    private String sampleName;
+
+    private String outboundPerson;
+
+    private LocalDateTime outboundTime;
+
+    private String purpose;
+
+    private String annexOut;
+
+    private String applyPerson;
+
+    private String applyUnit;
+
+    private LocalDateTime applyTime;
+
+    private String returnExpect;
+
+    private String reviewPerson;
+
+    private Integer state;
+
+    private LocalDateTime reviewTime;
+
+    private String rejectSeason;
+
+    private String returnPerson;
+
+    private LocalDateTime returnTime;
+
+    private String receviePerson;
+
+    private String annexReturn;
+
+    private String nots;
+
+}

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

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

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

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.museum.dal.database.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+
+/**
+ * 博物馆的图片库
+ *
+ * @author yu
+ */
+@TableName(value = "museum_picture_dan", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class MuseumPictureDO extends BaseDO {
+
+    @TableId
+    private Integer pictureId;
+
+    private Integer groupId;
+
+    private String picturePath;
+}

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

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.museum.dal.database.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+/**
+ * 博物馆的图片组
+ *
+ * @author yu
+ */
+@TableName(value = "museum_picture_table", autoResultMap = true) // 由于 SQL Server 的 system_user 是关键字，所以使用 system_users
+@Data
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class PictureGroupDO extends BaseDO {
+
+    @TableId
+    private Integer id;
+
+    private LocalDateTime pictureSetTime;
+
+    private String pictureSetIntroduce;
+}

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

@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumflow;
+
+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.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
+public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
+
+    @Update("UPDATE museum_outbound SET sample_type=#{sampleType}, place=#{place} WHERE id =#{id}")
+    void updateMuseumFlow(MuseumFlowDO museumFlowDO);
+
+    @Update("UPDATE museum_outbound SET deleted=1  WHERE id =#{id}")
+    void deleteMuseumFlow(Integer id);
+
+    @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 ")
+    MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
+
+/**将样品状态更新为1**/
+    @Update("UPDATE museum_outbound SET state=0  WHERE number =#{number}")
+    void updateMuseumFlowState(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())
+               .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
+               .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
+               .orderByDesc(MuseumFlowDO::getId);
+
+       return selectPage(pageVO, queryWrapper);
+
+//       return selectPage(pageVO ,new LambdaQueryWrapperX<MuseumFlowDO>()
+//               .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
+//               .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
+//               .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
+//               .inIfPresent(MuseumFlowDO::getId, id)
+//               .orderByDesc(MuseumFlowDO::getId));
+   }
+    default List<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
+
+       LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
+        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
+                .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
+                .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
+                .orderByDesc(MuseumFlowDO::getId);
+        return selectList(queryWrapper);
+    }
+
+
+}

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.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,19 +16,29 @@ import java.util.List;
 
 @Mapper
 public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
-
+    /**
+     * 更新标本
+     * */
     @Update("UPDATE museum_info SET sample_type=#{sampleType}, place=#{place},chinese_name=#{chineseName} WHERE id =#{id}")
     void updateMuseumInfo(MuseumInfoDO museumInfoDO);
-
-    @Update("UPDATE museum_info SET deleted=1  WHERE id =#{id}")
-    void deleteMuseumInfo(Integer id);
-
+    /**
+     * 删除标本
+     * */
+    @Update("UPDATE museum_info SET deleted=1,reason=#{reason}  WHERE id =#{id}")
+    void deleteMuseumInfo(Integer id,String reason);
+    /**
+     * 查询标本
+     * */
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
-    MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
-
+    List<MuseumInfoDO> selectMuseumInfoById(@Param("id") Integer id);
+    /**
+     * 查询标本编号
+     * */
     @Select("SELECT * FROM museum_info WHERE sample_id =#{sampleId} ")
     MuseumInfoDO getMuseumInfoBySampleId(@Param("sampleId") String sampleId);
-
+    /**
+     * 查询标本类型
+     */
     @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType}")
     List<MuseumInfoDO> selectMuseumInfoListBySampleType(@Param("sampleType") Integer sampleType);
 
@@ -35,13 +46,14 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
 //    Integer countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
 
 
-    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>())
-//                .likeIfPresent(MuseumInfoDO::getSampleId,reqVO.getSampleId())
-//                .eqIfPresent(MuseumInfoDO::getSampleType,reqVO.getSampleType())
-//                .likeIfPresent(MuseumInfoDO::getPlace,reqVO.getPlace())
-//                .orderByDesc(reqVO.getId() != null,MuseumInfoDO::getId));
-                ;}
+    default PageResult<MuseumInfoDO> selectPage(MuseumInfoPageReqVO pageReqVO) {
+        LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
+        queryWrapper.likeIfPresent(MuseumInfoDO::getSampleId, pageReqVO.getSampleId())
+                .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+                .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
+                .orderByDesc(MuseumInfoDO::getId);
+        return selectPage(pageReqVO, queryWrapper);
+    }
 
 //    default PageResult<MuseumInfoDO> selectPage1(MuseumInfoPageReqVO reqVO) {
 //        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()

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

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+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.List;
+
+@Mapper
+public interface MuseumPictureMapper extends BaseMapperX<MuseumPictureDO> {
+
+    @Update("UPDATE museum_picture_dan SET picture_path=#{picture_path} WHERE picture_id =#{picture_id}")
+    void updateMuseumPicture(MuseumPictureDO museumPictureDO);
+
+    @Update("UPDATE museum_picture_dan SET deleted=1  WHERE picture_id =#{picture_id}")
+    void deleteMuseumPicture(Integer picture_id);
+
+    @Select("SELECT * FROM museum_picture_dan WHERE picture_id = #{picture_id} AND deleted =0 ")
+    MuseumPictureDO selectMuseumPictureById(@Param("picture_id") Integer picture_id);
+
+    @Select("SELECT * FROM museum_picture_dan WHERE group_id = #{group_id} AND deleted =0 ")
+    List<MuseumPictureDO> selectMuseumPictureSetByGroupId(@Param("group_id") Integer group_id);
+
+}

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

@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.museum.dal.mysql.museumpicture;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+@Mapper
+public interface PictureGroupMapper extends BaseMapperX<PictureGroupDO> {
+
+    @Update("UPDATE museum_picture_table SET picture_set_introduce=#{picture_set_introduce} WHERE id =#{id}")
+    void updatePictureGroup(PictureGroupDO pictureGroupDO);
+
+    @Update("UPDATE museum_picture_table SET deleted=1  WHERE id =#{id}")
+    void deletePictureGroup(Integer id);
+
+    @Select("SELECT * FROM museum_picture_table WHERE id = #{id} AND deleted =0 ")
+    PictureGroupDO selectPictureGroupById(@Param("id") Integer id);
+
+}

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

@@ -0,0 +1,54 @@
+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.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 {
+    /**
+     * 创建标本
+     * */
+    Integer createMuseumFlow(MuseumFlowSaveVO saveVO);
+
+    /**
+     * 更新标本
+     * */
+    void updateMuseumFlow(MuseumFlowSaveVO saveVO);
+
+    /**
+     * 删除标本
+     * */
+    void deleteMuseumFlow(Integer id);
+
+
+    /**
+     * 查询标本
+     * */
+    MuseumFlowDO selectMuseumFlow(Integer id);
+
+
+    /**
+     * 根据样本编号查找
+     * */
+    MuseumInfoDO selectMuseumFlowSampleId(String sample_id);
+
+    /**
+     * 将样品状态设置为1
+    * */
+    void updateMuseumFlowState(MuseumFlowSaveVO saveVO);
+
+    /**
+     * 根据出库员进行分页查找
+     * */
+    List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);
+
+    /**
+     * 根据分页长度进行排序
+     * */
+    PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
+}

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

@@ -0,0 +1,66 @@
+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.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;
+import java.util.List;
+
+@Service
+public class MuseumFlowServiceImpl implements MuseumFlowService {
+
+    @Resource
+    private MuseumFlowMapper museumFlowMapper;
+
+    @Override
+    public Integer createMuseumFlow(MuseumFlowSaveVO saveVO){
+        MuseumFlowDO result = BeanUtils.toBean(saveVO, MuseumFlowDO.class);
+        return museumFlowMapper.insert(result);
+    }
+
+    @Override
+    public void updateMuseumFlow(MuseumFlowSaveVO saveVO){
+        museumFlowMapper.updateMuseumFlow(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+    }
+
+    @Override
+    public void deleteMuseumFlow(Integer id){
+//      museumFlowMapper.deleteMuseumFlow(id);
+        museumFlowMapper.deleteById(id);
+    }
+
+    @Override
+    public MuseumFlowDO selectMuseumFlow(Integer id) {
+        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));
+    }
+
+
+    @Override
+    public List<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO){
+        return museumFlowMapper.selectPageMuseumFlowByOutboundPerson(pageVO);
+    }
+
+    @Override
+    public PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
+        return  museumFlowMapper.selectPage1(pageVO);
+    }
+}

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

@@ -22,27 +22,27 @@ public interface MuseumInfoService {
    void updateMuseumInfo(MuseumInfoSaveVO saveVO);
 
    /**
-    * 删除标本
+    * 删除标本(原因）
     * */
-   void deleteMuseumInfo(Integer id);
+   void deleteMuseumInfo(Integer id,String reason);
    /**
     * 查询标本
     * */
-   MuseumInfoDO selectMuseumInfo (Integer id);
+   List<MuseumInfoDO> selectMuseumInfo (Integer id);
 
    /**
     * 查询标本编号
     * */
    MuseumInfoDO getMuseumInfoBySampleId(String sampleId);
    /**
-   * 查询标本类型List
+   * 查询标本类型
    * */
    List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType);
     /**
     * 分页列表
     *
-    * @param pageVO 分页条件
+    * @param pageReqVO 分页条件
     * @return 分页列表
     */
-   PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageVO);
+    PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO);
 }

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

@@ -40,28 +40,31 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 删除标本
     */
    @Override
-   public void deleteMuseumInfo(Integer id) {
+   public void deleteMuseumInfo(Integer id,String reason) {
 //      museumInfoMapper.deleteMuseumInfo(id);
       museumInfoMapper.deleteById(id);
    }
+   /**
+    * 删除标本
+    */
 
    /**
     * 查询标本id
     */
    @Override
-   public MuseumInfoDO selectMuseumInfo(Integer id) {
+   public List<MuseumInfoDO> selectMuseumInfo(Integer id) {
       return museumInfoMapper.selectMuseumInfoById(id);
    }
 
    /**
-    * 查询标本SampleId
+    * 查询标本编号
     */
    @Override
    public MuseumInfoDO getMuseumInfoBySampleId (String sampleId) {
       return museumInfoMapper.getMuseumInfoBySampleId(sampleId);
    }
    /**
-    * 查询SampleTypeList
+    * 查询标本类型
     */
    @Override
    public List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType){
@@ -71,10 +74,8 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
    * 分页列表
     */
    @Override
-   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO reqVO){
-//      Set<Long> ids = reqVO.getId() != null ?
-//              permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
-      return museumInfoMapper.selectPage(reqVO);
+   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageReqVO){
+      return museumInfoMapper.selectPage(pageReqVO);
    }
 
 

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

@@ -0,0 +1,41 @@
+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.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public interface MuseumPictureService {
+
+    /**
+     * 创建图片
+     */
+    Integer createMuseumPicture(MuseumPictureSaveVO saveVO);
+
+    /**
+     * 更改图片
+     */
+    void updateMuseumPicture(MuseumPictureSaveVO saveVO);
+
+    /**
+     * 删除图片
+     */
+    void deleteMuseumPicture(Integer pictureId);
+
+    /**
+     * 单独查询图片
+     */
+    MuseumPictureDO selectMuseumPicture(Integer pictureId);
+
+    /**
+     * 相同组查询图片
+     */
+//    MuseumPictureDO selectMuseumPictureSet(Integer group_id);
+
+
+     PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO);
+
+}

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

@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+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.MuseumPictureSaveVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PicturePageReqVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.MuseumPictureDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.MuseumPictureMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+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 void updateMuseumPicture(MuseumPictureSaveVO saveVO){
+        museumPictureMapper.updateMuseumPicture(BeanUtils.toBean(saveVO,MuseumPictureDO.class));
+    }
+
+    @Override
+    public void deleteMuseumPicture(Integer picture_id){
+//      museumPictureMapper.deleteMuseumPicture(picture_id);
+        museumPictureMapper.deleteById(picture_id);
+    }
+
+    @Override
+        public MuseumPictureDO selectMuseumPicture(Integer picture_id){
+        return museumPictureMapper.selectMuseumPictureById(picture_id);
+    }
+
+    @Override
+    public PageResult<MuseumPictureDO> getPicturePage(PicturePageReqVO pageVO) {
+        return null;
+    }
+
+//    @Override
+//    public MuseumPictureDO selectMuseumPictureSet(Integer group_id){
+//        return museumPictureMapper.selectMuseumPictureSetById(group_id);
+//    }
+}
+

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

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface PictureGroupService {
+    /**
+     * 创建图片
+     * */
+    Integer createPictureGroup(PictureGroupSaveVO saveVO);
+    /**
+     * 更改图片
+     * */
+    void updatePictureGroup(PictureGroupSaveVO saveVO);
+    /**
+     * 删除图片
+     * */
+    void deletePictureGroup(Integer id);
+    /**
+     * 查询图片
+     * */
+    PictureGroupDO selectPictureGroup(Integer id);
+
+}

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

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.museum.service.museumpicture;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.museum.controller.admin.museumpicture.vo.PictureGroupSaveVO;
+import cn.iocoder.yudao.module.museum.dal.database.museumpicture.PictureGroupDO;
+import cn.iocoder.yudao.module.museum.dal.mysql.museumpicture.PictureGroupMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public  class PictureGroupServiceImpl implements PictureGroupService {
+
+    @Resource
+    private PictureGroupMapper pictureGroupMapper;
+
+    @Override
+    public Integer createPictureGroup(PictureGroupSaveVO saveVO){
+        return pictureGroupMapper.insert(BeanUtils.toBean(saveVO, PictureGroupDO.class));
+    }
+
+    @Override
+    public void updatePictureGroup(PictureGroupSaveVO saveVO){
+        pictureGroupMapper.updatePictureGroup(BeanUtils.toBean(saveVO,PictureGroupDO.class));
+    }
+
+    @Override
+    public void deletePictureGroup(Integer id){
+//      pictureGroupMapper.deletePictureGroup(id);
+        pictureGroupMapper.deleteById(id);
+    }
+
+    @Override
+    public PictureGroupDO selectPictureGroup(Integer id){
+        return pictureGroupMapper.selectPictureGroupById(id);
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java

@@ -38,4 +38,6 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "角色编号", example = "1024")
     private Long roleId;
 
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -389,7 +389,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         if (StrUtil.isBlank(username)) {
             return;
         }
-        AdminUserDO user = userMapper.selectByUsername(username);
+        AdminUserDO user = userMapper. selectByUsername(username);
         if (user == null) {
             return;
         }