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-23 10:49:15 +08:00
parent a39f95b78e
commit db6cd0fd86
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringChooseTypeDescribe.java
View File

@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="DangerousEngineeringChooseTypeDescribe实体类",description="DangerousEngineeringChooseTypeDescribe") @ApiModel(value="DangerousEngineeringChooseTypeDescribe实体类",description="DangerousEngineeringChooseTypeDescribe")
public class DangerousEngineeringChooseTypeDescribe implements Serializable { public class DangerousEngineeringChooseTypeDescribe 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")
@ -30,12 +30,10 @@ public class DangerousEngineeringChooseTypeDescribe implements Serializable {
/**危大工程ID*/ /**危大工程ID*/
@Excel(name = "危大工程ID", width = 15) @Excel(name = "危大工程ID", width = 15)
@ApiModelProperty(value="危大工程ID") @ApiModelProperty(value="危大工程ID")
private java.lang.Long engineeringId ; private java.lang.Long engineeringId ;
/**分类描述ID*/ /**分类描述ID*/
@Excel(name = "分类描述ID", width = 15) @Excel(name = "分类描述ID", width = 15)
@ApiModelProperty(value="分类描述ID") @ApiModelProperty(value="分类描述ID")
private java.lang.Long describeId ; private java.lang.Long describeId ;
/**描述*/ /**描述*/
@Excel(name = "描述", width = 15) @Excel(name = "描述", width = 15)

3
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java
View File

@ -51,7 +51,6 @@ public class DangerousEngineeringRecord implements Serializable {
/**危大工程类别描述*/ /**危大工程类别描述*/
@Excel(name = "危大工程类别描述", width = 15) @Excel(name = "危大工程类别描述", width = 15)
@ApiModelProperty(value="危大工程类别描述") @ApiModelProperty(value="危大工程类别描述")
private java.lang.Long typeDescribeId; private java.lang.Long typeDescribeId;
/**是否超危，1否，2是*/ /**是否超危，1否，2是*/
@ -133,6 +132,8 @@ public class DangerousEngineeringRecord implements Serializable {
private java.lang.Long personLiableId; private java.lang.Long personLiableId;
@ApiModelProperty(value = "已结束？1是，0否") @ApiModelProperty(value = "已结束？1是，0否")
private java.lang.Integer isEnd; private java.lang.Integer isEnd;
@ApiModelProperty(value = "分包单位id")
private java.lang.Long responsibilityCompanyId;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "类别描述列表") @ApiModelProperty(value = "类别描述列表")
private List<DangerousEngineeringChooseTypeDescribe> typeDescribeList; private List<DangerousEngineeringChooseTypeDescribe> typeDescribeList;

4
src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringTypeDescribeControl.java
View File

@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="DangerousEngineeringTypeDescribeControl实体类",description="DangerousEngineeringTypeDescribeControl") @ApiModel(value="DangerousEngineeringTypeDescribeControl实体类",description="DangerousEngineeringTypeDescribeControl")
public class DangerousEngineeringTypeDescribeControl implements Serializable { public class DangerousEngineeringTypeDescribeControl 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")
@ -30,11 +30,9 @@ public class DangerousEngineeringTypeDescribeControl implements Serializable {
/**管控要点ID*/ /**管控要点ID*/
@Excel(name = "管控要点ID", width = 15) @Excel(name = "管控要点ID", width = 15)
@ApiModelProperty(value="管控要点ID") @ApiModelProperty(value="管控要点ID")
private java.lang.Long controlId ; private java.lang.Long controlId ;
/**分类描述ID*/ /**分类描述ID*/
@Excel(name = "分类描述ID", width = 15) @Excel(name = "分类描述ID", width = 15)
@ApiModelProperty(value="分类描述ID") @ApiModelProperty(value="分类描述ID")
private java.lang.Long describeId ; private java.lang.Long describeId ;
} }

1
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -102,6 +102,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
if (dangerousEngineeringRecord.getTypeDescribeList() != null && dangerousEngineeringRecord.getTypeDescribeList().size() > 0) { if (dangerousEngineeringRecord.getTypeDescribeList() != null && dangerousEngineeringRecord.getTypeDescribeList().size() > 0) {
for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) { for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) {
typeDescribe.setEngineeringId(id); typeDescribe.setEngineeringId(id);
//typeDescribe.setDescribeId(dangerousEngineeringRecord.getTypeDescribeId());
dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe); dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe);
} }
} }