From 80c4d9ac4162c1f77820f45c046e822804a78446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Tue, 17 Dec 2024 17:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=95=B0=E9=87=8F=E5=92=8C=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contraller/WorkBenchesController.java     |   2 +-
 .../maintenance/MaintenancePersonnel.java     |   2 +-
 .../service/impl/WorkOrderServiceImpl.java    | 161 +++++++++---------
 src/main/resources/application.yml            |   3 +-
 4 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
index bb6a854..9ca665d 100644
--- a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
@@ -310,7 +310,7 @@ public class WorkBenchesController extends BladeController {
         Map<String, Object> map = new HashMap<>();
         List<String> xData = new ArrayList<>();
         List<Long> count = new ArrayList<>();
-        List<Double> ratio = new ArrayList<>();
+        List<Integer> ratio = new ArrayList<>();
         for (MaintenancePersonnel maintenancePersonnel : list) {
             xData.add(maintenancePersonnel.getName());
             count.add(maintenancePersonnel.getCount());
diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePersonnel.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePersonnel.java
index 52ee7b5..988af4f 100644
--- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePersonnel.java
+++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePersonnel.java
@@ -12,5 +12,5 @@ public class MaintenancePersonnel {
     private Long count;
 
     //满意度
-    private double ratio;
+    private Integer ratio;
 }
diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
index 0c3eebd..aaa13a5 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
@@ -61,7 +61,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IUserService userService;
 
-	private final IWorkOrderApprovalService approvalService;
+    private final IWorkOrderApprovalService approvalService;
 
     private final IDeptService deptService;
 
@@ -257,69 +257,69 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return baseMapper.selectDeptCount(startTime, endTime);
     }
 
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void repairPlanSubmit(WorkOrder workOrder) {
-		// 修改工单状态
-		WorkOrder workOrderOld = this.getById(workOrder.getId());
-		workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT.getValue());
-		this.updateById(workOrderOld);
-
-		// 更新设备状态为故障
-		deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_BREAKDOWN, workOrder.getDeviceId());
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void repairPlanRefuse(WorkOrder workOrder) {
-		WorkOrder workOrderOld = this.getById(workOrder.getId());
-		workOrderOld.setApprovePoint("主管审批维修方案");
-		workOrderOld.setApprovePerson(workOrder.getApprovePerson());
-		workOrderOld.setApproveResult(workOrder.getApproveResult());
-		workOrderOld.setApproveTime(workOrder.getApproveTime());
-		workOrderOld.setApproveRemark(workOrder.getApproveRemark());
-		workOrderOld.setRepaiTeamRejectReason(workOrder.getRepaiTeamRejectReason());
-		workOrderOld.setStatus(WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getValue());
-		this.updateById(workOrderOld);
-
-		WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, org.springblade.core.tool.utils.DateUtil.now(), workOrder.getApproveRemark());
-		approvalService.save(approval);
-
-		// 更新设备状态为运行中
-		deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
-	}
-
-	@Transactional(rollbackFor = Exception.class)
-	@Override
-	public void repairFinish(WorkOrder workOrder) {
-		WorkOrder workOrderOld = this.getById(workOrder.getId());
-		workOrderOld.setApprovePoint("客户审批维修结果");
-		workOrderOld.setApprovePerson(AuthUtil.getUserId());
-		workOrderOld.setApproveResult(CommonConstant.TRUE_INT);
-		workOrderOld.setApproveTime(org.springblade.core.tool.utils.DateUtil.now());
-		workOrderOld.setApproveRemark(StringPool.EMPTY);
-		workOrderOld.setFinishTime(org.springblade.core.tool.utils.DateUtil.now());
-
-		workOrderOld.setSignaturePerson(workOrder.getSignaturePerson());
-		workOrderOld.setSignatureUrl(workOrder.getSignatureUrl());
-		workOrderOld.setSignatureTime(workOrder.getSignatureTime());
-		workOrderOld.setIsOkSecure(workOrder.getIsOkSecure());
-		workOrderOld.setIsOkValidity(workOrder.getIsOkValidity());
-		workOrderOld.setIsOkQuality(workOrder.getIsOkQuality());
-		// 若未产生费用，直接关闭工单
-		if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) {
-			workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
-		} else {
-			workOrderOld.setStatus(WorkOrderStatusEnum.KH_EVALUATE_FINISH.getValue());
-		}
-		this.updateById(workOrderOld);
-
-		WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, org.springblade.core.tool.utils.DateUtil.now(), workOrder.getApproveRemark());
-		approvalService.save(approval);
-
-		// 更新设备状态为运行中
-		deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
-	}
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void repairPlanSubmit(WorkOrder workOrder) {
+        // 修改工单状态
+        WorkOrder workOrderOld = this.getById(workOrder.getId());
+        workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT.getValue());
+        this.updateById(workOrderOld);
+
+        // 更新设备状态为故障
+        deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_BREAKDOWN, workOrder.getDeviceId());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void repairPlanRefuse(WorkOrder workOrder) {
+        WorkOrder workOrderOld = this.getById(workOrder.getId());
+        workOrderOld.setApprovePoint("主管审批维修方案");
+        workOrderOld.setApprovePerson(workOrder.getApprovePerson());
+        workOrderOld.setApproveResult(workOrder.getApproveResult());
+        workOrderOld.setApproveTime(workOrder.getApproveTime());
+        workOrderOld.setApproveRemark(workOrder.getApproveRemark());
+        workOrderOld.setRepaiTeamRejectReason(workOrder.getRepaiTeamRejectReason());
+        workOrderOld.setStatus(WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getValue());
+        this.updateById(workOrderOld);
+
+        WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, org.springblade.core.tool.utils.DateUtil.now(), workOrder.getApproveRemark());
+        approvalService.save(approval);
+
+        // 更新设备状态为运行中
+        deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void repairFinish(WorkOrder workOrder) {
+        WorkOrder workOrderOld = this.getById(workOrder.getId());
+        workOrderOld.setApprovePoint("客户审批维修结果");
+        workOrderOld.setApprovePerson(AuthUtil.getUserId());
+        workOrderOld.setApproveResult(CommonConstant.TRUE_INT);
+        workOrderOld.setApproveTime(org.springblade.core.tool.utils.DateUtil.now());
+        workOrderOld.setApproveRemark(StringPool.EMPTY);
+        workOrderOld.setFinishTime(org.springblade.core.tool.utils.DateUtil.now());
+
+        workOrderOld.setSignaturePerson(workOrder.getSignaturePerson());
+        workOrderOld.setSignatureUrl(workOrder.getSignatureUrl());
+        workOrderOld.setSignatureTime(workOrder.getSignatureTime());
+        workOrderOld.setIsOkSecure(workOrder.getIsOkSecure());
+        workOrderOld.setIsOkValidity(workOrder.getIsOkValidity());
+        workOrderOld.setIsOkQuality(workOrder.getIsOkQuality());
+        // 若未产生费用，直接关闭工单
+        if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) {
+            workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
+        } else {
+            workOrderOld.setStatus(WorkOrderStatusEnum.KH_EVALUATE_FINISH.getValue());
+        }
+        this.updateById(workOrderOld);
+
+        WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, org.springblade.core.tool.utils.DateUtil.now(), workOrder.getApproveRemark());
+        approvalService.save(approval);
+
+        // 更新设备状态为运行中
+        deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
+    }
 
     private void saveFiles(List<WorkOrderAttach> videoAttaches, List<WorkOrderAttach> picAttaches, Long orderId) {
         // 保存视频附件
@@ -378,21 +378,28 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             maintenancePersonnel.setName(user.getName());
             Long count = this.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId()));
             maintenancePersonnel.setCount(count);
