cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug orgId not send

dev
luotaiqian 2026-07-07 18:50:45 +08:00
parent 828c9b6e57
commit b58642a276
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java
View File

@ -275,8 +275,8 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
}
// 编辑场景：对比请求数据与已有变更数据，生成变更明细
if (!cmd.isAdd()) {
Long changeId = cmd.getQualFilingChangeAddCmd().getId();
if (cmd.getOriginChangeFilingId() != null) {
Long changeId = cmd.getOriginChangeFilingId();
List<QualFilingChangeDetailEntity> details = diffFromCmd(changeId
, entity, commitmentEntity, equipmentEntities
, materialEntities, personnelEntities, personnelCertEntities);
@ -295,7 +295,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
}
Long id = qualFilingChangeDomainService.aggregationSaveOrEdit(entity, commitmentEntity
, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities, cmd.isAdd());
, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities);
QualFilingChangeCO co = new QualFilingChangeCO();
co.setId(id);
@ -435,8 +435,8 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
*/
private void validateBeforeSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd) {
QualFilingChangeAddCmd addCmd = cmd.getQualFilingChangeAddCmd();
cmd.setOriginChangeFilingId(addCmd.getId());
if (addCmd.getId() == null) {
cmd.setAdd(true);
// 新增：根据filingId统计qualFilingChange表中filingStatusCode != 1的记录数，有则不允许新增
int count = qualFilingChangeDomainService.countByFilingIdAndStatusNot(
addCmd.getFilingId(), QualFilingStatusEnum.FILED.getCode());
@ -444,7 +444,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "存在进行中的备案变更，不允许新增");
}
} else {
cmd.setAdd(false);
// 修改：根据id查询变更记录，filing_status_code = 1 则不允许修改
QualFilingChangeEntity existing = qualFilingChangeDomainService.get(addCmd.getId());
if (existing == null) {
@ -458,12 +457,9 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
if (count > 0) {
throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID, "存在进行中的备案变更，不允许新增");
}
cmd.setAdd(true);
cmd.getQualFilingChangeAddCmd().setId(null);
cmd.getQualFilingChangeAddCmd().setChangeFilingId(existing.getId());
cmd.getQualFilingChangeAddCmd().setFilingId(existing.getFilingId());
} else {
cmd.setAdd(false);
}
}
}

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java
View File

@ -10,8 +10,8 @@ import java.util.List;
@Data
public class AggregationSaveOrEditQualFilingChangeCmd {
@ApiModelProperty(hidden = true, value = "是否变更新增")
private boolean add;
@ApiModelProperty(hidden = true, value = "变更的id")
private Long originChangeFilingId;
@ApiModelProperty(value = "基本信息")
@NotNull

2
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingChangeGateway.java
View File

@ -33,5 +33,5 @@ public interface QualFilingChangeGateway {
Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity,
List<QualFilingEquipmentChangeE> equipmentEntities, List<QualFilingMaterialChangeE> materialEntities,
List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities, boolean add);
List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities);
}

4
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingChangeDomainService.java
View File

@ -66,8 +66,8 @@ public class QualFilingChangeDomainService {
public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity,
List<QualFilingEquipmentChangeE> equipmentEntities, List<QualFilingMaterialChangeE> materialEntities,
List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities, boolean add) {
List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities) {
return qualFilingChangeGateway.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities
, personnelEntities, personnelCertEntities,add);
, personnelEntities, personnelCertEntities);
}
}

2
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java
View File

@ -141,7 +141,7 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
@Transactional(rollbackFor = Exception.class)
public Long aggregationSaveOrEdit(QualFilingChangeEntity entity, QualFilingCommitmentChangeE commitmentEntity
, List<QualFilingEquipmentChangeE> equipmentEntities, List<QualFilingMaterialChangeE> materialEntities
, List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities, boolean add) {
, List<QualFilingPersonnelChangeE> personnelEntities, List<QualFilingPersonnelCertChangeE> personnelCertEntities) {
//保存基础信息
QualFilingChangeDO dataObject = qualFilingChangeDoConvertor.convertEeToDo(entity);
if (Objects.nonNull(dataObject.getId())) {