巡检内容添加巡检项时加上类型

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -75,4 +75,9 @@ public class CmmsInspectContent implements Serializable {
     /**备注*/
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /** 分类 */
+    @Excel(name = "分类", width = 15)
+    @ApiModelProperty(value = "分类")
+    @Dict(dicCode = "inspect_item_type")
+    private java.lang.String classification;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -16,17 +16,12 @@
         <result property="status"    column="status"    />
         <result property="equipmentname"    column="equipmentname"    />
         <result property="sysOrgCode"    column="sys_org_code"    />
+        <result property="classification" column="classification" />
     </resultMap>
 
-    <sql id="selectCmmsSpotcheckContentVo">
-        select id, create_by, create_time, update_by, update_time, remark,
-               contentcode, contentname, equipmentid, status,sys_org_code
-        from cmms_inspect_content
-    </sql>
-
     <select id="getCmmsInspectContent" parameterType="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent" resultMap="CmmsSpotcheckContentResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
-        c.contentcode, c.contentname, c.equipmentid, c.status, c.sys_org_code, e.equipmentname
+        c.contentcode, c.contentname, c.equipmentid, c.status, c.classification, c.sys_org_code, e.equipmentname
         from cmms_inspect_content as c
         left join tpm_equipment as e on c.equipmentid = e.id
         <where>
@@ -40,7 +35,7 @@
 
     <select id="getCmmsInspectContentById" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
+               a.contentcode, a.contentname, a.equipmentid, a.status, a.classification,a.sys_org_code, e.equipmentname
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.id = #{id}
@@ -56,7 +51,7 @@
 
     <select id="getCmmsInspectContentByEqId" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
+               a.contentcode, a.contentname, a.equipmentid, a.status, a.classification,a.sys_org_code, e.equipmentname
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.equipmentid = #{eqid}