修复了DO

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

@@ -60,7 +60,7 @@ public class MuseumFlowController {
         if(result == null){
             return CommonResult.error(200,"样品不存在");
         }
-        int condition=result.getState();
+        int condition=result.getSave();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过
         if(condition == 0){
             return CommonResult.error(200,"样品不在库中");
@@ -89,7 +89,7 @@ public class MuseumFlowController {
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
         }
-        int condition = result.getCondition();
+        int condition = result.getSave();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
         if (condition == 4) {
             return CommonResult.error(200, "样品审批已被驳回");
@@ -118,7 +118,7 @@ public class MuseumFlowController {
         if (result == null) {
             return CommonResult.error(200, "样品不存在");
         }
-        int condition = result.getCondition();
+        int condition = result.getSave();
         //      0现为已出库，1为未出库或已回库，2为审批中，3为审批通过，4为审批驳回
         if (condition == 4) {
             return CommonResult.error(200, "样品审批已被驳回");

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

@@ -92,11 +92,12 @@ public class MuseumInfoController {
 //    Map<> 键值对
     @GetMapping("/sampleTypeCount")
     @Operation(summary = "标本类型计数")
-    public CommonResult<Map<String,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
-          Map<String,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
+    public CommonResult<Map<MuseumInfoRespVO,Integer>> getMap(@RequestParam("sampleType") Integer sampleType){
+          Map<MuseumInfoRespVO,Integer> result =museumInfoService.MuseumInfoBySampleType(sampleType);
 //          标本类型：矿石-1 岩石-2 矿物-3 陨石-4
-          Integer Type = sampleType;
-          result.put("标本类型:",Type);
+//          Integer Type = sampleType;
+//          result.put(Type);
+//        "标本类型:"
           return CommonResult.success(result);
     }
 

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,30 @@ 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;
 
 }

yudao-module-museum/yudao-module-museum-biz/src/main/java/cn/iocoder/yudao/module/museum/dal/mysql/museuminfo/MuseumInfoMapper.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.dal.database.museumflow.MuseumFlowDO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,7 +47,7 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
      * 标本类型计数
      * */
     @Select("SELECT COUNT(*)  FROM museum_info WHERE sample_type =#{sampleType} AND deleted =0 AND save =1")
-    Map<String,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
+    Map<MuseumInfoRespVO,Integer> countMuseumInfoBySampleType(@Param("sampleType") Integer sampleType);
     /**
      * 标本出入库状态计数
      * */

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.museum.service.museuminfo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import org.apache.ibatis.annotations.Param;
@@ -49,7 +50,7 @@ public interface MuseumInfoService {
    /**
     * 标本类型计数
     * */
-   Map<String,Integer> MuseumInfoBySampleType(Integer sampleType);
+   Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType);
    /**
     * 标本出入库状态计数
     * */

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.museum.service.museuminfo;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoPageReqVO;
+import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoRespVO;
 import cn.iocoder.yudao.module.museum.controller.admin.museuminfo.vo.MuseumInfoSaveVO;
 import cn.iocoder.yudao.module.museum.dal.database.museuminfo.MuseumInfoDO;
 import cn.iocoder.yudao.module.museum.dal.mysql.museuminfo.MuseumInfoMapper;
@@ -82,7 +83,7 @@ public  class  MuseumInfoServiceImpl implements MuseumInfoService {
     * 标本类型计数
     * */
    @Override
-   public Map<String,Integer> MuseumInfoBySampleType(Integer sampleType){
+   public Map<MuseumInfoRespVO,Integer> MuseumInfoBySampleType(Integer sampleType){
       return museumInfoMapper.countMuseumInfoBySampleType(sampleType);
    }
    /**