Merge remote-tracking branch 'origin/master'

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java

@@ -210,8 +210,14 @@ public class MaType extends BaseEntity {
     private String facModel;
 
     /**
-     * 厂家规格型号
+     * 机具编码
      */
     @ApiModelProperty(value = "机具编号")
     private String machineCode;
+
+    /*
+    * 推送智慧工程定义的门类分类机具编码
+    * */
+    @ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码")
+    private String intelligentCode;
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineTypeMapper.xml

@@ -33,11 +33,11 @@
         <result property="isAncuo"    column="is_ancuo"    />
         <result property="remark"    column="remark"    />
         <result property="childPhoto"    column="childPhoto"    />
-        <result property="machineCode"    column="machine_code"    />
+        <result property="intelligentCode"    column="intelligent_code"    />
     </resultMap>
 
     <sql id="selectMaTypeVo">
-        select type_id, type_name, parent_id, status, num, company_id, code, unit_id, unit_name, manage_type, lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,machine_code ,fac_model, child_photo from ma_type
+        select type_id, type_name, parent_id, status, num, company_id, code, unit_id, unit_name, manage_type, lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,intelligent_code ,fac_model, child_photo from ma_type
     </sql>
 
     <insert id="insertType" parameterType="com.bonus.sgzb.base.api.domain.MaType" useGeneratedKeys="true" keyProperty="typeId">
@@ -71,7 +71,7 @@
             <if test="isAncuo != null">is_ancuo,</if>
             <if test="remark != null">remark,</if>
             <if test="facModel != null">fac_model,</if>
-            <if test="machineCode != null">machine_code,</if>
+            <if test="intelligentCode != null">intelligent_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
@@ -102,7 +102,7 @@
             <if test="isAncuo != null">#{isAncuo},</if>
             <if test="remark != null">#{remark},</if>
             <if test="facModel != null">#{facModel},</if>
-            <if test="machineCode != null">#{machineCode},</if>
+            <if test="intelligentCode != null">#{intelligentCode},</if>
         </trim>
     </insert>
 
@@ -160,7 +160,7 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="facModel != null">fac_model = #{facModel},</if>
-            <if test="machineCode != null">machine_code = #{machineCode},</if>
+            <if test="intelligentCode != null">intelligent_code = #{intelligentCode},</if>
         </trim>
         where type_id = #{typeId}
     </update>
@@ -287,7 +287,7 @@
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
                su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
                m.del_flag, m.create_by, m.create_time,
-               m.remark, m.company_id,m.fac_model as facModel,m.machine_code
+               m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code
         from ma_type m
                  left join ma_prop_set mps on m.type_id = mps.type_id
                  left join ma_prop_info mpi on mps.prop_id = mpi.prop_id