admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prod' into mod_security

Browse Source
This commit is contained in:
guoshengxiong 2025-09-02 13:56:51 +08:00
commit 016ba73419
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java
View File

@ -1085,7 +1085,7 @@ public class WorkerDailyAttendanceStatisticsV2Controller {
TemplateExportParams params = new TemplateExportParams(templateUrl, true); TemplateExportParams params = new TemplateExportParams(templateUrl, true);
params.setColForEach(true); params.setColForEach(true);
params.setSheetName(sheetNames.toArray(new String[]{})); params.setSheetName(sheetNames.toArray(new String[]{}));
for (int i = 10 + dateTimes.size(); i < 10 + 31; i++) { for (int i = 10 + dateTimes.size(); i < 10 + 41; i++) {
delColIndexes.add(i); delColIndexes.add(i);
} }
try (Workbook workbook = ExcelExportUtil.exportExcel(root, params);) { try (Workbook workbook = ExcelExportUtil.exportExcel(root, params);) {

BIN
src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx
View File

Binary file not shown.

4
src/main/resources/static/document/智慧工地对外接口.md
View File

@ -15,7 +15,7 @@
**请求参数：** **请求参数：**
| 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 | | 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 |
| -------------------- | ---------------------- | -------- | -------- | ------ | | ------------------------ | ------------------------ | -------- | -------- | ------ |
| deviceId | 设备Id | body | true | string | | deviceId | 设备Id | body | true | string |
| humidity | 湿度 | body | false | float | | humidity | 湿度 | body | false | float |
| humidityAlarmType | 湿度是否报警，0否，1是 | body | false | int32 | | humidityAlarmType | 湿度是否报警，0否，1是 | body | false | int32 |
@ -37,6 +37,8 @@
| winddirection | 风向 | body | false | string | | winddirection | 风向 | body | false | string |
| winddirectionName | 风向名称 | body | false | string | | winddirectionName | 风向名称 | body | false | string |
| windspeed | 风速 | body | false | float | | windspeed | 风速 | body | false | float |
| evaporationRate | 蒸发量 | body | false | float |
| evaporationRateAlarmType | 蒸发量是否报警，0否，1是 | body | false | int32 |