驾驶舱

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtWorkOrderController.java

@@ -427,6 +427,9 @@ public class GxtWorkOrderController extends BaseController
     public void exportHomePageOrderList(HttpServletResponse response, GxtOrderData gxtOrderData)
     {
         List<GxtOrderData> list = gxtWorkOrderService.selectHomePageWorkOrderList(gxtOrderData);
+        if (gxtOrderData.getWorkOrder() || gxtOrderData.getRepairOrder()) {
+            gxtOrderData.setOrderType("true");
+        }
 
         // 获取有值的字段名称
         List<String> nonNullFields = new ArrayList<>();

ygtx-gxt/src/main/java/com/ygtx/gxt/service/IGxtOrderPersonService.java

@@ -17,4 +17,28 @@ public interface IGxtOrderPersonService
      * @return 人员工单工分集合
      */
     public List<GxtOrderPerson> selectGxtOrderPersonList(GxtOrderPerson gxtOrderPerson);
+
+    public int delRepairOrderFlowRecords();
+
+    public int delRepairOrderFlowRecordsNext();
+
+    public int delWorkOrderFlowRecords();
+
+    public int delWorkOrderFlowRecordsNext();
+
+    public int addRepairOrderFlowRecords();
+
+    public int addRepairOrderFlowRecordsNext();
+
+    public int addWorkOrderFlowRecords();
+
+    public int addWorkOrderFlowRecordsNext();
+
+    public Integer repairOrderFlowRecordsSize();
+
+    public Integer workOrderFlowRecordsSize();
+
+    public Integer selectRepairOrderFlowRecordsSize();
+
+    public Integer selectWorkOrderFlowRecordsSize();
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtMonthScoreServiceImpl.java

@@ -714,8 +714,8 @@ public class GxtMonthScoreServiceImpl implements IGxtMonthScoreService
         if (rtType==0) {
             userScore.setUserName(userAccount);
             userScore.setNickName(nickName);
-        }else {
-            userScore.setRankPermission(getJXY());
+//        }else {
+//            userScore.setRankPermission(getJXY());
         }
         List<GxtUserScore> userScores = gxtUserScoreMapper.selectGxtUserScoreList(userScore);
 

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtOrderPersonServiceImpl.java

@@ -32,4 +32,64 @@ public class GxtOrderPersonServiceImpl implements IGxtOrderPersonService
     {
         return gxtOrderPersonMapper.selectGxtScoreDetailList(gxtOrderPerson);
     }
+
+    @Override
+    public int delRepairOrderFlowRecords() {
+        return gxtOrderPersonMapper.delRepairOrderFlowRecords();
+    }
+
+    @Override
+    public int delRepairOrderFlowRecordsNext() {
+        return gxtOrderPersonMapper.delRepairOrderFlowRecordsNext();
+    }
+
+    @Override
+    public int delWorkOrderFlowRecords() {
+        return gxtOrderPersonMapper.delWorkOrderFlowRecords();
+    }
+
+    @Override
+    public int delWorkOrderFlowRecordsNext() {
+        return gxtOrderPersonMapper.delWorkOrderFlowRecordsNext();
+    }
+
+    @Override
+    public int addRepairOrderFlowRecords() {
+        return gxtOrderPersonMapper.addRepairOrderFlowRecords();
+    }
+
+    @Override
+    public int addRepairOrderFlowRecordsNext() {
+        return gxtOrderPersonMapper.addRepairOrderFlowRecordsNext();
+    }
+
+    @Override
+    public int addWorkOrderFlowRecords() {
+        return gxtOrderPersonMapper.addWorkOrderFlowRecords();
+    }
+
+    @Override
+    public int addWorkOrderFlowRecordsNext() {
+        return gxtOrderPersonMapper.addWorkOrderFlowRecordsNext();
+    }
+
+    @Override
+    public Integer repairOrderFlowRecordsSize() {
+        return gxtOrderPersonMapper.repairOrderFlowRecordsSize();
+    }
+
+    @Override
+    public Integer workOrderFlowRecordsSize() {
+        return gxtOrderPersonMapper.workOrderFlowRecordsSize();
+    }
+
+    @Override
+    public Integer selectRepairOrderFlowRecordsSize() {
+        return gxtOrderPersonMapper.selectRepairOrderFlowRecordsSize();
+    }
+
+    @Override
+    public Integer selectWorkOrderFlowRecordsSize() {
+        return gxtOrderPersonMapper.selectWorkOrderFlowRecordsSize();
+    }
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -2035,28 +2035,6 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
 
     @Override
     public GxtOrderData selectHomePageData() {
-        try {
-            Integer workOrderFlowRecordsSize = orderPersonMapper.workOrderFlowRecordsSize();
-            Integer repairOrderFlowRecordsSize = orderPersonMapper.repairOrderFlowRecordsSize();
-            Integer workOrderFlowRecordsSizeNext = orderPersonMapper.selectWorkOrderFlowRecordsSize();
-            Integer repairOrderFlowRecordsSizeNext = orderPersonMapper.selectRepairOrderFlowRecordsSize();
-
-            if (workOrderFlowRecordsSize != null && workOrderFlowRecordsSizeNext != null && !workOrderFlowRecordsSizeNext.equals(workOrderFlowRecordsSize)) {
-                orderPersonMapper.delWorkOrderFlowRecordsNext();
-                orderPersonMapper.delWorkOrderFlowRecords();
-                orderPersonMapper.addWorkOrderFlowRecords();
-                orderPersonMapper.addWorkOrderFlowRecordsNext();
-            }
-
-            if (repairOrderFlowRecordsSize != null && repairOrderFlowRecordsSizeNext != null && !repairOrderFlowRecordsSizeNext.equals(repairOrderFlowRecordsSize)) {
-                orderPersonMapper.delRepairOrderFlowRecordsNext();
-                orderPersonMapper.delRepairOrderFlowRecords();
-                orderPersonMapper.addRepairOrderFlowRecords();
-                orderPersonMapper.addRepairOrderFlowRecordsNext();
-            }
-        }catch (Exception err) {
-            System.out.println("insert err by 149");
-        }
         Long userId = SecurityUtils.getUserId();
         Long deptId = SecurityUtils.getDeptId();
         LoginUser loginUser = SecurityUtils.getLoginUser();

ygtx-gxt/src/main/java/com/ygtx/gxt/task/WorkOrderPutAsideTimeTask.java

@@ -0,0 +1,48 @@
+package com.ygtx.gxt.task;
+
+import com.ygtx.gxt.service.IGxtOrderPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+
+@EnableScheduling
+@Component("workOrderPutAsideTimeTask")
+public class WorkOrderPutAsideTimeTask {
+
+    private static final Logger log = LoggerFactory.getLogger(WorkOrderPutAsideTimeTask.class);
+
+    @Autowired
+    private IGxtOrderPersonService orderPersonService;
+
+
+    public void processWorkOrderPutAsideTime() {
+        log.info("开始执行挂起时长统计任务");
+        try {
+            Integer workOrderFlowRecordsSize = orderPersonService.workOrderFlowRecordsSize();
+            Integer repairOrderFlowRecordsSize = orderPersonService.repairOrderFlowRecordsSize();
+            Integer workOrderFlowRecordsSizeNext = orderPersonService.selectWorkOrderFlowRecordsSize();
+            Integer repairOrderFlowRecordsSizeNext = orderPersonService.selectRepairOrderFlowRecordsSize();
+
+            if (workOrderFlowRecordsSize != null && workOrderFlowRecordsSizeNext != null && !workOrderFlowRecordsSizeNext.equals(workOrderFlowRecordsSize)) {
+                orderPersonService.delWorkOrderFlowRecordsNext();
+                orderPersonService.delWorkOrderFlowRecords();
+                orderPersonService.addWorkOrderFlowRecords();
+                orderPersonService.addWorkOrderFlowRecordsNext();
+            }
+
+            if (repairOrderFlowRecordsSize != null && repairOrderFlowRecordsSizeNext != null && !repairOrderFlowRecordsSizeNext.equals(repairOrderFlowRecordsSize)) {
+                orderPersonService.delRepairOrderFlowRecordsNext();
+                orderPersonService.delRepairOrderFlowRecords();
+                orderPersonService.addRepairOrderFlowRecords();
+                orderPersonService.addRepairOrderFlowRecordsNext();
+            }
+            log.info("挂起时长统计任务执行完成，原有{}个维保挂起数据，{}个维修挂起数据，实际 {} 个维保挂起数据，{} 个维修挂起数据",
+                    workOrderFlowRecordsSizeNext, repairOrderFlowRecordsSizeNext, workOrderFlowRecordsSize, repairOrderFlowRecordsSize);
+        }catch (Exception err) {
+            log.error("执行执行挂起时长统计任务时发生异常", err);
+        }
+    }
+
+}

ygtx-ui/src/views/index4.vue

@@ -615,6 +615,7 @@ export default {
         score: null,
         remark: null,
         devices: null,
+        orderType: null,
       },
       orderList: [],
       // 添加首页统计数据
@@ -1474,9 +1475,6 @@ export default {
       return parseFloat(rounded).toString();
     },
     handleExport() {
-      if (this.queryParams.workOrder || this.queryParams.repairOrder) {
-        this.queryParams.orderType = true;
-      }
       this.download("gxt/order/exportHomePageOrderList", this.queryParams, `homePageOrderList_${new Date().getTime()}.xlsx`);
     },
     // 加载首页统计数据