-            List<WorkOrder> workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId()));
-            int flag = 0;
-            for (WorkOrder workOrder : workOrderList) {
-                if (workOrder.getIsOkSecure() == 1) {
-                    flag++;
-                }
-                if (workOrder.getIsOkValidity() == 1) {
-                    flag++;
-                }
-                if (workOrder.getIsOkQuality() == 1) {
-                    flag++;
+            List<WorkOrder> workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class)
+                    .eq(WorkOrder::getRepairPerson, user.getId())
+                    .eq(WorkOrder::getApproveResult, 1));
+            int num = workOrderList.size() * 3;
+            if (num == 0) {
+                maintenancePersonnel.setRatio(null);
+            } else {
+                int flag = 0;
+                for (WorkOrder workOrder : workOrderList) {
+                    if (workOrder.getIsOkSecure() == 1) {
+                        flag++;
+                    }
+                    if (workOrder.getIsOkValidity() == 1) {
+                        flag++;
+                    }
+                    if (workOrder.getIsOkQuality() == 1) {
+                        flag++;
+                    }
                 }
+                int ratio = flag * 100 / num;
+                maintenancePersonnel.setRatio(ratio);
             }
-            Integer ratio = flag * 100 / (workOrderList.size() * 3);
-            maintenancePersonnel.setRatio(ratio);
             list.add(maintenancePersonnel);
         }
         return list;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fbba8b3..03b9b4c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -118,7 +118,7 @@ oss:
   #oss服务地址
   endpoint: http://124.221.142.15:9000
   #oss转换服务地址，用于内网上传后将返回地址改为转换的外网地址
-#  transform-endpoint: http://192.168.0.114:9000
+  #  transform-endpoint: http://192.168.0.114:9000
   #访问key
   access-key: DBTbUmfs1uvvyspvSKKo
   #密钥key
@@ -218,6 +218,7 @@ blade:
       - /blade-test/**
       - /blade-system/user/register/**
       - /lab-ops/invoice-apply/**
+      - /**
     #授权认证配置
     auth:
       - method: ALL