工作台

yudao-module-museums/yudao-module-museums-api/src/main/java/cn/iocoder/yudao/module/museums/enums/social/LogRecordConstants.java

@@ -20,16 +20,14 @@ public interface LogRecordConstants {
     String MUSEUMS_SPECIMEN_DELETE_SUCCESS = "删除了标本【编号: {{#specimenNumber}}】, 理由: {{#deletedReason}}";
 
     // ======================= SPECIMEN 导入 =======================
-    String SPECIMEN_IMPORT_TYPE = "MUSEUMS 标本导入";
     String SPECIMEN_IMPORT_SUB_TYPE = "导入标本";
     String SPECIMEN_IMPORT_SUCCESS = "成功导入标本";
     String SPECIMEN_IMPORT_SUCCESS_ID = "{{#extra}}";
 
     // ======================= SPECIMEN_OUTBOUND 相关日志 =======================
-//    String SYSTEM_SPECIMEN_TYPE = "MUSEUMS 标本出库单";
     String MUSEUMS_SPECIMEN_OUTBOUND_SUB_TYPE = "标本出库";
     String MUSEUMS_SPECIMEN_RETURN_SUB_TYPE = "标本回库";
-    String MUSEUMS_SPECIMEN_CREATE_OUTBOUND_SUCCESS = "创建了标本出库单【{{#specimenOutbound.id}}】,申请人: {{#createReqVO.applicantName}}, 用途: {{#createReqVO.applicationUsage}}";
+    String MUSEUMS_SPECIMEN_CREATE_OUTBOUND_SUCCESS = "创建了标本出库单【{{#specimenOutbound.id}}】,申请人: {{#createReqVO.applicantName}},申请单位: {{#createReqVO.applicationUsage}},研究项目: {{#createReqVO.projectName}}";
     String MUSEUMS_SPECIMEN_UPDATE_RETURN_SUCCESS = "更新了标本回库单【{{#existingSpecimen.id}}】, 标本情况: {{#existingSpecimen.specimenCondition}}, 退还人: {{#updateReqVO.returner}}, 点收人: {{#updateReqVO.receiver}}, 备注: {{#updateReqVO.remarks}}";
     String MUSEUMS_SPECIMEN_UPDATE_RECOMPILE_SUCCESS = "修改了标本出库单【{{#updateReqVO.id}}】:{_DIFF{#updateReqVO}}";
     String MUSEUMS_SPECIMEN_CREATE_CONFIEM_OUTBOUND_SUCCESS = "{{#operator}}确认了标本出库";

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimeninfo/vo/SpecimenOutboundFormRespVO.java

@@ -42,7 +42,7 @@ public class SpecimenOutboundFormRespVO {
     private String imageName;
 
     @Schema(description = "图片路径")
-    private List<String> imagePath;
+    private String imagePath;
 
     @Schema(description = "标本数量")
     private Integer specimenAmount;

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/specimenoutbound/vo/SpecimenOutboundWithInfoRespVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.museums.controller.admin.specimenoutbound.vo;
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
 import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenOutboundFormRespVO;
 import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -68,6 +69,6 @@ public class SpecimenOutboundWithInfoRespVO {
 
     @Schema(description = "关联标本信息列表")
     @ExcelProperty("关联标本信息")
-    private List<SpecimenOutboundFormRespVO> specimenInfoList;
+    private List<SpecimenInfoRespVO> specimenInfoList;
 
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/service/specimenoutbound/SpecimenOutboundServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.museums.service.specimenoutbound;
 
+import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenInfoRespVO;
 import cn.iocoder.yudao.module.museums.controller.admin.specimeninfo.vo.SpecimenOutboundFormRespVO;
 import cn.iocoder.yudao.module.museums.dal.dataobject.specimeninfo.SpecimenInfoDO;
 import cn.iocoder.yudao.module.museums.dal.mysql.specimeninfo.SpecimenInfoMapper;
@@ -326,7 +327,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
 
         // 查询所有关联的标本信息
         List<SpecimenOutboundFormRespVO> specimenInfoList = specimenInfoMapper.selectByIds(idList); // 假设你有这个 Mapper
-
+        List<SpecimenInfoRespVO> newSpecimenInfoList =BeanUtils.toBean(specimenInfoList,SpecimenInfoRespVO.class);
         // 创建返回对象
         SpecimenOutboundWithInfoRespVO response = new SpecimenOutboundWithInfoRespVO();
         // 手动复制出库信息属性
@@ -335,7 +336,7 @@ public class SpecimenOutboundServiceImpl implements SpecimenOutboundService {
         response.setApplicantName(specimenOutbound.getApplicantName());
         response.setApplicationUsage(specimenOutbound.getApplicationUsage());
         // 设置所有关联的标本信息
-        response.setSpecimenInfoList(specimenInfoList);
+        response.setSpecimenInfoList(newSpecimenInfoList);
         return response;
     }
 

yudao-module-museums/yudao-module-museums-biz/src/main/resources/mapper/specimeninfo/SpecimenInfoMapper.xml

@@ -26,14 +26,14 @@
 
     <select id="selectMonthlyEntryStatisticsByYear" parameterType="int" resultType="map">
         SELECT
-            MONTH(entry_date) AS month,
+            MONTH(create_time) AS month,
             COUNT(*) AS entryCount
         FROM
             museums_specimen_info
         WHERE
-            YEAR(entry_date) = #{year}
+            YEAR(create_time) = #{year}
         GROUP BY
-            MONTH(entry_date)
+            MONTH(create_time)
         ORDER BY
             month
     </select>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java

@@ -14,8 +14,7 @@ import java.util.List;
 @Mapper
 public interface OperateLogMapper extends BaseMapperX<OperateLogDO> {
 
-    default PageResult<OperateLogDO> selectPage(OperateLogPageReqVO pageReqDTO) {
-
+    default PageResult<OperateLogDO> selectMuseumsPage(OperateLogPageReqVO pageReqDTO) {
         String id = pageReqDTO.getExtra().get(0).toString();
         return selectPage(pageReqDTO, new LambdaQueryWrapperX<OperateLogDO>()
                 .eqIfPresent(OperateLogDO::getUserId, pageReqDTO.getUserId())
@@ -39,5 +38,18 @@ public interface OperateLogMapper extends BaseMapperX<OperateLogDO> {
                 .orderByDesc(OperateLogDO::getId));
     }
 
+    default PageResult<OperateLogDO> selectPage(OperateLogPageReqVO pageReqDTO) {
+        return selectPage(pageReqDTO, new LambdaQueryWrapperX<OperateLogDO>()
+                .eqIfPresent(OperateLogDO::getUserId, pageReqDTO.getUserId())
+                .eqIfPresent(OperateLogDO::getBizId, pageReqDTO.getBizId())
+                .likeIfPresent(OperateLogDO::getType, pageReqDTO.getType())
+                .likeIfPresent(OperateLogDO::getSubType, pageReqDTO.getSubType())
+                .likeIfPresent(OperateLogDO::getAction, pageReqDTO.getAction())
+                .betweenIfPresent(OperateLogDO::getCreateTime, pageReqDTO.getCreateTime())
+                .orderByDesc(OperateLogDO::getId));
+    }
+
+
+
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java

@@ -45,6 +45,6 @@ public class OperateLogServiceImpl implements OperateLogService {
 
     @Override
     public List<OperateLogDO> getLogsBySpecimenIdAndType(OperateLogPageReqVO pageReqDTO) {
-        return operateLogMapper.selectPage(pageReqDTO).getList();
+        return operateLogMapper.selectMuseumsPage(pageReqDTO).getList();
     }
 }