设备维修工单导出修改

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

@@ -7,6 +7,7 @@ import com.op.common.core.web.domain.BaseEntity;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 故障描述对象 equ_fault_description
@@ -93,6 +94,9 @@ public class EquFaultDescription extends BaseEntity {
     // 创建日期结束
     private String createTimeEnd;
 
+    /** 设备类型对象 */
+    private List<Map> dictValue;
+
     /** 设备类型组 */
     private String[] dictValues;
 

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

@@ -51,6 +51,8 @@ public class EquRepairWorkOrder extends BaseEntity {
     private String workFaultDesc;
 
     private String orderDesc;//故障描述
+    @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;//报修时间
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -133,11 +135,11 @@ public class EquRepairWorkOrder extends BaseEntity {
 
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "维修实际开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "维修实际停机开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date actualDownStartTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "维修实际结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "维修实际停机结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date actualDownEndTime;
 
 
@@ -179,6 +181,7 @@ public class EquRepairWorkOrder extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderBreakdownTime;//故障时间
     private String orderSource;//报修来源
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;//报修时间
     private String orderRepairmanCode;//报修人
@@ -226,6 +229,16 @@ public class EquRepairWorkOrder extends BaseEntity {
     private String fileList;
     private List<BaseFileData> files;
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public String getBindEquipmentName() {
         return bindEquipmentName;
     }

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

@@ -205,4 +205,6 @@ public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionServi
     public List<String> selectFaultdesDictByfaultIds(String faultId) {
         return equFaultDescriptionMapper.selectFaultdesDictByfaultId(faultId);
     }
+
+
 }

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

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.domain.BaseFileData;
 import com.op.common.core.exception.auth.NotLoginException;
 import com.op.common.core.utils.DateUtils;
@@ -503,7 +504,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
                // double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours);
                 //故障时间 = 原来的故障时间 + 这次的故障时间
                 double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours);
-                DecimalFormat dfs = new DecimalFormat("#.00");
+                DecimalFormat dfs = new DecimalFormat("0.00");
                 String formattedFaultTime = dfs.format(faultTime);
 //                BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间
 //                BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());//运行时间
@@ -797,7 +798,7 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
     @DS("#header.poolName")
     public AjaxResult updateDeviceRunTimeORRate(Map map) {
         //查询产线绑定的设备情况
-
+        DynamicDataSourceContextHolder.push("ds_1000");
        try {
            List<Map> mapList = equEquipmentMapper.selectAuxiliaryEquipmentList(map);
            EquOperation equOperation=new EquOperation();
@@ -828,6 +829,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
            }
        }catch (Exception e){
            return error(e.getMessage());
+       }finally {
+           DynamicDataSourceContextHolder.poll();
        }
         return success();
     }