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

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/pom.xml

@@ -46,6 +46,12 @@
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+            <version>4.0.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </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.getCondition();
+        //      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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -32,22 +33,22 @@ public class MuseumInfoController {
     //TODO 判断标本编号是否重复
     @PostMapping("/create")
     @Operation(summary = "新增标本")
-    public CommonResult<Integer> createMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
-            String sampleId = saveVO.getSampleId();
-
-//        MuseumInfoDO result = museumInfoService.;
-//        if (result!=null){
-//            return CommonResult.error(1,"标本编号已存在");
-//        }else {
+    public CommonResult<Integer> createMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO) {
+        String sampleId = saveVO.getSampleId();
+        MuseumInfoDO result = museumInfoService.getMuseumInfoBySampleId(sampleId);
+        if (result != null) {
+            return CommonResult.error(1, "标本编号已存在");
+        } else {
             return CommonResult.success(museumInfoService.createMuseumInfo(saveVO));
-//        }
+        }
     }
 
     @Operation(summary = "更新标本")
     public CommonResult<Boolean> updateMuseumInfo(@RequestBody MuseumInfoSaveVO saveVO){
+        museumInfoService.updateMuseumInfo(saveVO);
+        return CommonResult.success(true);
 //         saveVO.setSampleType(1);
-         museumInfoService.updateMuseumInfo(saveVO);
-         return CommonResult.success(true);
+
     }
 
     //TODO 需要提供原因，调用更新方法
