diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java index 14bb74594..87ae72d36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java @@ -1085,7 +1085,7 @@ public class WorkerDailyAttendanceStatisticsV2Controller { TemplateExportParams params = new TemplateExportParams(templateUrl, true); params.setColForEach(true); 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); } try (Workbook workbook = ExcelExportUtil.exportExcel(root, params);) { diff --git a/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx b/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx index 4946d76ef..225fc03fb 100644 Binary files a/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx and b/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx differ diff --git a/src/main/resources/static/document/智慧工地对外接口.md b/src/main/resources/static/document/智慧工地对外接口.md index f0c365da6..f1d54f1d4 100644 --- a/src/main/resources/static/document/智慧工地对外接口.md +++ b/src/main/resources/static/document/智慧工地对外接口.md @@ -14,29 +14,31 @@ **请求参数:** -| 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 | -| -------------------- | ---------------------- | -------- | -------- | ------ | -| deviceId | 设备Id | body | true | string | -| humidity | 湿度 | body | false | float | -| humidityAlarmType | 湿度是否报警,0否,1是 | body | false | int32 | -| noise | 噪音 | body | false | float | -| noiseAlarmType | 噪音是否报警,0否,1是 | body | false | int32 | -| plateHumidity | 板载湿度 | body | false | float | -| plateTemperature | 板载温度 | body | false | float | -| pm10 | 扬尘 | body | false | float | -| pm10AlarmType | pm10是否报警,0否,1是 | body | false | int32 | -| pm25 | pm25 | body | false | float | -| pm25AlarmType | PM25是否报警,0否,1是 | body | false | int32 | -| pressure | 大气压 | body | false | float | -| temperature | 温度 | body | false | float | -| temperatureAlarmType | 温度是否报警,0否,1是 | body | false | int32 | -| tsp | tsp测试值 | body | false | float | -| tspAlarmType | tsp是否报警,0否,1是 | body | false | int32 | -| voltage | 电压 | body | false | float | -| windSpeedAlarmType | 风速是否报警,0否,1是 | body | false | int32 | -| winddirection | 风向 | body | false | string | -| winddirectionName | 风向名称 | body | false | string | -| windspeed | 风速 | body | false | float | +| 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 | +| ------------------------ | ------------------------ | -------- | -------- | ------ | +| deviceId | 设备Id | body | true | string | +| humidity | 湿度 | body | false | float | +| humidityAlarmType | 湿度是否报警,0否,1是 | body | false | int32 | +| noise | 噪音 | body | false | float | +| noiseAlarmType | 噪音是否报警,0否,1是 | body | false | int32 | +| plateHumidity | 板载湿度 | body | false | float | +| plateTemperature | 板载温度 | body | false | float | +| pm10 | 扬尘 | body | false | float | +| pm10AlarmType | pm10是否报警,0否,1是 | body | false | int32 | +| pm25 | pm25 | body | false | float | +| pm25AlarmType | PM25是否报警,0否,1是 | body | false | int32 | +| pressure | 大气压 | body | false | float | +| temperature | 温度 | body | false | float | +| temperatureAlarmType | 温度是否报警,0否,1是 | body | false | int32 | +| tsp | tsp测试值 | body | false | float | +| tspAlarmType | tsp是否报警,0否,1是 | body | false | int32 | +| voltage | 电压 | body | false | float | +| windSpeedAlarmType | 风速是否报警,0否,1是 | body | false | int32 | +| winddirection | 风向 | body | false | string | +| winddirectionName | 风向名称 | body | false | string | +| windspeed | 风速 | body | false | float | +| evaporationRate | 蒸发量 | body | false | float | +| evaporationRateAlarmType | 蒸发量是否报警,0否,1是 | body | false | int32 |