Browse Source

审批程序

BigLawn 3 months ago
parent
commit
e0caa49418

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

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museumflow;
 package cn.iocoder.yudao.module.museum.controller.admin.museumflow;
 
 
+import cn.hutool.poi.excel.cell.CellSetter;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 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.MuseumFlowPageVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowRespVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowReviewVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowSaveVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo.MuseumFlowSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 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.database.museuminfo.MuseumInfoDO;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.Valid;
+import java.util.Objects;
 
 
 @Tag(name = "博物馆-出回库管理")
 @Tag(name = "博物馆-出回库管理")
 @RestController
 @RestController
@@ -56,21 +59,19 @@ public class MuseumFlowController {
     @Operation(summary = "添加出库单")
     @Operation(summary = "添加出库单")
     public CommonResult<Boolean>  createMuseumFlowState(@RequestBody MuseumFlowSaveVO saveVO){
     public CommonResult<Boolean>  createMuseumFlowState(@RequestBody MuseumFlowSaveVO saveVO){
         String sample_id=saveVO.getNumber();
         String sample_id=saveVO.getNumber();
+        String number=saveVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        MuseumFlowDO event =  museumFlowService.selectMuseumFlowNumber(number);
         if(result == null){
         if(result == null){
             return CommonResult.error(200,"样品不存在");
             return CommonResult.error(200,"样品不存在");
         }
         }
         int Save=result.getSave();
         int Save=result.getSave();
-        //      0现为已出库,1为未出库或已回库,2为审批中,3为审批通过
         if(Save == 0){
         if(Save == 0){
             return CommonResult.error(200,"样品不在库中");
             return CommonResult.error(200,"样品不在库中");
         }
         }
-        else if (Save == 2){
-            return CommonResult.error(200,"样品正在审批");
-        }
         else {
         else {
             museumFlowService.createMuseumFlow(saveVO);
             museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowState(saveVO);
+            museumFlowService.updateMuseumFlowStateOutbound2(saveVO);
             return CommonResult.success(true);
             return CommonResult.success(true);
         }
         }
     }
     }
@@ -83,59 +84,69 @@ public class MuseumFlowController {
 
 
     @PostMapping("/review")
     @PostMapping("/review")
     @Operation(summary = "新增通过的审批单")
     @Operation(summary = "新增通过的审批单")
-    public CommonResult<Boolean> createMuseumAFlowReview(@RequestBody MuseumFlowSaveVO saveVO) {
-        String sample_id = saveVO.getNumber();
+    public CommonResult<Boolean> createMuseumFlowReview(@RequestBody MuseumFlowReviewVO reviewVO) {
+        String sample_id = reviewVO.getNumber();
+        String number = reviewVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        MuseumFlowDO event = museumFlowService.selectMuseumFlowNumber(number);
+        int Save = result.getSave();
+        int State = event.getState();
+//             Save中 0现为未出库或已回库,1为已出库
+//             State中 0现为未出库或已回库,1为已出库,2为审批中,3为审批通过,4为审批驳回
         if (result == null) {
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
             return CommonResult.error(200, "样品不存在");
+        } else if (event == 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) {
+        else if (Save == 0) {
             return CommonResult.error(200, "样品并未申请出库");
             return CommonResult.error(200, "样品并未申请出库");
-        }
-        else if (Save == 2) {
-            museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowState3(saveVO);
-            return CommonResult.success(true);
-        }
-        else {
-            return CommonResult.error(200,"样品已审批通过并出库");
-        }
+        } else if (Save == 1) {
+            if (State == 2) {
+                museumFlowService.createMuseumFlowReview(reviewVO);
+                museumFlowService.updateMuseumFlowStateReview3(reviewVO);
+                return CommonResult.success(true);
+            } else if (State == 3) {
+                return CommonResult.error(200, "样品已审批通过");
+            } else if (State == 4) {
+                return CommonResult.error(200, "样品审批已被驳回");
+            }
+        } else {
+            return CommonResult.error(200, "样品已审批通过并出库");
+        }
+        return null;
     }
     }
 
 
     @PostMapping("/reject")
     @PostMapping("/reject")
-    @Operation(summary = "新增拒绝的审批单")
-    public CommonResult<Boolean> createMuseumAFlowReject(@RequestBody MuseumFlowSaveVO saveVO) {
-        String sample_id = saveVO.getNumber();
+    @Operation(summary = "新增驳回的审批单")
+    public CommonResult<Boolean> createMuseumFlowReject(@RequestBody MuseumFlowReviewVO reviewVO) {
+        String sample_id = reviewVO.getNumber();
+        String number = reviewVO.getNumber();
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
         MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+        MuseumFlowDO event = museumFlowService.selectMuseumFlowNumber(number);
+        int Save = result.getSave();
+        int State = event.getState();
+//             Save中 0现为未出库或已回库,1为已出库
+//             State中 0现为未出库或已回库,1为已出库,2为审批中,3为审批通过,4为审批驳回
         if (result == null) {
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
             return CommonResult.error(200, "样品不存在");
+        } else if (event == 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) {
+        else if (Save == 0) {
             return CommonResult.error(200, "样品并未申请出库");
             return CommonResult.error(200, "样品并未申请出库");
-        }
-        else if (Save == 2) {
-            museumFlowService.createMuseumFlow(saveVO);
-            museumFlowService.updateMuseumFlowState4(saveVO);
-            return CommonResult.success(true);
-        }
-        else {
-            return CommonResult.error(200,"样品已审批通过并出库");
-        }
+        } else if (Save == 1) {
+            if (State == 2) {
+                museumFlowService.createMuseumFlowReview(reviewVO);
+                museumFlowService.updateMuseumFlowStateReview4(reviewVO);
+                return CommonResult.success(true);
+            } else if (State == 3) {
+                return CommonResult.error(200, "样品已审批通过");
+            } else if (State == 4) {
+                return CommonResult.error(200, "样品审批已被驳回");
+            }
+        } else {
+            return CommonResult.error(200, "样品已审批通过并出库");
+        }
+        return null;
     }
     }
 }
 }

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

