2024/04/29_模型接口修改

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/TModelDTO.java

@@ -36,7 +36,7 @@ public class TModelDTO extends PageParam implements Serializable {
     /**
      * 模型分类id
      */
-    private Integer modelTypeId;
+    private String modelTypeIds;
 
     /**
      * 排序

rs-website/rs-website-server/src/main/resources/mapper/TModelMapper.xml

@@ -82,7 +82,10 @@
             AND t.released_by like concat('%',#{releasedBy},'%')
         </if>
         <if test="softwareFramework != null and softwareFramework != ''">
-            AND t.software_framework like concat('%',#{softwareFramework},'%')
+            AND t.software_framework in
+            <foreach item="item" index="index" collection="softwareFramework.split(',')"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="status != null">
             AND t.`status` = #{status}
@@ -96,8 +99,8 @@
         <if test="hardwareType != null">
             AND t.`hardware_type` = #{hardwareType}
         </if>
-        <if test="modelTypeId != null">
-            AND ttr.`model_type_id` = #{modelTypeId}
+        <if test="modelTypeIds != null">
+            AND ttr.`model_type_id` in (${modelTypeIds})
         </if>
         GROUP BY t.`id`
         <choose>