巡检点加启停状态

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java

@@ -68,6 +68,11 @@ public class CmmsInspectSpot implements Serializable {
 	@Excel(name = "设备类型", width = 15)
     @ApiModelProperty(value = "设备类型")
     private java.lang.String equipdefid;
+    /**状态：启用：0、禁用:1*/
+    @Excel(name = "状态：启用：0、禁用:1", width = 15, dicCode = "common_status")
+    @ApiModelProperty(value = "状态：启用：0、禁用:1")
+    @Dict(dicCode = "common_status")
+    private java.lang.String status;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml

@@ -13,18 +13,20 @@
         <result property="contentname"    column="contentname"    />
         <result property="equipdefid"    column="equipdefid"    />
         <result property="equipdefname"    column="equipdefname"    />
+        <result property="status"    column="status"    />
         <result property="sysOrgCode"    column="sys_org_code"    />
     </resultMap>
 
     <select id="getCmmsInspectSpotList" parameterType="org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot" resultMap="CmmsInspectContentResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
-        c.contentcode, c.contentname, c.equipdefid, c.sys_org_code, t.name as equipdefname
+        c.contentcode, c.contentname, c.equipdefid, c.status, c.sys_org_code, t.name as equipdefname
         from cmms_inspect_spot as c
         left join tpm_equipment_tree as t
         on c.equipdefid = t.id
         <where>
             <if test="cmmsInspectSpot.contentcode != null  and cmmsInspectSpot.contentcode != ''"> and (c.contentcode like concat('%', #{cmmsInspectSpot.contentcode}, '%') or c.contentname like concat('%', #{cmmsInspectSpot.contentcode}, '%'))</if>
             <if test="cmmsInspectSpot.equipdefid != null "> and c.equipdefid = #{cmmsInspectSpot.equipdefid}</if>
+            <if test="cmmsInspectSpot.status != null "> and c.status = #{cmmsInspectSpot.status}</if>
         </where>
         order by c.create_time desc
     </select>