审批程序

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

@@ -4,15 +4,19 @@ 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.*;
+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 cn.iocoder.yudao.module.museum.dal.mysql.museumflow.MuseumFlowMapper;
 import cn.iocoder.yudao.module.museum.service.museumflow.MuseumFlowService;
+import cn.iocoder.yudao.module.museum.service.museuminfo.MuseumInfoService;
 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;
+import java.util.ArrayList;
 import java.util.List;
 
 @Tag(name = "博物馆-出回库管理")
@@ -22,6 +26,7 @@ public class MuseumFlowController {
 
     @Resource
     private MuseumFlowService museumFlowService;
+    private MuseumInfoService museumInfoService;
 
     @PostMapping("/create")
     @Operation(summary = "新增表单")
@@ -51,31 +56,46 @@ public class MuseumFlowController {
         return CommonResult.success(result1);
     }
 
-//    @PostMapping("/outbound")
-//    @Operation(summary = "添加出库单")
-//    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO){
-//        List<String>sample_ids=saveVO.getNumber();
-//        for (String sample_id :sample_ids){
-//            MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
-//            if (result==null){
-//                return CommonResult.error(200,sample_id+"标本不存在");
-//            }
-//            break;
-//        }
-//        if(result == null){
-//            return CommonResult.error(200,"样品不存在");
-//        }else if(result != null){
-//            int Save=result.getSave();
-//            if (Save == 0) {
-//                return CommonResult.error(200, "样品不在库中");
-//            } else {
-//                museumFlowService.createMuseumFlow(saveVO);
-//                museumFlowService.updateMuseumFlowStateOutbound2(saveVO);
-//                return CommonResult.success(true);
-//            }
-//        }
-//        return CommonResult.success(true);
-//    }
+    @PostMapping("/outbound")
+    @Operation(summary = "添加出库单")
+    public CommonResult<Boolean>  createMuseumFlowOutbound(@RequestBody MuseumFlowSaveVO saveVO) {
+        List<String> sample_ids = saveVO.getNumber();
+        List<String> errorList = new ArrayList<>();
+        List<String> sample_names = new ArrayList<>();
+        for (String sample_id : sample_ids) {
+            MuseumInfoDO result = museumFlowService.selectMuseumFlowSampleId(sample_id);
+            if (result == null) {
+                errorList.add(sample_id+"标本不存在");
+            }
+            else {
+                int save = result.getSave();
+                String name = result.getChineseName();
+                if (save == 0) {
+                    errorList.add(sample_id+"标本不在库中");
+                }else {
+                    sample_names.add(name);
+                }
+            }
+        }
+        if (errorList.isEmpty()) {
+            saveVO.setSampleName(sample_names);//设置标本名称
+            museumFlowService.createMuseumFlow(saveVO);//创建表单
+            museumFlowService.updateMuseumFlowStateOutbound2(saveVO);//更改标本状态为出库
+
+
+//            museumFlowService.selectPageS(respVO);
+            return CommonResult.success(true);
+        }else {
+            System.out.println(errorList);
+            return CommonResult.error(200, "标本存在错误");
+        }
+    }
+
+    @GetMapping("/selectPageS")
+    @Operation(summary = "获取关于标本信息的分页")
+    public PageResult<MuseumInfoDO> selectPageS(@Valid MuseumInfoPageReqVO pageVO){
+           return museumInfoService.getMuseumInfoPage(pageVO);
+    }
 
     @GetMapping("/pagePerson")
     @Operation(summary = "获取关于出库员的分页")

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

@@ -17,7 +17,6 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class MuseumFlowPageVO extends PageParam {
 
-    @TableId
     @Schema(description = "样品ID")
     private Integer id;
 
@@ -31,7 +30,7 @@ public class MuseumFlowPageVO extends PageParam {
     private String outboundPerson;
 
     @Schema(description = "出库时间")
-    private LocalDateTime []outboundTime;
+    private LocalDateTime[] outboundTime;
 
     @Schema(description = "目的")
     private String purpose;
@@ -54,9 +53,6 @@ public class MuseumFlowPageVO extends PageParam {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 

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

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumFlowRespVO {
 
-    @TableId
     @Schema(description = "样品ID")
     private Integer id;
 
@@ -47,9 +46,6 @@ public class MuseumFlowRespVO {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 

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

@@ -10,7 +10,6 @@ import java.time.LocalDateTime;
 @Data
 public class MuseumFlowReturnVO {
 
-    @TableId
     @Schema(description = "样品ID")
     private Integer id;
 
@@ -47,9 +46,6 @@ public class MuseumFlowReturnVO {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 

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

@@ -47,9 +47,6 @@ public class MuseumFlowReviewVO {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museum.controller.admin.museumflow.vo;
 
+import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -11,7 +12,6 @@ import java.util.List;
 @Data
 public class MuseumFlowSaveVO {
 
-    @TableId
     @Schema(description = "样品ID")
     private Integer id;
 
@@ -19,7 +19,7 @@ public class MuseumFlowSaveVO {
     private List<String> number;
 
     @Schema(description = "样品名称")
-    private String sampleName;
+    private List<String> sampleName;
 
     @Schema(description = "出库员")
     private String outboundPerson;
@@ -48,9 +48,6 @@ public class MuseumFlowSaveVO {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 
@@ -75,4 +72,6 @@ public class MuseumFlowSaveVO {
     @Schema(description = "状态")
     private Integer state;
 
+    @Schema(description = "关联标本信息分页")
+    private List<MuseumInfoDO> museumInfoVO;
 }

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

@@ -58,9 +58,6 @@ public class MuseumFlowDO extends BaseDO {
     @Schema(description = "审批人")
     private String reviewPerson;
 
-    @Schema(description = "审批状态")
-    private Integer stateReview;
-
     @Schema(description = "审批时间")
     private LocalDateTime reviewTime;
 

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museumflow/MuseumFlowMapper.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.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 org.apache.ibatis.annotations.Mapper;
@@ -33,7 +34,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);
 
     /**根据编号在Flow库中进行查找*/
-    @Select("SELECT * FROM museum_outbound WHERE number = #{id} AND deleted = 0 ")
+    @Select("SELECT * FROM museum_outbound WHERE number = #{number} AND deleted = 0 ")
     MuseumFlowDO selectMuseumFlowByNumber(@Param("number")String number);
 
 
@@ -46,14 +47,13 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 
 //   default MuseumFlowDO selectPageMuseumFlowByPage(String number){return selectOne(MuseumFlowDO::getNumber,number);}
 /**分页**/
-   default PageResult<MuseumFlowDO> selectPageS(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);
+//   default PageResult<MuseumInfoDO> selectPageS(MuseumFlowPageVO pageVO) {
+//       LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
+//       queryWrapper.inIfPresent(MuseumInfoDO::getSampleId, pageVO.getNumber())
+//               .orderByDesc(MuseumInfoDO::getId);
+//       return selectPage(pageVO, queryWrapper);
+//   }
 
 //       return selectPage(pageVO ,new LambdaQueryWrapperX<MuseumFlowDO>()
 //               .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
@@ -66,13 +66,11 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 //        like 是模糊查询;
 //        order by 按照某个字段进行排序 ;加上 desc 表示降序排序(默认为升序 asc);
 //
-
-   }
     /**根据出库员进行分页查找*/
     default PageResult<MuseumFlowDO> selectPageMuseumFlowByOutboundPerson(MuseumFlowPageVO pageVO) {
 
        LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
-        queryWrapper .likeIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
+        queryWrapper .inIfPresent(MuseumFlowDO::getNumber,pageVO.getNumber())
                 .betweenIfPresent(MuseumFlowDO::getOutboundTime, pageVO.getOutboundTime())
                 .eqIfPresent(MuseumFlowDO::getOutboundPerson,pageVO.getOutboundPerson())
                 .orderByDesc(MuseumFlowDO::getId);

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

@@ -52,7 +52,7 @@ public interface MuseumFlowService {
 /**分页功能
 
     /**根据分页长度进行排序**/
-    PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
+//    PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO);
 
     /**根据出库员进行分页查找*/
     PageResult<MuseumFlowDO> selectPageMuseumFlowOutboundPerson(MuseumFlowPageVO pageVO);

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museum.service.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;
@@ -19,11 +20,11 @@ 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 Integer createMuseumFlow(MuseumFlowSaveVO saveVO){
+//        MuseumFlowDO result = BeanUtils.toBean(saveVO, MuseumFlowDO.class);
+//        return museumFlowMapper.insert(result);
+//    }
 
     @Override
     public void updateMuseumFlow(MuseumFlowSaveVO saveVO){
@@ -56,6 +57,13 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 
 /**出库功能
 
+    /**创建出库单*/
+    @Override
+    public Integer createMuseumFlow(MuseumFlowSaveVO saveVO) {
+        MuseumFlowDO result = BeanUtils.toBean(saveVO, MuseumFlowDO.class);
+        return museumFlowMapper.insert(result);
+    }
+
     /**将主库中样品状态设置为1*/
     @Override
     public void updateMuseumFlowSave1(MuseumFlowSaveVO saveVO){
@@ -79,10 +87,10 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
 /**分页功能
 
     /**根据分页长度进行排序**/
-    @Override
-    public PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
-        return  museumFlowMapper.selectPageS(pageVO);
-    }
+//    @Override
+//    public PageResult<MuseumFlowDO> selectPageS(MuseumFlowPageVO pageVO){
+//        return  museumFlowMapper.selectPageS(pageVO);
+//    }
 
 
 /**审批功能