From f22c4b9230808fed4fec80c435eccb4c833349a0 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 21 十月 2022 18:36:38 +0800 Subject: [PATCH] 2022.10.21 1.环境守法小程序后台功能首发版本完成 --- src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt b/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt index d100e3a..93e80a8 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/common/score/AutoScore.kt @@ -94,8 +94,8 @@ } fun go(_year: Int? = null, _month: Int? = null) { - val fileName = "姹戒慨鑷姩璇勫垎-${DateUtil().DateToString(Date(), "yyyy-MM-ddhhmmss")}.xls" - val filePath = "E:\\宸ヤ綔\\寮�鍙慭\椋炵窘鐜app\\鑷姩璇勫垎\\姹戒慨\\$fileName" + val fileName = "${SCENE_TYPE.des}鑷姩璇勫垎-${DateUtil.DateToString(Date(), "yyyy-MM-ddhhmmss")}.xls" + val filePath = "E:\\宸ヤ綔\\寮�鍙慭\椋炵窘鐜app\\鑷姩璇勫垎\\${SCENE_TYPE.des}\\$fileName" val out = FileOutputStream(File(filePath)) getScoreItem() @@ -103,10 +103,8 @@ val userList = userinfoMapper.selectByExample(Example(Userinfo::class.java).apply { createCriteria().andEqualTo("usertypeid", UserType.Enterprise.value.toByte()) // FIXME: 2021/4/28 鍦烘櫙绫诲瀷 -// 姹戒慨绫诲瀷 .andEqualTo("extension2", SCENE_TYPE.value.toString()) -// 椁愰ギ绫诲瀷 -// .andEqualTo("extension2", SCENE_TYPE.value.toString()) + .andEqualTo("isenable", true) // orderBy("workno") }) @@ -149,7 +147,7 @@ val now = LocalDate.now() val year = _year ?: now.year val month = _month ?: now.monthValue - val sMonth = DateUtil().getStartMonthByPeriod(month, 3) ?: 1 + val sMonth = DateUtil.getStartMonthByPeriod(month, 3) ?: 1 val eMonth = sMonth + 2 val period = "${year}/$sMonth-$eMonth" @@ -166,7 +164,8 @@ it.realname, SCENE_TYPE, year, - month + month, + now ) var score = 0 @@ -280,21 +279,17 @@ } } ?: 0 // 鍐欏叆鏁版嵁搴� -// if (r > 0) { -// evaluationList.forEach { el -> evaluationMapper.insert(el) } -// itemevaluationList.forEach { il -> itemevaluationMapper.insert(il) } - for (e in evaluationList) { - if (e.ertype?.toInt()?.equals(0) == true) { - finalScore(e, year, eMonth, period) - break - } - } +// for (e in evaluationList) { +// if (e.ertype?.toInt()?.equals(0) == true) { +// finalScore(e, year, eMonth, period) +// break +// } // } } // 鍐欏叆鏂囨。 -// ExcelUtil.write2(emptyList(), contents, workbook) -// workbook.write(out) + ExcelUtil.write2(emptyList(), contents, workbook) + workbook.write(out) workbook.close() out.flush() out.close() -- Gitblit v1.9.3