@@ -71,23 +72,47 @@ public class MuseumInfoController {
 
     @GetMapping("/get")
     @Operation(summary = "查找标本")
-    public CommonResult<MuseumInfoRespVO> getMuseumInfo(@RequestParam("id") Integer id){
+    public CommonResult<MuseumInfoRespVO> selectMuseumInfo(@RequestParam("id") Integer id){
         MuseumInfoDO result = museumInfoService.selectMuseumInfo(id);
         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){
+        List<MuseumInfoDO> result = museumInfoService.selectMuseumInfoListBySampleType(sampleType);
+        return CommonResult.success(result);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获取分页")
-//    @PreAuthorize("@ss.hasPermission('system:user:query')")
-    public CommonResult<MuseumInfoPageReqVO> pageMuseumInfo(@Valid MuseumInfoPageReqVO pageReqVO){
-        PageResult<MuseumInfoDO> pageResult = museumInfoService.getUserPage(pageReqVO);
-        if (CollUtil.isEmpty(pageResult.getList())) {
-            return success(new PageResult<>(pageResult.getTotal()));
-        }
+    @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));
     }
 
 
+
+
+
+
+//    @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){
@@ -115,4 +140,6 @@ public class MuseumInfoController {
 ////          DO.setYnumber(Ynmber);
 //   }
 
+
+
 }

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

@@ -1,13 +1,19 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo;
 
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.MuseumInfoController;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.time.LocalDateTime;
 
 @Schema(description = "博物馆-标本信息-分页 pageReq VO")
 @Data
-public class MuseumInfoPageReqVO {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MuseumInfoPageReqVO extends PageParam {
     private Integer id;
 
     @Schema(description = "标本编号")
@@ -16,47 +22,6 @@ public class MuseumInfoPageReqVO {
     private Integer sampleType;
 
     private String place;
-
-    private String chineseName;
-
-    private String englishName;
-
-    private String internationName;
-
-    private Integer keepType;
-
-    private String element;
-
-    private String  local;
-
-    private LocalDateTime bronTime ;
-
-    private String stratum;
-
-    private LocalDateTime findTime;
-
-    private String size;
-
-    private Long weight;
-
-    private String origin;
-
-    private String offerMan;
-
-    private String character;
-
-    private String 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/controller/admin/museuminfo/vo/MuseumInfoRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -7,6 +8,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "博物馆-标本信息 Resp VO")
 @Data
+@ExcelIgnoreUnannotated
 public class MuseumInfoRespVO {
 
     //    private Integer Ynumber;
@@ -47,17 +49,17 @@ public class MuseumInfoRespVO {
 
     private String character;
 
-    private String condition;
+//    private Integer condition;
 
-    private String joinTime;
+//    private String joinTime;
 
-    private String useWay;
+//    private String useWay;
 
-    private String moneyId;
+//    private String moneyId;
 
-    private String deleteReason;
-
-    private String samplePicture;
-
-    private String tip;
+//    private String deleteReason;
+//
+//    private String samplePicture;
+//
+//    private String tip;
 }

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

@@ -46,17 +46,17 @@ public class MuseumInfoSaveVO {
 
     private String character;
 
-    private String condition;
-
-    private String joinTime;
-
-    private String useWay;
-
-    private String moneyId;
-
-    private String deleteReason;
-
-    private String samplePicture;
-
-    private String tip;
+//    private Integer condition;
+//
+//    private String joinTime;
+//
+//    private String useWay;
+//
+//    private String moneyId;
+//
+//    private String deleteReason;
+//
+//    private String samplePicture;
+//
+//    private String tip;
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/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

@@ -24,7 +24,7 @@ public class MuseumInfoDO extends BaseDO {
      * 标本ID
      */
     @TableId
-    private Integer id;
+    private Long id;
     /**
      * 标本编号
      */
@@ -96,30 +96,30 @@ public class MuseumInfoDO extends BaseDO {
     /**
      * 馆藏状态
      */
-    private String condition;
-    /**
-     * 入藏时间
-     */
-    private String joinTime;
-    /**
-     * 用途
-     */
-    private String useWay;
-    /**
-     * 资产号
-     */
-    private String moneyId;
-    /**
-     * 删除原因
-     */
-    private String deleteReason;
-    /**
-     * 标本图片
-     */
-    private String samplePicture;
-    /**
-     * 备注
-     */
-    private String tip;
+//    private Integer condition;
+//    /**
+//     * 入藏时间
+//     */
+//    private String joinTime;
+//    /**
+//     * 用途
+//     */
+//    private String useWay;
+//    /**
+//     * 资产号
+//     */
+//    private String moneyId;
+//    /**
+//     * 删除原因
+//     */
+//    private String deleteReason;
+//    /**
+//     * 标本图片
+//     */
+//    private String samplePicture;
+//    /**
+//     * 备注
+//     */
+//    private String tip;
 
 }

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

@@ -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

@@ -1,8 +1,12 @@
 package cn.iocoder.yudao.module.museum.dal.mysql.museuminfo;
 
+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.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -21,10 +25,37 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     @Select("SELECT * FROM museum_info WHERE id =#{id} AND deleted =0 ")
     MuseumInfoDO selectMuseumInfoById(@Param("id") Integer id);
 
-//    @Select("SELECT * FROM museum_info WHERE sample_type  =#{sampleType} AND deleted =0 ")
-//    List<MuseumInfoDO> selectMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    @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);
+
+//    @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
+//    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> selectPage1(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)); // 按照 id 倒序
+//    }
+//
+//    default PageResult<MuseumInfoDO> selectPage2(MuseumInfoPageReqVO reqVO) {
+//        return selectPage(reqVO, new LambdaQueryWrapperX<MuseumInfoDO>()
+//                .likeIfPresent(MuseumInfoDO::getPlace, reqVO.getPlace())
+//        );
+//    }
 
-        @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type  =#{sampleType} ")
-        Integer selectMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
 
-}
+    }

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

@@ -4,8 +4,11 @@ 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.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;
+
 @Service
 public interface MuseumInfoService {
    /**
@@ -25,12 +28,21 @@ public interface MuseumInfoService {
    /**
     * 查询标本
     * */
-   MuseumInfoDO selectMuseumInfo(Integer id);
+   MuseumInfoDO selectMuseumInfo (Integer id);
+
    /**
-    * 获得用户分页列表
+    * 查询标本编号
+    * */
+   MuseumInfoDO getMuseumInfoBySampleId(String sampleId);
+   /**
+   * 查询标本类型List
+   * */
+   List<MuseumInfoDO> selectMuseumInfoListBySampleType(Integer sampleType);
+    /**
+    * 分页列表
     *
-    * @param pageReqVO 分页条件
+    * @param pageVO 分页条件
     * @return 分页列表
     */
-   PageResult<MuseumInfoDO> getUserPage(MuseumInfoPageReqVO pageReqVO);
+   PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO pageVO);
 }

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

@@ -1,46 +1,83 @@
 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.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.List;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
 
 @Service
 public  class  MuseumInfoServiceImpl implements MuseumInfoService {
 
    @Resource
    private MuseumInfoMapper museumInfoMapper;
+
    /**
-    *新增标本
+    * 新增标本
     */
    @Override
-   public Integer createMuseumInfo(MuseumInfoSaveVO saveVO){
-     return museumInfoMapper.insert(BeanUtils.toBean(saveVO, MuseumInfoDO.class));//insert(内置)
+   public Integer createMuseumInfo(MuseumInfoSaveVO saveVO) {
+      return museumInfoMapper.insert(BeanUtils.toBean(saveVO, MuseumInfoDO.class));//insert(内置)
    }
+
    /**
-    *更新标本
+    * 更新标本
     */
    @Override
-   public void updateMuseumInfo(MuseumInfoSaveVO saveVO){
-      museumInfoMapper.updateMuseumInfo(BeanUtils.toBean(saveVO,MuseumInfoDO.class));
+   public void updateMuseumInfo(MuseumInfoSaveVO saveVO) {
+      museumInfoMapper.updateMuseumInfo(BeanUtils.toBean(saveVO, MuseumInfoDO.class));
    }
+
    /**
-    *删除标本
+    * 删除标本
     */
    @Override
-   public void deleteMuseumInfo(Integer id){
+   public void deleteMuseumInfo(Integer id) {
 //      museumInfoMapper.deleteMuseumInfo(id);
       museumInfoMapper.deleteById(id);
    }
+
    /**
-    *查询标本
+    * 查询标本id
     */
    @Override
-   public MuseumInfoDO selectMuseumInfo(Integer id){
+   public 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){
+      return museumInfoMapper.selectMuseumInfoListBySampleType(sampleType);
+   }
+   /**
+   * 分页列表
+    */
+   @Override
+   public PageResult<MuseumInfoDO> getMuseumInfoPage(MuseumInfoPageReqVO reqVO){
+//      Set<Long> ids = reqVO.getId() != null ?
+//              permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
+      return museumInfoMapper.selectPage(reqVO);
+   }
+
+
 }
+
+

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

@@ -268,7 +268,7 @@ public class AdminUserServiceImpl implements AdminUserService {
     public AdminUserDO getUserByMobile(String mobile) {
         return userMapper.selectByMobile(mobile);
     }
-
+//1
     @Override
     public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
         // 如果有角色编号，查询角色对应的用户编号
@@ -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;
         }