todo

Signed-off-by: hyy <2924767532@qq.com>

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

@@ -35,7 +35,7 @@ public class MuseumFlowController {
     @Resource
     private PermissionService permissionService;
 
-
+    //TODO 没有用的接口和方法就删掉了
     @PostMapping("/create")
     @Operation(summary = "新增表单")
     public Integer createMuseumFlow(MuseumFlowSaveVO saveVO) {
@@ -108,6 +108,8 @@ public class MuseumFlowController {
                     return CommonResult.error(2, id + museumFlowService.isMuseumFlowStateForm(State));
                 }
             } else {
+                //TODO 错误信息要写得官方一点，比如说用户是不知道id是什么的
+                // 这里就可以改成您选择的表单不存在
                 return CommonResult.error(2, "该id对应的表单不存在");
             }
         } else {
@@ -146,6 +148,7 @@ public class MuseumFlowController {
                     } else if (result.getStore() == 1) {
                         List<MuseumFlowDO> event = museumFlowService.selectMuseumFlowByNumbersLike(number);
                         if (event != null) {
+                            //TODO 就算在出库表中，也要判断一下在出库表中的状态是否为已回库，如果已回库就应该是允许出库的，而不是返回错误信息
                             errorList.addAll(museumFlowService.isMuseumFlowStateOutbound0(event, number));
                         }
                     } else {
@@ -245,4 +248,8 @@ public class MuseumFlowController {
             return CommonResult.error(2, "您无此操作权限");
         }
     }
+
+    //TODO 有空可以研究一下Excel导出
+    // 参考yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java文件下的exportUserList接口方法
+
 }

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

@@ -164,7 +164,8 @@ public class MuseumInfoController {
         int currentYear =date.getYear();
         List<MuseuminfoMonthSaveVO> result = new ArrayList<>();
         for (int month = 1 ; month <= 12 ; month++) {
-            int number = countSampleNumbers(museumInfoService.MuseumInfoBySaveOut(month, currentYear));
+            //TODO 可以直接使用List<String>.size(),就不用写一个countSampleNumbers来计算list中元素的个数了
+            int number = museumInfoService.MuseumInfoBySaveOut(month, currentYear).size();
             MuseuminfoMonthSaveVO re = new MuseuminfoMonthSaveVO();
             re.setMonth(month);
             re.setCount(number);
@@ -210,6 +211,7 @@ public class MuseumInfoController {
                     map.put(year,innerMap);
                     result.add(map);
                 }
+
         return CommonResult.success(result);
     }
 
@@ -233,8 +235,6 @@ public class MuseumInfoController {
         return count;
     }
 
-
-
     @GetMapping("/originCount")
     @Operation(summary = "标本来源计数")
     public CommonResult<List<Map<Integer,Object>>> getOrigin(){
@@ -261,6 +261,7 @@ public class MuseumInfoController {
         }
         return CommonResult.success(result);
     }
+
     @GetMapping("/get-import-sample")
     @Operation(summary = "获得导入标本模板")
     public void importSample(HttpServletResponse response) throws IOException {
@@ -286,7 +287,6 @@ public class MuseumInfoController {
         return success(museumInfoService.importSampleList(list, updateSupport));
     }
 
-
-
-
+    //TODO 有空可以研究一下Excel导出
+    // 参考yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java文件下的exportUserList接口方法
 }

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

@@ -52,6 +52,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
 
 /**搜索功能
 
+    //TODO 写代码的时候记得把注释写好，否则容易造成混乱，比如说你下面三个注释都是一样的
     /**根据编号在总表中进行查找**/
     @Select("SELECT * FROM museum_info WHERE sample_id = #{sample_id} AND deleted =0 ")
     MuseumInfoDO selectMuseumFlowBySampleId(@Param("sample_id") String sample_id);

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

@@ -158,8 +158,10 @@ public interface MuseumInfoMapper extends BaseMapperX<MuseumInfoDO> {
     default List<MuseumInfoDO> selectPageList(MuseumInfoPageReqVO pageReqVO) {
         LambdaQueryWrapperX<MuseumInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper.inIfPresent(MuseumInfoDO::getSampleId,pageReqVO.getSampleId())
+                //TODO 重复
                 .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
                 .eqIfPresent(MuseumInfoDO::getSampleType, pageReqVO.getSampleType())
+
                 .likeIfPresent(MuseumInfoDO::getPlace, pageReqVO.getPlace())
                 .orderByDesc(MuseumInfoDO::getId);
         return selectList(queryWrapper);

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

@@ -17,6 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 
 @Service
 public class MuseumFlowServiceImpl implements MuseumFlowService {
@@ -102,10 +103,13 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
     /**将样品信息为输入值 saveVO*/
     public void updateMuseumFlowOutbound(MuseumFlowSaveVO saveVO){
         Long UserId = getLoginUserId();
+        //TODO 下面的方法可以获得用户昵称  String userName = getLoginUserNickname();
         AdminUserDO user = museumFlowMapper.selectAdminUserDOById(UserId);
         String userName = user.getUsername();
         saveVO.setOutboundTime(LocalDateTime.now()).setState(1).setOutboundPerson(userName);;
         museumFlowMapper.updateMuseumFlowOutbound(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
+        //TODO 可以用系统自带的updateById方法
+        // museumFlowMapper.updateById(BeanUtils.toBean(saveVO,MuseumFlowDO.class));
     }
 
     /**添加出库单功能中 若表单已创建过判断标本状态*/
@@ -230,6 +234,7 @@ public class MuseumFlowServiceImpl implements MuseumFlowService {
         AdminUserDO user = museumFlowMapper.selectAdminUserDOById(UserId);
         String userName = user.getUsername();
         museumFlowDO.setReviewTime(LocalDateTime.now()).setReviewPerson(userName);
+        //TODO 可以用系统自带的updateById方法
         museumFlowMapper.updateMuseumFlowStateReview(museumFlowDO);
     }