From db6cd0fd86039e506318911817f65c0bedd6c6f0 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 23 Apr 2024 10:49:15 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DangerousEngineeringChooseTypeDescribe.java | 4 +--- .../modules/dangerous/entity/DangerousEngineeringRecord.java | 3 ++- .../entity/DangerousEngineeringTypeDescribeControl.java | 4 +--- .../service/impl/DangerousEngineeringRecordServiceImpl.java | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringChooseTypeDescribe.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringChooseTypeDescribe.java index 23360fe54..bbe382451 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringChooseTypeDescribe.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringChooseTypeDescribe.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="DangerousEngineeringChooseTypeDescribe实体类",description="DangerousEngineeringChooseTypeDescribe") public class DangerousEngineeringChooseTypeDescribe implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -30,12 +30,10 @@ public class DangerousEngineeringChooseTypeDescribe implements Serializable { /**危大工程ID*/ @Excel(name = "危大工程ID", width = 15) @ApiModelProperty(value="危大工程ID") - private java.lang.Long engineeringId ; /**分类描述ID*/ @Excel(name = "分类描述ID", width = 15) @ApiModelProperty(value="分类描述ID") - private java.lang.Long describeId ; /**描述*/ @Excel(name = "描述", width = 15) diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java index 124f9d69d..3914cc9d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java @@ -51,7 +51,6 @@ public class DangerousEngineeringRecord implements Serializable { /**危大工程类别描述*/ @Excel(name = "危大工程类别描述", width = 15) @ApiModelProperty(value="危大工程类别描述") - private java.lang.Long typeDescribeId; /**是否超危，1否，2是*/ @@ -133,6 +132,8 @@ public class DangerousEngineeringRecord implements Serializable { private java.lang.Long personLiableId; @ApiModelProperty(value = "已结束？1是，0否") private java.lang.Integer isEnd; + @ApiModelProperty(value = "分包单位id") + private java.lang.Long responsibilityCompanyId; @TableField(exist = false) @ApiModelProperty(value = "类别描述列表") private List typeDescribeList; diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringTypeDescribeControl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringTypeDescribeControl.java index ad12b2e67..cbe2c96c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringTypeDescribeControl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringTypeDescribeControl.java @@ -22,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="DangerousEngineeringTypeDescribeControl实体类",description="DangerousEngineeringTypeDescribeControl") public class DangerousEngineeringTypeDescribeControl implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -30,11 +30,9 @@ public class DangerousEngineeringTypeDescribeControl implements Serializable { /**管控要点ID*/ @Excel(name = "管控要点ID", width = 15) @ApiModelProperty(value="管控要点ID") - private java.lang.Long controlId ; /**分类描述ID*/ @Excel(name = "分类描述ID", width = 15) @ApiModelProperty(value="分类描述ID") - private java.lang.Long describeId ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java index cf40dd0c0..6393a2efe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java @@ -102,6 +102,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl 0) { for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) { typeDescribe.setEngineeringId(id); + //typeDescribe.setDescribeId(dangerousEngineeringRecord.getTypeDescribeId()); dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe); } }