加字段

src/main/java/com/xujie/sys/modules/pms/controller/RepairTransdetailController.java

@@ -99,8 +99,19 @@ public class RepairTransdetailController {
         exportData.setPlanId(item.getPlanId());
         exportData.setObjectId(item.getObjectId());
         exportData.setObjectDesc(item.getObjectDesc());
+        exportData.setResourceDesc(item.getResourceDesc());
+        exportData.setPlanDesc(item.getPlanDesc());
+        exportData.setFaultReason(item.getFaultReason());
+        exportData.setHandlingMethod(item.getHandlingMethod());
         exportData.setStatus(item.getStatus());
+        exportData.setResult(item.getResult());
+        exportData.setCreateBy(item.getCreateBy());
+        exportData.setPlanOperatorName(item.getPlanOperatorName());
+        exportData.setActualOperatorName(item.getActualOperatorName());
+        exportData.setCreateDate(item.getCreateDate());
+        exportData.setReachDate(item.getReachDate());
         exportData.setActualDate(item.getActualDate());
+        exportData.setWorkTime(item.getWorkTime());
         exportData.setPartNo(item.getPartNo());
         exportData.setPartDescription(item.getPartDescription());
         exportData.setAveragePrice(item.getAveragePrice());

src/main/java/com/xujie/sys/modules/pms/data/RepairWorkOrderPartSpareExportData.java

@@ -23,12 +23,45 @@ public class RepairWorkOrderPartSpareExportData {
     @ExcelProperty("设备名称")
     private String objectDesc;
 
+    @ExcelProperty("机台名称")
+    private String resourceDesc;
+
+    @ExcelProperty("反馈描述")
+    private String planDesc;
+
+    @ExcelProperty("故障原因")
+    private String faultReason;
+
+    @ExcelProperty("处理方式")
+    private String handlingMethod;
+
     @ExcelProperty("工单状态")
     private String status;
 
+    @ExcelProperty("维修结论")
+    private String result;
+
+    @ExcelProperty("报修人员")
+    private String createBy;
+
+    @ExcelProperty("计划执行人员")
+    private String planOperatorName;
+
+    @ExcelProperty("实际执行人员")
+    private String actualOperatorName;
+
+    @ExcelProperty("故障时间")
+    private String createDate;
+
+    @ExcelProperty("到达时间")
+    private String reachDate;
+
     @ExcelProperty("工单执行时间")
     private String actualDate;
 
+    @ExcelProperty("工作时长(m)")
+    private BigDecimal workTime;
+
     @ExcelProperty("备品备件编码")
     private String partNo;
 

src/main/java/com/xujie/sys/modules/pms/data/RepairWorkOrderSpareQueryData.java

@@ -58,16 +58,71 @@ public class RepairWorkOrderSpareQueryData extends QueryPage {
      */
     private String objectDesc;
 
+    /**
+     * 机台名称
+     */
+    private String resourceDesc;
+
+    /**
+     * 反馈描述
+     */
+    private String planDesc;
+
+    /**
+     * 故障原因
+     */
+    private String faultReason;
+
+    /**
+     * 处理方式
+     */
+    private String handlingMethod;
+
     /**
      * 工单状态
      */
     private String status;
 
+    /**
+     * 维修结论
+     */
+    private String result;
+
+    /**
+     * 报修人员
+     */
+    private String createBy;
+
+    /**
+     * 计划执行人员
+     */
+    private String planOperatorName;
+
+    /**
+     * 实际执行人员
+     */
+    private String actualOperatorName;
+
+    /**
+     * 故障时间
+     */
+    private String createDate;
+
+    /**
+     * 到达时间
+     */
+    private String reachDate;
+
     /**
      * 工单执行时间
      */
     private String actualDate;
 
+    /**
+     * 工作时长（m）
+     */
+    private BigDecimal workTime;
+
     /**
      * 单价
      */

src/main/resources/mapper/pms/RepairTransdetailMapper.xml

@@ -77,8 +77,19 @@
             A.PlanID as planId,
             A.ObjectID as objectId,
             C.ObjectDesc as objectDesc,
+            dbo.eam_Get_eamResourceDesc(A.Site, A.ObjectID) as resourceDesc,
+            A.PlanDesc as planDesc,
+            A.fault_reason as faultReason,
+            A.handling_method as handlingMethod,
             A.Status as status,
+            A.Result as result,
+            dbo.eam_Get_eamAdminName_TPM(A.Site, FE.CreatedBy) as createBy,
+            dbo.eam_Get_eamAdminName_TPM(A.Site, A.PlanOperator) as planOperatorName,
+            dbo.joint_name(A.Site, A.bu_no, A.OrderNo, A.FunctionType) as actualOperatorName,
+            A.CreateDate as createDate,
+            A.reach_date as reachDate,
             A.ActualDate as actualDate,
+            A.WorkTime as workTime,
             R.PartNo as partNo,
             P.part_description as partDescription,
             P.average_price as averagePrice,
@@ -100,6 +111,7 @@
         left join repair_TransDetail R on B.Site = R.Site and B.bu_no = R.bu_no and B.transno = R.TransNo
         left join part_spare P on A.Site = P.site and A.bu_no = P.bu_no and R.PartNo = P.part_no
         left join eam_object C on A.Site = C.Site and A.bu_no = C.bu_no and A.ObjectID = C.ObjectID
+        left join eam_defect_feedBack FE on A.Site = FE.site and A.bu_no = FE.bu_no and A.PlanID = FE.feedBackID
         <where>
             A.FunctionType = 'C'
             and B.remarks is not null
@@ -139,8 +151,19 @@
             A.PlanID as planId,
             A.ObjectID as objectId,
             C.ObjectDesc as objectDesc,
+            dbo.eam_Get_eamResourceDesc(A.Site, A.ObjectID) as resourceDesc,
+            A.PlanDesc as planDesc,
+            A.fault_reason as faultReason,
+            A.handling_method as handlingMethod,
             A.Status as status,
+            A.Result as result,
+            dbo.eam_Get_eamAdminName_TPM(A.Site, FE.CreatedBy) as createBy,
+            dbo.eam_Get_eamAdminName_TPM(A.Site, A.PlanOperator) as planOperatorName,
+            dbo.joint_name(A.Site, A.bu_no, A.OrderNo, A.FunctionType) as actualOperatorName,
+            A.CreateDate as createDate,
+            A.reach_date as reachDate,
             A.ActualDate as actualDate,
+            A.WorkTime as workTime,
             R.PartNo as partNo,
             P.part_description as partDescription,
             P.average_price as averagePrice,
@@ -162,6 +185,7 @@
         left join repair_TransDetail R on B.Site = R.Site and B.bu_no = R.bu_no and B.transno = R.TransNo
         left join part_spare P on A.Site = P.site and A.bu_no = P.bu_no and R.PartNo = P.part_no
         left join eam_object C on A.Site = C.Site and A.bu_no = C.bu_no and A.ObjectID = C.ObjectID
+        left join eam_defect_feedBack FE on A.Site = FE.site and A.bu_no = FE.bu_no and A.PlanID = FE.feedBackID
         <where>
             A.FunctionType = 'C'
             and B.remarks is not null