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

bug修复

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -98,6 +98,8 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("worker_info_audit_record", "enterprise_id"); tables.put("worker_info_audit_record", "enterprise_id");
tables.put("car_info", "enterprise_id"); tables.put("car_info", "enterprise_id");
tables.put("xz_material", "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; return tables;
} }

24
src/main/java/com/zhgd/xmgl/modules/inspection/entity/InspectTaskRecord.java
View File

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

2
src/main/java/com/zhgd/xmgl/modules/inspection/mapper/InspectTaskRecordMapper.java
View File

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