From 97b922c1bee6c8701f62036761a22107c2f19870 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 1 Apr 2025 17:52:55 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/SysFileService.java     |  2 +-
 .../com/ai/da/service/impl/SysFileServiceImpl.java | 14 +++++++++++++-
 .../ai/da/service/impl/WorkspaceServiceImpl.java   |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/service/SysFileService.java b/src/main/java/com/ai/da/service/SysFileService.java
index 0b35bb04..a2a04ad5 100644
--- a/src/main/java/com/ai/da/service/SysFileService.java
+++ b/src/main/java/com/ai/da/service/SysFileService.java
@@ -61,5 +61,5 @@ public interface SysFileService extends IService<SysFile> {
 
     List<SysFile> getByIds(List<Long> ids);
 
-    SysFile getOneBySex(Long styleId, String sex);
+    SysFile getOneBySex(Long styleId, String sex, String ageGroup);
 }
diff --git a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java
index 08d6f412..978e93c1 100644
--- a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java
@@ -7,9 +7,11 @@ import com.ai.da.common.enums.SysFileLevel1TypeEnum;
 import com.ai.da.common.enums.SysFileLevel2TypeEnum;
 import com.ai.da.common.utils.*;
 import com.ai.da.mapper.primary.StyleMapper;
+import com.ai.da.mapper.primary.SysFileExtraMapper;
 import com.ai.da.mapper.primary.SysFileMapper;
 import com.ai.da.mapper.primary.entity.Style;
 import com.ai.da.mapper.primary.entity.SysFile;
+import com.ai.da.mapper.primary.entity.SysFileExtra;
 import com.ai.da.model.vo.SysFileVO;
 import com.ai.da.service.SysFileService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +46,8 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
     @Resource
     private SysFileMapper sysFileMapper;
     @Resource
+    private SysFileExtraMapper sysFileExtraMapper;
+    @Resource
     private FileProperties fileProperties;
     @Resource
     private StyleMapper styleMapper;
@@ -273,7 +277,7 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
     }
 
     @Override
-    public SysFile getOneBySex(Long styleId, String sex) {
+    public SysFile getOneBySex(Long styleId, String sex, String ageGroup) {
         Style style = new Style();
         if (styleId != null) {
             style = styleMapper.selectById(styleId);
@@ -281,6 +285,14 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> impl
         QueryWrapper<SysFile> qw = new QueryWrapper<>();
         qw.lambda().eq(SysFile::getLevel1Type, "Models");
         qw.lambda().eq(SysFile::getLevel2Type, sex);
+
+        QueryWrapper<SysFileExtra> sysFileExtraQW = new QueryWrapper<>();
+        sysFileExtraQW.lambda().eq(SysFileExtra::getAgeGroup, ageGroup);
+        Set<Long> collect = sysFileExtraMapper.selectList(sysFileExtraQW).stream().map(SysFileExtra::getSysId).collect(Collectors.toSet());
+        if (!CollectionUtils.isEmpty(collect)) {
+            qw.lambda().in(SysFile::getId, collect);
+        }
+
         if (style.getId() != null) {
             qw.lambda().eq(SysFile::getLevel3Type, style.getName());
         }
diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
index 19e17489..7b53edf5 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -742,7 +742,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
             workspace.setUpdateTime(LocalDateTime.now());
 
             if (projectDTO.getProcess().equals(DesignProcess.SERIES_DESIGN.name()) || projectDTO.getProcess().equals(DesignProcess.SKETCH_COLLAGE_PROCESS.name())) {
-                SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex());
+                SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex(), projectDTO.getWorkspace().getAgeGroup());
 
                 if (projectDTO.getWorkspace().getSex().equals(Sex.FEMALE.getValue())) {
                     workspace.setMannequinFemaleId(sysFile.getId());