@@ -55,8 +55,8 @@ public class MuseumFlowPageVO extends PageParam {
     @Schema(description = "审批人")
     @Schema(description = "审批人")
     private String reviewPerson;
     private String reviewPerson;
 
 
-    @Schema(description = "状态")
-    private Integer state;
+    @Schema(description = "审批状态")
+    private Integer stateReview;
 
 
     @Schema(description = "审批时间")
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
     private LocalDateTime reviewTime;
@@ -71,7 +71,7 @@ public class MuseumFlowPageVO extends PageParam {
     private LocalDateTime returnTime;
     private LocalDateTime returnTime;
 
 
     @Schema(description = "点收人")
     @Schema(description = "点收人")
-    private String receviePerson;
+    private String receivePerson;
 
 
     @Schema(description = "回库附件")
     @Schema(description = "回库附件")
     private String annexReturn;
     private String annexReturn;
@@ -79,4 +79,6 @@ public class MuseumFlowPageVO extends PageParam {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String nots;
     private String nots;
 
 
+    @Schema(description = "状态")
+    private Integer state;
 }
 }

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

@@ -48,8 +48,8 @@ public class MuseumFlowRespVO {
     @Schema(description = "审批人")
     @Schema(description = "审批人")
     private String reviewPerson;
     private String reviewPerson;
 
 
-    @Schema(description = "状态")
-    private Integer state;
+    @Schema(description = "审批状态")
+    private Integer stateReview;
 
 
     @Schema(description = "审批时间")
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
     private LocalDateTime reviewTime;
@@ -64,7 +64,7 @@ public class MuseumFlowRespVO {
     private LocalDateTime returnTime;
     private LocalDateTime returnTime;
 
 
     @Schema(description = "点收人")
     @Schema(description = "点收人")
-    private String receviePerson;
+    private String receivePerson;
 
 
     @Schema(description = "回库附件")
     @Schema(description = "回库附件")
     private String annexReturn;
     private String annexReturn;
@@ -72,4 +72,6 @@ public class MuseumFlowRespVO {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String nots;
     private String nots;
 
 
+    @Schema(description = "状态")
+    private Integer state;
 }
 }

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

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "博物馆-审批表信息 review VO")
+@Data
+public class MuseumFlowReviewVO {
+
+    @TableId
+    @Schema(description = "样品ID")
+    private Integer id;
+
+    @Schema(description = "样品编号")
+    private String number;
+
+    @Schema(description = "尺寸")
+    private String sampleName;
+
+    @Schema(description = "样品名称")
+    private String outboundPerson;
+
+    @Schema(description = "出库时间")
+    private LocalDateTime outboundTime;
+
+    @Schema(description = "目的")
+    private String purpose;
+
+    @Schema(description = "出库附件")
+    private String annexOut;
+
+    @Schema(description = "申请人")
+    private String applyPerson;
+
+    @Schema(description = "申请单位")
+    private String applyUnit;
+
+    @Schema(description = "申请时间")
+    private LocalDateTime applyTime;
+
+    @Schema(description = "预计退还时间")
+    private String returnExpect;
+
+    @Schema(description = "审批人")
+    private String reviewPerson;
+
+    @Schema(description = "审批状态")
+    private Integer stateReview;
+
+    @Schema(description = "审批时间")
+    private LocalDateTime reviewTime;
+
+    @Schema(description = "拒绝原因")
+    private String rejectSeason;
+
+    @Schema(description = "备注")
+    private String nots;
+
+    @Schema(description = "状态")
+    private Integer state;
+}

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

@@ -49,8 +49,8 @@ public class MuseumFlowSaveVO {
     @Schema(description = "审批人")
     @Schema(description = "审批人")
     private String reviewPerson;
     private String reviewPerson;
 
 
-    @Schema(description = "状态")
-    private Integer state;
+    @Schema(description = "审批状态")
+    private Integer stateReview;
 
 
     @Schema(description = "审批时间")
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
     private LocalDateTime reviewTime;
@@ -73,4 +73,6 @@ public class MuseumFlowSaveVO {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String nots;
     private String nots;
 
 
+    @Schema(description = "状态")
+    private Integer state;
 }
 }

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

@@ -58,8 +58,8 @@ public class MuseumFlowDO extends BaseDO {
     @Schema(description = "审批人")
     @Schema(description = "审批人")
     private String reviewPerson;
     private String reviewPerson;
 
 
-    @Schema(description = "状态")
-    private Integer state;
+    @Schema(description = "审批状态")
+    private Integer stateReview;
 
 
     @Schema(description = "审批时间")
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
     private LocalDateTime reviewTime;
@@ -74,7 +74,7 @@ public class MuseumFlowDO extends BaseDO {
     private LocalDateTime returnTime;
     private LocalDateTime returnTime;
 
 
     @Schema(description = "点收人")
     @Schema(description = "点收人")
-    private String receviePerson;
+    private String receivePerson;
 
 
     @Schema(description = "回库附件")
     @Schema(description = "回库附件")
     private String annexReturn;
     private String annexReturn;
@@ -82,4 +82,6 @@ public class MuseumFlowDO extends BaseDO {
     @Schema(description = "备注")
     @Schema(description = "备注")
     private String nots;
     private String nots;
 
 
+    @Schema(description = "状态")
+    private Integer state;
 }
 }

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

@@ -27,25 +27,27 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     @Select("SELECT * FROM museum_outbound WHERE id = #{id} AND deleted =0 ")
     @Select("SELECT * FROM museum_outbound WHERE id = #{id} AND deleted =0 ")
     MuseumFlowDO selectMuseumFlowById(@Param("id") Integer id);
     MuseumFlowDO selectMuseumFlowById(@Param("id") Integer id);
 
 
-/**根据编号在总表中进行查找**/
+
+/**搜索功能
+
+    /**根据编号在总表中进行查找**/
     @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0 ")
     @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0 ")
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
 
 
-/**将样品状态更新为1**/
-    @Update("UPDATE museum_outbound SET state=0  WHERE number =#{number}")
-    void updateMuseumFlowState(MuseumFlowDO museumFlowDO);
+    /**根据编号在Flow库中进行查找*/
+    @Select("SELECT * FROM museum_outbound WHERE number = #{id} AND deleted = 0")
+    MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
 
-///**将样品状态更新为4**/
-    @Update("UPDATE museum_outbound SET state=4 WHERE number =#{number}")
-    void updateMuseumFlowState4(MuseumFlowDO museumFlowDO);
 
 
-///**将样品状态更新为4**/
-    @Update("UPDATE museum_outbound SET state=3 WHERE number =#{number}")
-    void updateMuseumFlowState3(MuseumFlowDO museumFlowDO);
+/**出库功能
+
+    /**将主库样品状态更新为1**/
+    @Update("UPDATE museum_info SET save=1  WHERE sample_id = #{sample_id}")
+    void updateMuseumFlowSave(MuseumFlowDO museumFlowDO);
 
 
-/**分页**/
-   default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
 
 
+//   default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
+/**分页**/
    default PageResult<MuseumFlowDO> selectPage1(MuseumFlowPageVO pageVO){
    default PageResult<MuseumFlowDO> selectPage1(MuseumFlowPageVO pageVO){
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
@@ -62,6 +64,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 //               .inIfPresent(MuseumFlowDO::getId, id)
 //               .inIfPresent(MuseumFlowDO::getId, id)
 //               .orderByDesc(MuseumFlowDO::getId));
 //               .orderByDesc(MuseumFlowDO::getId));
    }
    }
+    /**根据出库员进行分页查找*/
     default List<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
     default List<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
 
 
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
@@ -72,5 +75,17 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
         return selectList(queryWrapper);
         return selectList(queryWrapper);
     }
     }
 
 
+/**审批功能
+
+    /**将样品状态更新为2 审批中**/
+    @Update("UPDATE museum_outbound SET state=2  WHERE number =#{number}")
+    void updateMuseumFlowStateReview2(MuseumFlowDO MuseumFlowDO);
+
+    /**将样品状态更新为3 审批通过**/
+    @Update("UPDATE museum_outbound SET state=3  WHERE number =#{number}")
+    void updateMuseumFlowStateReview3(MuseumFlowDO MuseumFlowDO);
 
 
+    /**将样品状态更新为4 审批驳回**/
+    @Update("UPDATE museum_outbound SET state=4  WHERE number =#{number}")
+    void updateMuseumFlowStateReview4(MuseumFlowDO MuseumFlowDO);
 }
 }

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

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

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

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