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

bug修复

Browse Source
This commit is contained in:
guo 2024-01-17 14:34:27 +08:00
parent 4450404233
commit da2e6ec018
8 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveCompactionDev.java
View File

@ -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;
/**
* 设备图片
*/

7
src/main/java/com/zhgd/xmgl/modules/pave/entity/PaveDev.java
View File

@ -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;
/**
* 设备图片
*/

6
src/main/java/com/zhgd/xmgl/modules/taskprogress/entity/TaskProgress.java
View File

@ -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;
/**
* 负责人名称

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

@ -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<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {

4
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/CountEntryAndExitNumVo.java
View File

@ -5,8 +5,8 @@ import lombok.Data;
@Data
public class CountEntryAndExitNumVo {
@ApiModelProperty("进场人数")
@ApiModelProperty("进场人数今日")
private Integer entryTodayNum;
@ApiModelProperty("出场人数")
@ApiModelProperty("出场人数今日")
private Integer exitTodayNum;
}

3
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
View File

@ -49,6 +49,9 @@
<if test="param.workerName != null and param.workerName != ''">
and b.worker_name like CONCAT(CONCAT('%', #{param.workerName}), '%')
</if>
<if test="param.passType != null and param.passType != ''">
and a.pass_type = #{param.passType}
</if>
<if test="param.startTime != null and param.startTime != ''">
AND a.create_time >= #{param.startTime}
</if>

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -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
</select>
</mapper>

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -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()