设备报修状态默认审核完成，报修查询增加产线、设备名称

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

@@ -268,9 +268,18 @@ public class EquRepairOrder extends BaseEntity {
     //报修开始时间、结束时间
     private String orderTimeStart;
     private String orderTimeEnd;
-
+    private String bindEquipmentName;
     private Equipment equipment;
 
+
+    public String getBindEquipmentName() {
+        return bindEquipmentName;
+    }
+
+    public void setBindEquipmentName(String bindEquipmentName) {
+        this.bindEquipmentName = bindEquipmentName;
+    }
+
     public Equipment getEquipment() {
         return equipment;
     }

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

@@ -147,6 +147,7 @@ public class EquRepairWorkOrder extends BaseEntity {
     /////////////////////////////////////////////////////////设备表字段
     @Excel(name = "设备名称")
     private String equipmentName;//设备名称
+    private String bindEquipmentName;
     private String equipmentSpec;//规格型号
     private String equipmentTypeName;//设备类型名称
     private String equipmentLocation;//设备位置
@@ -208,6 +209,14 @@ public class EquRepairWorkOrder extends BaseEntity {
     private String fileList;
     private List<BaseFileData> files;
 
+    public String getBindEquipmentName() {
+        return bindEquipmentName;
+    }
+
+    public void setBindEquipmentName(String bindEquipmentName) {
+        this.bindEquipmentName = bindEquipmentName;
+    }
+
     //维修前 维修后
     public String getAfterRepairFile() {
         return afterRepairFile;

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -405,7 +405,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             if (equOrder.getPlanType().equals("maintenance")) {
                 equRepairOrder.setOrderSource("保养");
             }
-            equRepairOrder.setOrderStatus("2");
+            equRepairOrder.setOrderStatus("1");
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String key = "#header.poolName";
             equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
@@ -576,7 +576,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             equRepairOrder.setCreateBy(SecurityUtils.getUsername());
             equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername());
             equRepairOrder.setOrderTime(DateUtils.getNowDate());
-            equRepairOrder.setOrderStatus("2");
+            equRepairOrder.setOrderStatus("1");
             equRepairOrder.setOrderSource("手持PDA");
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String key = "#header.poolName";

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

@@ -34,6 +34,7 @@
         <!-- 设备 -->
         <result property="equipmentTypeName" column="equipment_type_name"/>
         <result property="equipmentName" column="equipment_name"/>
+        <result property="bindEquipmentName" column="bind_equipment_name"/>
         <result property="equipmentLocation" column="equipment_location"/>
         <result property="department" column="department"/>
         <result property="equipmentSpec" column="equipment_spec"/>
@@ -76,8 +77,39 @@
 	</sql>
 
     <sql id="selectEquRepairOrderVo">
-		select order_id, order_code, equipment_code, order_desc, order_breakdown_time, order_source, order_time, order_handle, order_repairman_code,order_repairman_name, order_connection, order_status, order_relevance, order_picture, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,factory_code,repair_destination,audit_opinion from equ_repair_order
+            SELECT
-	</sql>
+                order_id,
+                order_code,
+                ero.equipment_code,
+                be.equipment_name as equipment_name,
+                ebae.equipment_name as bind_equipment_name,
+                order_desc,
+                order_breakdown_time,
+                order_source,
+                order_time,
+                order_handle,
+                order_repairman_code,
+                order_repairman_name,
+                order_connection,
+                order_status,
+                order_relevance,
+                order_picture,
+                ero.attr1,
+                ero.attr2,
+                ero.attr3,
+                ero.del_flag,
+                ero.create_by,
+                ero.create_time,
+                ero.update_by,
+                ero.update_time,
+                ero.factory_code,
+                repair_destination,
+                audit_opinion
+            FROM
+                equ_repair_order ero
+                LEFT JOIN base_equipment be ON be.equipment_code = ero.equipment_code
+                LEFT JOIN equ_bind_auxiliary_equipment ebae ON  ebae.auxiliary_equipment_code = be.equipment_code
+		</sql>
 
     <select id="selectEquRepairOrderList" parameterType="EquRepairOrder" resultMap="EquRepairOrderResult">
         <include refid="selectEquRepairOrderVo"/>
@@ -108,8 +140,8 @@
             <!--审核-->
             <if test="orderStatus == null or orderStatus == '' ">and (order_status = '2' or order_status = '1')</if>
             <if test="orderStatus != null and orderStatus != '' ">and order_status = #{orderStatus} </if>
-            and del_flag = '0'
+            and ero.del_flag = '0'
-            ORDER BY create_time DESC
+            ORDER BY ero.create_time DESC
         </where>
     </select>
 

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

@@ -51,6 +51,7 @@
         <result property="auditOpinion" column="audit_opinion"/>
         <!--设备-->
         <result property="equipmentName" column="equipment_name"/>
+        <result property="bindEquipmentName" column="bind_equipment_name"/>
         <result property="equipmentSpec" column="equipment_spec"/>
         <result property="equipmentTypeName" column="equipment_type_name"/>
         <result property="equipmentLocation" column="equipment_location"/>
@@ -112,6 +113,7 @@
         erwo.work_outsource,
         erwo.work_down_machine,
         erwo.equipment_code,
+        ebae.equipment_name as bind_equipment_name,
         erwo.work_reason,
         erwo.work_fault_desc,
         erwo.work_start_time,
@@ -147,6 +149,7 @@
         from equ_repair_work_order erwo
         left join base_equipment be on erwo.equipment_code = be.equipment_code
         left join equ_team et on erwo.work_team = et.team_code
+        LEFT JOIN equ_bind_auxiliary_equipment ebae ON  ebae.auxiliary_equipment_code = erwo.equipment_code
         <where>
             <!--审核-->
             <if test="resultInspect == null or resultInspect == '' ">and ( erwo.result_inspect = '2' or  erwo.result_inspect = '1')</if>

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -310,7 +310,7 @@ public class OpenServiceImpl implements OpenService {
         }
         equRepairOrder.setCreateTime(DateUtils.getNowDate());
         equRepairOrder.setCreateBy(equRepairOrderDTO.getUserName());
-        equRepairOrder.setOrderStatus("2");                                                                         // 报修单状态
+        equRepairOrder.setOrderStatus("1");                                                                         // 报修单状态
         equRepairOrder.setFactoryCode(equRepairOrderDTO.getFactory());                                                  // 工厂
         if (equRepairOrderDTO.getPhoneNumber() != null) {
             equRepairOrder.setOrderConnection(equRepairOrderDTO.getPhoneNumber());                                      // 联系方式