Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaPartType.java

@@ -82,6 +82,9 @@ public class MaPartType extends BaseEntity {
     @Excel(name = "数据所属组织")
     private String companyId;
 
+    //框架年份
+//    @Excel(name = "年份")
+    private String year;
 
 }
 

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaPartTypeMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
         <result property="companyId"    column="company_id"    />
+        <result property="year"    column="year"    />
     </resultMap>
 
     <sql id="selectMaPartTypeVo">
@@ -82,11 +83,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMaPartType" parameterType="com.bonus.sgzb.base.domain.MaPartType" resultMap="MaPartTypeResult">
-        <include refid="selectMaPartTypeVo"/>
+        select pa_id, pa_name, parent_id, status, num, unit_id, buy_price, level, warn_num, del_flag, create_by, create_time, remark, company_id
+            from ma_part_type
         where del_flag = '0'
         <if test="paName != null and paName != ''">
             AND pa_name like concat('%', #{paName}, '%')
         </if>
+        <if test="year != null and year != ''">
+            AND year = #{year}
+        </if>
+
 
     </select>
 
@@ -99,4 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ma_part_type
         where pa_id = #{paId}
     </select>
-</mapper>
+</mapper>