From 837774b1b5b2f1ed26d11923e72b48b7e6ce2835 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Thu, 24 Jul 2025 17:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BA=BA=E6=95=88=E7=8E=87=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/screen/vo/WorkerEfficiencyVo.java  | 19 +++++++++++--------
 .../impl/WorkerEfficiencyServiceImpl.java     |  8 --------
 .../mapper/WorkerEfficiencyMapper.xml         | 11 ++++-------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/WorkerEfficiencyVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/WorkerEfficiencyVo.java
index 2d47fd3..b15c766 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/WorkerEfficiencyVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/WorkerEfficiencyVo.java
@@ -14,15 +14,18 @@ public class WorkerEfficiencyVo {
 
     private Long id;
     private String bidCode;
+    /**工程名称*/
     private String proName;
+    /**班组长*/
     private String userName;
+    /**班组名称*/
     private String teamName;
-    private String postName;
-    private int attDay;
-    private String sgType;
-    private String completeWorkload;
-    private double unitTimeOutput;
-    private String standardTimeOutput;
-    private String unit;
-    private String unitTimeOutputUnit;
+    /**计划天数*/
+    private int planDay;
+    /**实际天数*/
+    private int actualDay;
+    /**工序*/
+    private String gxName;
+    /**工作标准*/
+    private String workStandard;
 }
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/WorkerEfficiencyServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/WorkerEfficiencyServiceImpl.java
index 95205ea..fd472ed 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/WorkerEfficiencyServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/WorkerEfficiencyServiceImpl.java
@@ -34,14 +34,6 @@ public class WorkerEfficiencyServiceImpl implements IWorkerEfficiencyService {
 
         try {
             List<WorkerEfficiencyVo> list = Optional.ofNullable(mapper.getList(dto)).orElse(new ArrayList<>());
-            for (WorkerEfficiencyVo vo : list) {
-                if(StringUtils.isNotBlank(vo.getCompleteWorkload())){
-                    BigDecimal a = new BigDecimal(vo.getCompleteWorkload());
-                    BigDecimal b = new BigDecimal(vo.getAttDay());
-                    BigDecimal result = a.divide(b, 3, RoundingMode.HALF_UP);
-                    vo.setUnitTimeOutput(result.doubleValue());
-                }
-            }
             return list;
         } catch (Exception e) {
             log.info(e.toString(), e);
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/WorkerEfficiencyMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/WorkerEfficiencyMapper.xml
index d6b05fe..d13cfdc 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/WorkerEfficiencyMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/WorkerEfficiencyMapper.xml
@@ -10,13 +10,10 @@
                pro_name AS proName,
                user_name AS userName,
                team_name AS teamName,
-               post_name AS postName,
-               att_day AS attDay,
-               sg_type AS sgType,
-               complete_workload AS completeWorkload,
-               standard_time_output AS standardTimeOutput,
-               unit,
-               unit_time_output_unit AS unitTimeOutputUnit
+               plan_day AS planDay,
+               actual_day AS actualDay,
+               gx_name AS gxName,
+               work_standard AS workStandard
         FROM tb_worker_efficiency
         <where>
             <if test="userName != null and userName != ''">