Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge

2025-11-12 13:50:14 +08:00
parent 59e33c22b7 e4e6cfbff7
commit 52094d58e7
23 changed files with 119 additions and 45 deletions
--- a/src/main/resources/mapper/primary/WorkspaceMapper.xml
+++ b/src/main/resources/mapper/primary/WorkspaceMapper.xml
@@ -27,5 +27,10 @@
    <select id="selectWorkspacePage" resultMap="BaseResultMap">
        select * from workspace where is_deleted = 0
    </select>
+    <select id="getStyleByProjectId" resultType="java.lang.String">
+        select name from style where id =
+        (select style_id from workspace_rel_style where workspace_id =
+        (select id from workspace where project_id = #{projectId}))
+    </select>

 </mapper>
--- a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml
+++ b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml
@@ -110,4 +110,21 @@
            ${tableName}
        WHERE img_name = #{replace}
    </select>
+    <select id="getCountByStyle" resultType="java.lang.Integer">
+        SELECT
+            count(*)
+        FROM
+            ${tableName}
+        WHERE style = #{style} and deprecated = 0
+    </select>
+
+    <select id="getOneSystemSketchRadom" resultType="java.lang.String">
+        SELECT
+            img_name
+        FROM
+            ${tableName}
+        WHERE style = #{style}
+        and deprecated = 0
+        ORDER BY ID LIMIT #{randomNum},1
+    </select>
 </mapper>
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -231,6 +231,7 @@ OVERALL=Overall
 TOPS=Tops
 BOTTOMS=Bottoms
 OUTWEAR=Outwear
+OTHERS=Others
 BLOUSE=Blouse
 DRESS=Dress
 TROUSERS=Trousers
--- a/src/main/resources/messages_fr.properties
+++ b/src/main/resources/messages_fr.properties
@@ -171,6 +171,7 @@ OVERALL=Général
 TOPS=Hauts
 BOTTOMS=Bas
 OUTWEAR=Manteau
+OTHERS=Autres
 BLOUSE=Chemisier
 DRESS=Robe
 TROUSERS=Pantalons
--- a/src/main/resources/messages_it.properties
+++ b/src/main/resources/messages_it.properties
@@ -171,6 +171,7 @@ OVERALL=Complessivo
 TOPS=Parte superiore
 BOTTOMS=Parte inferiore
 OUTWEAR=Capo esterno
+OTHERS=Altri
 BLOUSE=Camicetta
 DRESS=Vestito
 TROUSERS=Pantaloni
--- a/src/main/resources/messages_ja.properties
+++ b/src/main/resources/messages_ja.properties
@@ -171,6 +171,7 @@ OVERALL=全体
 TOPS=トップス
 BOTTOMS=ボトムス
 OUTWEAR=アウターウェア
+OTHERS=その他
 BLOUSE=ブラウス
 DRESS=ドレス
 TROUSERS=ズボン
--- a/src/main/resources/messages_ko.properties
+++ b/src/main/resources/messages_ko.properties
@@ -171,6 +171,7 @@ OVERALL=전체
 TOPS=상의
 BOTTOMS=하의
 OUTWEAR=외투
+OTHERS=기타
 BLOUSE=블라우스
 DRESS=드레스
 TROUSERS=바지
--- a/src/main/resources/messages_ru.properties
+++ b/src/main/resources/messages_ru.properties
@@ -171,6 +171,7 @@ OVERALL=Общий
 TOPS=Топы
 BOTTOMS=Штаны
 OUTWEAR=Верхняя одежда
+OTHERS=ДРУГИЕ
 BLOUSE=Блуза
 DRESS=Платье
 TROUSERS=Брюки
--- a/src/main/resources/messages_th.properties
+++ b/src/main/resources/messages_th.properties
@@ -171,6 +171,7 @@ OVERALL=โดยรวม
 TOPS=เสื้อ
 BOTTOMS=กางเกง
 OUTWEAR=เสื้อผ้านอก
+OTHERS=อื่นๆ
 BLOUSE=เสื้อผ้าผู้หญิง
 DRESS=ชุดเดรส
 TROUSERS=กางเกงขายาว
--- a/src/main/resources/messages_vi.properties
+++ b/src/main/resources/messages_vi.properties
@@ -171,6 +171,7 @@ OVERALL=Tổng thể
 TOPS=Áo đầu
 BOTTOMS=Quần
 OUTWEAR=Áo ngoại cỡ
+OTHERS=KHÁC
 BLOUSE=Áo sơ mi nữ
 DRESS=Váy
 TROUSERS=Quần dài
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -225,6 +225,7 @@ OVERALL=整体
 TOPS=上装
 BOTTOMS=下装
 OUTWEAR=外套
+OTHERS=其他
 BLOUSE=上衣
 DRESS=连衣裙
 TROUSERS=裤子