From b180708562d6fb872c83c05756e8041d9967483a Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期一, 22 十二月 2025 21:04:13 +0800
Subject: [PATCH] 2025.12.22 1. 修改日任务统计接口，新增当天内整改问题数和48小时内整改问题数统计
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DayTaskProgressVo.kt | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DayTaskProgressVo.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DayTaskProgressVo.kt
index 87cb4ff..a34be4d 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DayTaskProgressVo.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/vo/DayTaskProgressVo.kt
@@ -1,25 +1,83 @@
package cn.flightfeather.supervision.lightshare.vo
+import org.apache.poi.hpsf.Decimal
+import java.math.BigDecimal
+import java.text.DecimalFormat
import java.util.*
+import kotlin.math.round
/**
* @author riku
* Date: 2019/7/30
* 鏃ヤ换鍔¤繘搴︾被
*/
-data class DayTaskProgressVo(
- //鏃ヤ换鍔d
- val guid: String? = null,
- //鏃ヤ换鍔℃椂闂�
- val date: Date? = null,
- //鎵�灞為《灞備换鍔d
- val tsGuid: String? = null,
- //瀹屾垚瀛愪换鍔℃暟
- val completeTaskNum: Int = 0,
- //宸叉暣鏀瑰瓙浠诲姟鏁�
- val changedTaskNum: Int = 0,
- //鎬诲瓙浠诲姟鏁�
- val totalTaskNum: Int = 0,
- //鏄惁鏈夋湭瀹℃牳鐨勯棶棰�
- val check: Boolean = false
-)
\ No newline at end of file
+class DayTaskProgressVo {
+ //鏃ヤ换鍔d
+ var guid: String? = null
+
+ //鏃ヤ换鍔℃椂闂�
+ var date: Date? = null
+
+ //鎵�灞為《灞備换鍔d
+ var tsGuid: String? = null
+
+ //鎬诲瓙浠诲姟鏁�
+ var totalTaskNum: Int = 0
+
+ //瀹屾垚瀛愪换鍔℃暟
+ var completeTaskNum: Int = 0
+
+ //宸叉暣鏀瑰瓙浠诲姟鏁�
+ var changedTaskNum: Int = 0
+
+ //褰撳瓨鍦ㄨ嚦灏戜竴涓棶棰樻病鏈夊鏍告椂锛屽綋鏃ュ鏍哥姸鎬佷负鏈鏍�
+ var check: Boolean = false
+
+ // 鎬婚棶棰樻暟
+ var totalProblemNum: Int = 0
+ // 鎬绘暣鏀归棶棰樻暟
+ var changedProblemNum: Int = 0
+
+ // 姣忎釜鐢ㄦ埛鐨勫崟鏃ヤ换鍔¤繘搴�
+ var progressPerUser: List<ProgressPerUserPerDay>? = null
+}
+
+class ProgressPerUserPerDay{
+ //鐢ㄦ埛id
+ var userId: String? = null
+ //鐢ㄦ埛鍚�
+ var userName: String? = null
+
+ //鎬诲瓙浠诲姟鏁�
+ var totalTaskNum: Double = .0
+ //瀹屾垚瀛愪换鍔℃暟
+ var completeTaskNum: Double = .0
+
+ // 鎬婚棶棰樻暟
+ var totalProblemNum: Double = .0
+ //宸叉暣鏀归棶棰樻暟
+ var changedProblemNum: Double = .0
+ //宸叉暣鏀归棶棰樻暟锛堝湪褰撳ぉ鍐呮暣鏀癸級
+ var changedProblemNumOnTime: Double = .0
+ //鏈夋晥鏁存敼闂鏁伴噺锛�48灏忔椂鍐咃級
+ var efficientChangedProNum: Double = .0
+
+ //骞冲潎宸℃煡鏃堕暱锛堢锛�
+ var avgInspectionTime: Long = 0
+
+ /**
+ * 鏍煎紡鍖朌ouble鍙傛暟锛屼繚鐣欎袱浣嶅皬鏁帮紝鍥涜垗浜斿叆
+ */
+ fun formatParam() {
+ totalTaskNum = numberFormat(totalTaskNum)
+ completeTaskNum = numberFormat(completeTaskNum)
+ totalProblemNum = numberFormat(totalProblemNum)
+ changedProblemNum = numberFormat(changedProblemNum)
+ changedProblemNumOnTime = numberFormat(changedProblemNumOnTime)
+ efficientChangedProNum = numberFormat(efficientChangedProNum)
+ }
+
+ private fun numberFormat(value:Double): Double {
+ return BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP).toDouble()
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3