From da2e6ec018eb52dab6ebde137fe98a8c5245e981 Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 17 Jan 2024 14:34:27 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/pave/entity/PaveCompactionDev.java | 11 +++-------- .../com/zhgd/xmgl/modules/pave/entity/PaveDev.java | 7 ++++--- .../modules/taskprogress/entity/TaskProgress.java | 6 ++++-- .../worker/controller/WorkerAttendanceController.java | 2 +- .../worker/entity/vo/CountEntryAndExitNumVo.java | 4 ++-- .../worker/mapper/xml/WorkerAttendanceMapper.xml | 3 +++ .../modules/worker/mapper/xml/WorkerInfoMapper.xml | 2 +- .../com/zhgd/xmgl/security/WebSecurityConfig.java | 1 + 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java index f2c11aa64..655afe3ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java @@ -66,15 +66,10 @@ public class PaveCompactionDev implements Serializable { /** * 负责人id */ - @Excel(name = "负责人id", width = 15) - @ApiModelProperty(value = "负责人id") - private java.lang.Integer chargeUserId; - /** - * 负责人名称 - */ - @Excel(name = "负责人名称", width = 15) + @ApiModelProperty(value = "负责人") + private java.lang.Long dutyUserId; @ApiModelProperty(value = "负责人名称") - private java.lang.Integer chargeUserName; + private java.lang.String dutyUserName; /** * 设备图片 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java index d781a1c89..2e777d370 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java @@ -66,9 +66,10 @@ public class PaveDev implements Serializable { /** * 负责人id */ - @Excel(name = "负责人id", width = 15) - @ApiModelProperty(value = "负责人id") - private java.lang.Integer chargeUserId; + @ApiModelProperty(value = "负责人") + private java.lang.Long dutyUserId; + @ApiModelProperty(value = "负责人名称") + private java.lang.String dutyUserName; /** * 设备图片 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java index cf37d33d6..2da1f8540 100644 --- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java +++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java @@ -152,8 +152,10 @@ public class TaskProgress implements Serializable { @Excel(name = "结束预警", width = 15, replace = {"提前_1", "正常_2", "逾期_3"}) @ApiModelProperty(value = "结束预警：1提前2正常3逾期") private java.lang.Integer endWarning; - @ApiModelProperty(value = "bim构件") - private java.lang.String bimComponent; + @ApiModelProperty(value = "隐藏的构件id（多个用，分割)") + private String hiddenComponentId; + @ApiModelProperty(value = "构件颜色json") + private String componentColorJson; /** * 负责人名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java index f3b6f9258..f2def26be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java @@ -87,13 +87,13 @@ public class WorkerAttendanceController { @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), @ApiImplicitParam(name = "projectSn", value = "项目标识", dataType = "String", paramType = "body", required = true), - @ApiImplicitParam(name = "projectSn", value = "项目标识", dataType = "String", paramType = "body", required = true), @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String", paramType = "body", required = false), @ApiImplicitParam(name = "isStatistics", value = "是否计入考勤统计,1是不计入，0计入", dataType = "String", paramType = "body", required = false), @ApiImplicitParam(name = "carNumber", value = "车牌号", dataType = "String", paramType = "body", required = false), @ApiImplicitParam(name = "cardType", value = "卡类型 1 IC卡 2人脸识别 3 指纹识别 4补卡操作，5二维码，6蓝牙,7手机打卡,8车辆通行", dataType = "String", paramType = "body", required = false), @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String", paramType = "body", required = false), @ApiImplicitParam(name = "workerName", value = "人员姓名", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "passType", value = "考勤类型 1:进 2出", dataType = "Integer", paramType = "body", required = false), }) @PostMapping(value = "/list") public Result> queryPageList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java index 70e347551..42938f0f5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java @@ -5,8 +5,8 @@ import lombok.Data; @Data public class CountEntryAndExitNumVo { - @ApiModelProperty("进场人数") + @ApiModelProperty("进场人数今日") private Integer entryTodayNum; - @ApiModelProperty("出场人数") + @ApiModelProperty("出场人数今日") private Integer exitTodayNum; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml index c6dffbee9..c3d2b8de0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -49,6 +49,9 @@ and b.worker_name like CONCAT(CONCAT('%', #{param.workerName}), '%') + + and a.pass_type = #{param.passType} + AND a.create_time >= #{param.startTime} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 8e4cd1ab6..7b30900a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -2435,6 +2435,6 @@ count(distinct wa.person_sn,if(pass_type=2,1,null)) exitTodayNum from worker_info wi join worker_attendance wa on wa.person_sn=wi.person_sn - where wa.project_sn=#{projectSn} and update_time>=current_date + where wa.project_sn=#{projectSn} and wa.create_time>=current_date diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index f37d9d071..7de0954e0 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -295,6 +295,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/workerInfo/selectWorkerInfoList").permitAll() .antMatchers("/xmgl/workerInfo/countEntryAndExitNum").permitAll() .antMatchers("/xmgl/aiAnalyseHardWareAlarmRecord/selectAiAnalyseHardWareAlarmList").permitAll() + .antMatchers("/xmgl/workerAttendance/list").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and()