bug修复

This commit is contained in:
guoshengxiong 2024-04-29 23:07:31 +08:00
parent 273e0e9c5c
commit b525b1eda5
3 changed files with 18 additions and 10 deletions

View File

@ -98,6 +98,8 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("worker_info_audit_record", "enterprise_id");
tables.put("car_info", "enterprise_id");
tables.put("xz_material", "enterprise_id");
tables.put("inspect_task_record", "enterprise_id");
tables.put("xz_security_inspect_task_record", "enterprise_id");
return tables;
}

View File

@ -24,7 +24,7 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="InspectTaskRecord实体类",description="InspectTaskRecord")
public class InspectTaskRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value="id")
@ -32,7 +32,7 @@ public class InspectTaskRecord implements Serializable {
/**检查类型ID*/
@Excel(name = "检查类型ID", width = 15)
@ApiModelProperty(value="检查类型ID")
private java.lang.Long inspectTypeId ;
/**任务名称*/
@Excel(name = "任务名称", width = 15)
@ -67,7 +67,7 @@ public class InspectTaskRecord implements Serializable {
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value="创建人")
private java.lang.Long createUser ;
/**是否需要签到1是2否*/
@Excel(name = "是否需要签到1是2否", width = 15)
@ -75,13 +75,17 @@ public class InspectTaskRecord implements Serializable {
private java.lang.Integer reportType ;
/**检查说明*/
@Excel(name = "检查说明", width = 15)
@ApiModelProperty(value="检查说明")
private java.lang.String inspectRemark ;
@ApiModelProperty(value = "检查说明")
private java.lang.String inspectRemark;
@ApiModelProperty(value="检查人员userId")
private java.lang.String inspectUser ;
/**1安全2质量*/
@ApiModelProperty(value = "检查人员userId")
private java.lang.String inspectUser;
/**
* 1安全2质量
*/
@Excel(name = "1安全2质量", width = 15)
@ApiModelProperty(value="1安全2质量")
private java.lang.Integer type ;
@ApiModelProperty(value = "1安全2质量")
private java.lang.Integer type;
@ApiModelProperty(value = "合作单位id")
private java.lang.Long enterpriseId;
}

View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.inspection.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.inspection.entity.InspectTaskRecord;
import org.apache.ibatis.annotations.Mapper;
@ -17,6 +18,7 @@ import java.util.Map;
* @version V1.0
*/
@Mapper
@DataScope
public interface InspectTaskRecordMapper extends BaseMapper<InspectTaskRecord> {
List<EntityMap> selectInspectTaskRecordPage(Page<EntityMap> page, @Param("param") Map<String, Object> map);