检查项+循环周期

op-modules/op-device/src/main/java/com/op/device/domain/EquCheckItem.java

@@ -98,6 +98,28 @@ public class EquCheckItem extends BaseEntity {
 	// 检查项工具
 	private String itemTools;
 
+	// 循环周期类型
+	private String itemLoopType;
+
+	// 循环周期
+	private int itemLoop;
+
+	public int getItemLoop() {
+		return itemLoop;
+	}
+
+	public void setItemLoop(int itemLoop) {
+		this.itemLoop = itemLoop;
+	}
+
+	public String getItemLoopType() {
+		return itemLoopType;
+	}
+
+	public void setItemLoopType(String itemLoopType) {
+		this.itemLoopType = itemLoopType;
+	}
+
 	public String getItemTools() {
 		return itemTools;
 	}

op-modules/op-device/src/main/java/com/op/device/domain/dto/EquCheckItemDTO.java

@@ -65,6 +65,28 @@ public class EquCheckItemDTO {
     // 检查工具
     private String itemTools;
 
+    // 循环周期类型
+    private String itemLoopType;
+
+    // 循环周期
+    private int itemLoop;
+
+    public String getItemLoopType() {
+        return itemLoopType;
+    }
+
+    public void setItemLoopType(String itemLoopType) {
+        this.itemLoopType = itemLoopType;
+    }
+
+    public int getItemLoop() {
+        return itemLoop;
+    }
+
+    public void setItemLoop(int itemLoop) {
+        this.itemLoop = itemLoop;
+    }
+
     public String getItemTools() {
         return itemTools;
     }

op-modules/op-device/src/main/java/com/op/device/domain/vo/EquCheckItemVO.java

@@ -49,6 +49,28 @@ public class EquCheckItemVO {
     // 检查工具
     private String itemTools;
 
+    // 循环周期类型
+    private String itemLoopType;
+
+    // 循环周期
+    private int itemLoop;
+
+    public String getItemLoopType() {
+        return itemLoopType;
+    }
+
+    public void setItemLoopType(String itemLoopType) {
+        this.itemLoopType = itemLoopType;
+    }
+
+    public int getItemLoop() {
+        return itemLoop;
+    }
+
+    public void setItemLoop(int itemLoop) {
+        this.itemLoop = itemLoop;
+    }
+
     public String getItemTools() {
         return itemTools;
     }

op-modules/op-device/src/main/resources/mapper/device/EquCheckItemMapper.xml

@@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"	column="update_time"	/>
 		<result property="updateBy"	column="update_by"	/>
 		<result property="itemTools"	column="item_tools"	/>
+		<result property="itemLoop"	column="item_loop"	/>
+		<result property="itemLoopType"	column="item_loop_type"	/>
 	</resultMap>
 
 	<sql id="selectEquCheckItemVo">
-		select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by ,item_tools from equ_check_item
+		select item_id, item_code, item_name, item_method, item_type, item_type_name, item_remark, factory_code, attr1, attr2, attr3, del_flag, create_time, create_by, update_time, update_by ,item_tools ,item_loop,item_loop_type from equ_check_item
 	</sql>
 
 	<select id="selectEquCheckItemList" parameterType="EquCheckItem" resultMap="EquCheckItemResult">
@@ -42,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
 			<if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
+			<if test="itemLoop != null  and itemLoop != ''"> and item_loop = #{itemLoop}</if>
+			<if test="itemLoopType != null  and itemLoopType != ''"> and item_loop_type = #{itemLoopType}</if>
 			<if test="itemTools != null  and itemTools != ''"> and item_tools like concat('%', #{itemTools}, '%')</if>
 			<if test="createTimeStart != null "> and CONVERT(date,create_time) >= #{createTimeStart}</if>
 			<if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,create_time)</if>
@@ -103,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">update_time,</if>
 			<if test="updateBy != null and updateBy != ''">update_by,</if>
 			<if test="itemTools != null and itemTools != ''">item_tools,</if>
+			<if test="itemLoop != null and itemLoop != ''">item_loop,</if>
+			<if test="itemLoopType != null and itemLoopType != ''">item_loop_type,</if>
 		 </trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="itemId != null">#{itemId},</if>
@@ -122,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">#{updateTime},</if>
 			<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
 			<if test="itemTools != null and itemTools != ''">#{itemTools},</if>
+			<if test="itemLoop != null and itemLoop != ''">#{itemLoop},</if>
+			<if test="itemLoopType != null and itemLoopType != ''">#{itemLoopType},</if>
 		 </trim>
 	</insert>
 
@@ -144,6 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="updateTime != null">update_time = #{updateTime},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="itemTools != null and itemTools != ''">item_tools = #{itemTools},</if>
+			<if test="itemLoop != null and itemLoop != ''">item_loop = #{itemLoop},</if>
+			<if test="itemLoopType != null and itemLoopType != ''">item_loop_type = #{itemLoopType},</if>
 		</trim>
 		where item_id = #{itemId} and del_flag = '0'
 	</update>