实际完成时间查询

platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartInfoDTO.java

@@ -27,6 +27,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SparePartInfoDTO extends BaseDTO implements Serializable {
+    /**
+     * 品牌
+     */
+    private String brand;
+
     /**
      * 是否专用备件
      */

platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartInfo.java

@@ -26,6 +26,11 @@ import javax.persistence.Transient;
 @Data
 @Accessors(chain = true)
 public class SparePartInfo implements Serializable {
+    /**
+     * 品牌
+     */
+    private String brand;
+
     /**
      * 是否专用备件
      */

platform-dao/src/main/java/com/platform/dao/vo/query/sparepartmanage/SparePartInfoVO.java

@@ -28,6 +28,11 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SparePartInfoVO extends BaseVO implements Serializable {
+    /**
+     * 品牌
+     */
+    private String brand;
+
     /**
      * 是否专用备件
      */

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartInfoMapper.xml

@@ -77,7 +77,8 @@ warn_status,forecast_status,
     english_name,
     zjm,
     cd,
-    yt
+    yt,
+    brand
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO"
             resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
@@ -183,6 +184,9 @@ warn_status,forecast_status,
             <if test="searchType">
                 AND info.type_id not in (select id from t_spare_type)
             </if>
+            <if test="brand!=null">
+                and info.brand like concat('%',#{brand},'%')
+            </if>
         </where>
         group by info.id
         <if test="searchMinStockWarn">