报表优化

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

@@ -142,6 +142,16 @@ public class EquOrder extends BaseEntity {
 
 	private String orderInspect;
 
+	private String repairCode;
+
+	public String getRepairCode() {
+		return repairCode;
+	}
+
+	public void setRepairCode(String repairCode) {
+		this.repairCode = repairCode;
+	}
+
 	public String getOrderInspect() {
 		return orderInspect;
 	}

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

@@ -86,6 +86,16 @@ public class EquOrderStandard extends BaseEntity {
 
     private String standardTypeName;
 
+    private String errorFlag;
+
+    public String getErrorFlag() {
+        return errorFlag;
+    }
+
+    public void setErrorFlag(String errorFlag) {
+        this.errorFlag = errorFlag;
+    }
+
     public String getStandardTypeName() {
         return standardTypeName;
     }

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

@@ -37,10 +37,11 @@
 		<result property="calculationRule"	column="calculation_rule"	/>
 		<result property="shutDown"	column="shut_down"	/>
 		<result property="orderInspect"	column="order_inspect"	/>
+		<result property="repairCode"	column="repair_code"	/>
 	</resultMap>
 
 	<sql id="selectEquOrderVo">
-		select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, order_cost, plan_person, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect from equ_order
+		select order_id, plan_id, plan_code, plan_type, order_code, plan_workshop, plan_prod_line, plan_loop, plan_loop_type, plan_loop_start, plan_loop_end, order_start, order_end, equipment_code, order_status, order_cost, plan_person, order_cost_time, order_sign_person, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,upkeep,calculation_rule,shut_down,order_inspect,repair_code from equ_order
 	</sql>
 
 	<select id="selectEquOrderList" parameterType="EquOrder" resultMap="EquOrderResult">
@@ -77,6 +78,7 @@
 			<if test="calculationRule != null "> and calculation_rule = #{calculationRule}</if>
 			<if test="shutDown != null "> and shut_down = #{shutDown}</if>
 			<if test="orderInspect != null "> and order_inspect = #{orderInspect}</if>
+			<if test="repairCode != null "> and repair_code = #{repairCode}</if>
 			and del_flag = '0'
 		</where>
 	</select>
@@ -158,6 +160,7 @@
 			<if test="calculationRule != null">calculation_rule,</if>
 			<if test="shutDown != null">shut_down,</if>
 			<if test="orderInspect != null">order_inspect,</if>
+			<if test="repairCode != null">repair_code,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="orderId != null">#{orderId},</if>
@@ -192,6 +195,7 @@
 			<if test="calculationRule != null">#{calculationRule},</if>
 			<if test="shutDown != null">#{shutDown},</if>
 			<if test="orderInspect != null">#{orderInspect},</if>
+			<if test="repairCode != null">#{repairCode},</if>
 		</trim>
 	</insert>
 
@@ -229,6 +233,7 @@
 			<if test="calculationRule != null">calculation_rule = #{calculationRule},</if>
 			<if test="shutDown != null">shut_down = #{shutDown},</if>
 			<if test="orderInspect != null">order_inspect = #{orderInspect},</if>
+			<if test="repairCode != null">repair_code = #{repairCode},</if>
 		</trim>
 		where order_id = #{orderId}
 	</update>

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

@@ -27,10 +27,11 @@
         <result property="updateBy"	column="update_by"	/>
         <result property="updateTime"	column="update_time"	/>
         <result property="picturePath"	column="picture_path"	/>
+        <result property="errorFlag"	column="error_flag"	/>
     </resultMap>
 
     <sql id="selectEquOrderStandardVo">
-        select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path from equ_order_standard
+        select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path,error_flag from equ_order_standard
     </sql>
 
     <select id="selectEquOrderStandardList" parameterType="EquOrderStandard" resultMap="EquOrderStandardResult">
@@ -52,6 +53,7 @@
             <if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''"> and attr3 = #{attr3}</if>
             <if test="picturePath != null  and picturePath != ''"> and picture_path = #{picturePath}</if>
+            <if test="errorFlag != null  and errorFlag != ''"> and error_flag = #{errorFlag}</if>
         </where>
     </select>
 
@@ -90,6 +92,7 @@
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="picturePath != null">picture_path,</if>
+            <if test="errorFlag != null">error_flag,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -114,6 +117,7 @@
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="picturePath != null">#{picturePath},</if>
+            <if test="errorFlag != null">#{errorFlag},</if>
         </trim>
     </insert>
 
@@ -157,6 +161,7 @@
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="picturePath != null">picture_path = #{picturePath},</if>
+            <if test="errorFlag != null">error_flag = #{errorFlag},</if>
         </trim>
         where id = #{id}
     </update>