From 32cdda3115879cc13a20581f31263dee3dece710 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 4 Aug 2026 16:13:51 +0800 Subject: [PATCH] person --- docs/sql/20260804_org_equipment_add_equipment_value.sql | 8 ++++++++ .../safetyeval/app/executor/OrgPersonnelExecutor.java | 2 -- .../change/request/QualFilingEquipmentChangeAddCmd.java | 5 +++++ .../request/QualFilingEquipmentChangeUpdateCmd.java | 5 +++++ .../change/response/QualFilingEquipmentChangeCo.java | 5 +++++ .../qinan/safetyeval/client/co/QualFilingEquipmentCO.java | 3 +++ .../safetyeval/client/dto/QualFilingEquipmentAddCmd.java | 3 +++ .../client/dto/QualFilingEquipmentModifyCmd.java | 3 +++ .../domain/change/model/QualFilingEquipmentChangeE.java | 4 ++++ .../domain/entity/QualFilingEquipmentEntity.java | 3 +++ .../infrastructure/dataobject/QualFilingEquipmentDO.java | 1 + .../gatewayimpl/QualFilingEquipmentGatewayImpl.java | 2 ++ .../domainobject/QualFilingEquipmentChangeDO.java | 4 ++++ 13 files changed, 46 insertions(+), 2 deletions(-) diff --git a/docs/sql/20260804_org_equipment_add_equipment_value.sql b/docs/sql/20260804_org_equipment_add_equipment_value.sql index f70b176..7cd0415 100644 --- a/docs/sql/20260804_org_equipment_add_equipment_value.sql +++ b/docs/sql/20260804_org_equipment_add_equipment_value.sql @@ -1,3 +1,11 @@ -- org_equipment 表新增 设备价值 字段 ALTER TABLE `org_equipment` ADD COLUMN `equipment_value` decimal(14, 2) NULL COMMENT '设备价值' AFTER `manufacturer`; + +-- qual_filing_equipment 表新增 设备价值 字段 +ALTER TABLE `qual_filing_equipment` + ADD COLUMN `equipment_value` decimal(14, 2) NULL COMMENT '设备价值' AFTER `manufacturer`; + +-- qual_filing_equipment_change 表新增 设备价值 字段 +ALTER TABLE `qual_filing_equipment_change` + ADD COLUMN `equipment_value` decimal(14, 2) NULL COMMENT '设备价值' AFTER `manufacturer`; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index b84e907..7061df7 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -111,8 +111,6 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { private boolean gbsUserSyncFailFast; @Value("${template.personnel.import.url:}") private String personImportTemplateUrl; - @Autowired - private OrgPersonnelMapper orgPersonnelMapper; @Override diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java index fd31954..746486e 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java @@ -73,6 +73,11 @@ public class QualFilingEquipmentChangeAddCmd implements Serializable { @ApiModelProperty(value = "厂家") @Size(max = 512, message = "厂家不能超过512个字符") private String manufacturer; + /** + * 设备价值 + */ + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; /** * 设备流量说明 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java index b7cf20b..38e5ebf 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeUpdateCmd.java @@ -67,6 +67,11 @@ public class QualFilingEquipmentChangeUpdateCmd implements Serializable { */ @ApiModelProperty(value = "厂家") private String manufacturer; + /** + * 设备价值 + */ + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; /** * 设备流量说明 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java index 604c050..a7c1c02 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingEquipmentChangeCo.java @@ -63,6 +63,11 @@ public class QualFilingEquipmentChangeCo extends ClientObject { */ @ApiModelProperty(value = "厂家") private String manufacturer; + /** + * 设备价值 + */ + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; /** * 设备流量说明 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingEquipmentCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingEquipmentCO.java index f3ef5bf..e3bb080 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingEquipmentCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingEquipmentCO.java @@ -43,6 +43,9 @@ public class QualFilingEquipmentCO { @ApiModelProperty(value = "生产厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "流量描述") private String flowDesc; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentAddCmd.java index 1d2f157..b229a0b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentAddCmd.java @@ -33,6 +33,9 @@ public class QualFilingEquipmentAddCmd { @ApiModelProperty(value = "厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "设备流量说明") private String flowDesc; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentModifyCmd.java index 050a113..c7a9163 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentModifyCmd.java @@ -36,6 +36,9 @@ public class QualFilingEquipmentModifyCmd { @ApiModelProperty(value = "厂家") private String manufacturer; + @ApiModelProperty(value = "设备价值") + private BigDecimal equipmentValue; + @ApiModelProperty(value = "设备流量说明") private String flowDesc; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java index 4e7c74f..a370fe4 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingEquipmentChangeE.java @@ -58,6 +58,10 @@ public class QualFilingEquipmentChangeE extends BaseE { * 厂家 */ private String manufacturer; + /** + * 设备价值 + */ + private BigDecimal equipmentValue; /** * 设备流量说明 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEquipmentEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEquipmentEntity.java index 9499bfe..38380f2 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEquipmentEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEquipmentEntity.java @@ -43,6 +43,9 @@ public class QualFilingEquipmentEntity { /** 厂家 */ private String manufacturer; + /** 设备价值 */ + private BigDecimal equipmentValue; + /** 设备流量说明 */ private String flowDesc; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingEquipmentDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingEquipmentDO.java index 77c4c5c..a4f43f6 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingEquipmentDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingEquipmentDO.java @@ -25,6 +25,7 @@ public class QualFilingEquipmentDO { private String deviceTypeCode; private String deviceTypeName; private String manufacturer; + private BigDecimal equipmentValue; private String flowDesc; private BigDecimal minFlow; private BigDecimal maxFlow; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingEquipmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingEquipmentGatewayImpl.java index b5bac19..b78c409 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingEquipmentGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingEquipmentGatewayImpl.java @@ -97,6 +97,7 @@ public class QualFilingEquipmentGatewayImpl implements QualFilingEquipmentGatewa dataObject.setDeviceTypeCode(entity.getDeviceTypeCode()); dataObject.setDeviceTypeName(entity.getDeviceTypeName()); dataObject.setManufacturer(entity.getManufacturer()); + dataObject.setEquipmentValue(entity.getEquipmentValue()); dataObject.setFlowDesc(entity.getFlowDesc()); dataObject.setMinFlow(entity.getMinFlow()); dataObject.setMaxFlow(entity.getMaxFlow()); @@ -125,6 +126,7 @@ public class QualFilingEquipmentGatewayImpl implements QualFilingEquipmentGatewa entity.setDeviceTypeCode(dataObject.getDeviceTypeCode()); entity.setDeviceTypeName(dataObject.getDeviceTypeName()); entity.setManufacturer(dataObject.getManufacturer()); + entity.setEquipmentValue(dataObject.getEquipmentValue()); entity.setFlowDesc(dataObject.getFlowDesc()); entity.setMinFlow(dataObject.getMinFlow()); entity.setMaxFlow(dataObject.getMaxFlow()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java index aa40ecf..e769f30 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingEquipmentChangeDO.java @@ -62,6 +62,10 @@ public class QualFilingEquipmentChangeDO extends BaseDO { * 厂家 */ private String manufacturer; + /** + * 设备价值 + */ + private BigDecimal equipmentValue; /** * 设备流量说明 */