Compare commits
No commits in common. "119945d78273c0f0402e16bce06216195992fb1b" and "f983c8e0f2f37a23102aad903e6f3da1451d4e74" have entirely different histories.
119945d782
...
f983c8e0f2
|
|
@ -1,12 +1,12 @@
|
||||||
package org.qinan.safetyeval.adapter.web;
|
package org.qinan.safetyeval.adapter.web;
|
||||||
|
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
|
import org.qinan.safetyeval.client.dto.*;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
import org.qinan.safetyeval.client.api.QualFilingChangeApi;
|
import org.qinan.safetyeval.client.api.QualFilingChangeApi;
|
||||||
import org.qinan.safetyeval.client.co.QualFilingChangeCO;
|
import org.qinan.safetyeval.client.co.QualFilingChangeCO;
|
||||||
import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
|
import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO;
|
||||||
import org.qinan.safetyeval.client.dto.*;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|
@ -98,11 +98,4 @@ public class QualFilingChangeController {
|
||||||
public SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) {
|
public SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) {
|
||||||
return qualFilingChangeApi.complianceCheck(id);
|
return qualFilingChangeApi.complianceCheck(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("审核")
|
|
||||||
@PostMapping("/review")
|
|
||||||
public SingleResponse<Void> review(@Validated @RequestBody QualFilingChangeReviewAddCmd cmd) {
|
|
||||||
qualFilingChangeApi.review(cmd);
|
|
||||||
return SingleResponse.success();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
package org.qinan.safetyeval.app.change.convertor;
|
package org.qinan.safetyeval.app.change.convertor;
|
||||||
|
|
||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.Mapping;
|
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd;
|
import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity;
|
import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingEntity;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案变更基本信息命令转换
|
* 备案变更基本信息命令转换
|
||||||
|
|
@ -21,17 +19,4 @@ public interface QualFilingChangeCmdConvertor {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
QualFilingChangeEntity convertCmdToE(QualFilingChangeAddCmd qualFilingChangeAddCmd);
|
QualFilingChangeEntity convertCmdToE(QualFilingChangeAddCmd qualFilingChangeAddCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更实体转备案实体
|
|
||||||
* id 由调用方手动设置(使用 changeFilingId)
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "originFilingId", ignore = true)
|
|
||||||
@Mapping(target = "rejectReason", ignore = true)
|
|
||||||
@Mapping(target = "submitTime", ignore = true)
|
|
||||||
@Mapping(target = "approveTime", ignore = true)
|
|
||||||
@Mapping(target = "applyTypeCode", ignore = true)
|
|
||||||
@Mapping(target = "applyTypeName", ignore = true)
|
|
||||||
QualFilingEntity convertChangeEToEntity(QualFilingChangeEntity changeEntity);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import org.mapstruct.Mapping;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeAddCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeUpdateCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingCommitmentChangeUpdateCmd;
|
||||||
import org.qinan.safetyeval.domain.change.model.QualFilingCommitmentChangeE;
|
import org.qinan.safetyeval.domain.change.model.QualFilingCommitmentChangeE;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingCommitmentEntity;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 法定代人承诺书-变更转换
|
* 法定代人承诺书-变更转换
|
||||||
|
|
@ -32,13 +31,4 @@ public interface QualFilingCommitmentChangeCmdConvertor {
|
||||||
*/
|
*/
|
||||||
@Mapping(target = "qualFilingCommitmentChangeGateway", ignore = true)
|
@Mapping(target = "qualFilingCommitmentChangeGateway", ignore = true)
|
||||||
QualFilingCommitmentChangeE convertCmdToE(QualFilingCommitmentChangeUpdateCmd qualFilingCommitmentChangeUpdateCmd);
|
QualFilingCommitmentChangeE convertCmdToE(QualFilingCommitmentChangeUpdateCmd qualFilingCommitmentChangeUpdateCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更承诺书转承诺书实体
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "filingId", ignore = true)
|
|
||||||
@Mapping(target = "tenantId", ignore = true)
|
|
||||||
@Mapping(target = "orgId", ignore = true)
|
|
||||||
QualFilingCommitmentEntity convertChangeEToEntity(QualFilingCommitmentChangeE changeE);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,6 @@ import org.mapstruct.Mapping;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeAddCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeUpdateCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingEquipmentChangeUpdateCmd;
|
||||||
import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE;
|
import org.qinan.safetyeval.domain.change.model.QualFilingEquipmentChangeE;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingEquipmentEntity;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案申请装备-变更转换
|
* 备案申请装备-变更转换
|
||||||
|
|
@ -34,18 +31,4 @@ public interface QualFilingEquipmentChangeCmdConvertor {
|
||||||
*/
|
*/
|
||||||
@Mapping(target = "qualFilingEquipmentChangeGateway", ignore = true)
|
@Mapping(target = "qualFilingEquipmentChangeGateway", ignore = true)
|
||||||
QualFilingEquipmentChangeE convertCmdToE(QualFilingEquipmentChangeUpdateCmd qualFilingEquipmentChangeUpdateCmd);
|
QualFilingEquipmentChangeE convertCmdToE(QualFilingEquipmentChangeUpdateCmd qualFilingEquipmentChangeUpdateCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更装备转装备实体
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "filingId", ignore = true)
|
|
||||||
@Mapping(target = "tenantId", ignore = true)
|
|
||||||
@Mapping(target = "orgId", ignore = true)
|
|
||||||
QualFilingEquipmentEntity convertChangeEToEntity(QualFilingEquipmentChangeE changeE);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量转换
|
|
||||||
*/
|
|
||||||
List<QualFilingEquipmentEntity> convertChangeEListToEntityList(List<QualFilingEquipmentChangeE> changeEs);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,6 @@ import org.mapstruct.Mapping;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeAddCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeUpdateCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingMaterialChangeUpdateCmd;
|
||||||
import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE;
|
import org.qinan.safetyeval.domain.change.model.QualFilingMaterialChangeE;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingMaterialEntity;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案申请材料-变更转换
|
* 备案申请材料-变更转换
|
||||||
|
|
@ -34,18 +31,4 @@ public interface QualFilingMaterialChangeCmdConvertor {
|
||||||
*/
|
*/
|
||||||
@Mapping(target = "qualFilingMaterialChangeGateway", ignore = true)
|
@Mapping(target = "qualFilingMaterialChangeGateway", ignore = true)
|
||||||
QualFilingMaterialChangeE convertCmdToE(QualFilingMaterialChangeUpdateCmd qualFilingMaterialChangeUpdateCmd);
|
QualFilingMaterialChangeE convertCmdToE(QualFilingMaterialChangeUpdateCmd qualFilingMaterialChangeUpdateCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更材料转材料实体
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "filingId", ignore = true)
|
|
||||||
@Mapping(target = "tenantId", ignore = true)
|
|
||||||
@Mapping(target = "orgId", ignore = true)
|
|
||||||
QualFilingMaterialEntity convertChangeEToEntity(QualFilingMaterialChangeE changeE);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量转换
|
|
||||||
*/
|
|
||||||
List<QualFilingMaterialEntity> convertChangeEListToEntityList(List<QualFilingMaterialChangeE> changeEs);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,6 @@ import org.mapstruct.Mapping;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeAddCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeUpdateCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelCertChangeUpdateCmd;
|
||||||
import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE;
|
import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelCertChangeE;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingPersonnelCertEntity;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案申请人员证书转换
|
* 备案申请人员证书转换
|
||||||
|
|
@ -34,18 +31,4 @@ public interface QualFilingPersonnelCertChangeCmdConvertor {
|
||||||
*/
|
*/
|
||||||
@Mapping(target = "qualFilingPersonnelCertChangeGateway", ignore = true)
|
@Mapping(target = "qualFilingPersonnelCertChangeGateway", ignore = true)
|
||||||
QualFilingPersonnelCertChangeE convertCmdToE(QualFilingPersonnelCertChangeUpdateCmd qualFilingPersonnelCertChangeUpdateCmd);
|
QualFilingPersonnelCertChangeE convertCmdToE(QualFilingPersonnelCertChangeUpdateCmd qualFilingPersonnelCertChangeUpdateCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更人员证书转人员证书实体
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "filingId", ignore = true)
|
|
||||||
@Mapping(target = "tenantId", ignore = true)
|
|
||||||
@Mapping(target = "orgId", ignore = true)
|
|
||||||
QualFilingPersonnelCertEntity convertChangeEToEntity(QualFilingPersonnelCertChangeE changeE);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量转换
|
|
||||||
*/
|
|
||||||
List<QualFilingPersonnelCertEntity> convertChangeEListToEntityList(List<QualFilingPersonnelCertChangeE> changeEs);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,6 @@ import org.mapstruct.Mapping;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd;
|
import org.qinan.safetyeval.client.change.request.QualFilingPersonnelChangeUpdateCmd;
|
||||||
import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE;
|
import org.qinan.safetyeval.domain.change.model.QualFilingPersonnelChangeE;
|
||||||
import org.qinan.safetyeval.domain.entity.QualFilingPersonnelEntity;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案申请人员-变更转换
|
* 备案申请人员-变更转换
|
||||||
|
|
@ -34,18 +31,4 @@ public interface QualFilingPersonnelChangeCmdConvertor {
|
||||||
*/
|
*/
|
||||||
@Mapping(target = "qualFilingPersonnelChangeGateway", ignore = true)
|
@Mapping(target = "qualFilingPersonnelChangeGateway", ignore = true)
|
||||||
QualFilingPersonnelChangeE convertCmdToE(QualFilingPersonnelChangeUpdateCmd qualFilingPersonnelChangeUpdateCmd);
|
QualFilingPersonnelChangeE convertCmdToE(QualFilingPersonnelChangeUpdateCmd qualFilingPersonnelChangeUpdateCmd);
|
||||||
|
|
||||||
/**
|
|
||||||
* 变更人员转人员实体
|
|
||||||
*/
|
|
||||||
@Mapping(target = "id", ignore = true)
|
|
||||||
@Mapping(target = "filingId", ignore = true)
|
|
||||||
@Mapping(target = "tenantId", ignore = true)
|
|
||||||
@Mapping(target = "orgId", ignore = true)
|
|
||||||
QualFilingPersonnelEntity convertChangeEToEntity(QualFilingPersonnelChangeE changeE);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量转换
|
|
||||||
*/
|
|
||||||
List<QualFilingPersonnelEntity> convertChangeEListToEntityList(List<QualFilingPersonnelChangeE> changeEs);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,21 +10,18 @@ import org.qinan.safetyeval.client.dto.*;
|
||||||
import org.qinan.safetyeval.domain.change.gateway.*;
|
import org.qinan.safetyeval.domain.change.gateway.*;
|
||||||
import org.qinan.safetyeval.domain.change.model.*;
|
import org.qinan.safetyeval.domain.change.model.*;
|
||||||
import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum;
|
import org.qinan.safetyeval.domain.constant.QualFilingFormStepEnum;
|
||||||
import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum;
|
|
||||||
import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum;
|
import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum;
|
||||||
import org.qinan.safetyeval.domain.entity.*;
|
import org.qinan.safetyeval.domain.entity.QualFilingChangeDetailEntity;
|
||||||
|
import org.qinan.safetyeval.domain.entity.QualFilingChangeEntity;
|
||||||
import org.qinan.safetyeval.domain.exception.BizException;
|
import org.qinan.safetyeval.domain.exception.BizException;
|
||||||
import org.qinan.safetyeval.domain.exception.ErrorCode;
|
import org.qinan.safetyeval.domain.exception.ErrorCode;
|
||||||
import org.qinan.safetyeval.domain.query.PageResult;
|
import org.qinan.safetyeval.domain.query.PageResult;
|
||||||
import org.qinan.safetyeval.domain.query.QualFilingChangeQuery;
|
import org.qinan.safetyeval.domain.query.QualFilingChangeQuery;
|
||||||
import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService;
|
import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService;
|
||||||
import org.qinan.safetyeval.domain.service.QualFilingDomainService;
|
|
||||||
import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService;
|
|
||||||
import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
|
import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
@ -44,14 +41,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
||||||
@Autowired(required = false)
|
@Autowired(required = false)
|
||||||
private QualFilingChangeDomainService qualFilingChangeDomainService;
|
private QualFilingChangeDomainService qualFilingChangeDomainService;
|
||||||
|
|
||||||
@Lazy
|
|
||||||
@Autowired(required = false)
|
|
||||||
private QualFilingDomainService qualFilingDomainService;
|
|
||||||
|
|
||||||
@Lazy
|
|
||||||
@Autowired(required = false)
|
|
||||||
private QualFilingReviewDomainService qualFilingReviewDomainService;
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private QualFilingOrchestrator qualFilingOrchestrator;
|
private QualFilingOrchestrator qualFilingOrchestrator;
|
||||||
@Resource
|
@Resource
|
||||||
|
|
@ -251,80 +240,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi {
|
||||||
return SingleResponse.success(co);
|
return SingleResponse.success(co);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
|
||||||
public void review(QualFilingChangeReviewAddCmd cmd) {
|
|
||||||
Long changeFilingId = cmd.getChangeFilingId();
|
|
||||||
|
|
||||||
// 查询变更基本信息
|
|
||||||
QualFilingChangeEntity changeEntity = qualFilingChangeDomainService.get(changeFilingId);
|
|
||||||
|
|
||||||
if (changeEntity == null) {
|
|
||||||
throw new BizException(ErrorCode.QUAL_FILING_CHANGE_NOT_FOUND);
|
|
||||||
}
|
|
||||||
QualFilingChangeEntity updateE = qualFilingChangeDomainService.get(changeFilingId);
|
|
||||||
updateE.setId(changeFilingId);
|
|
||||||
|
|
||||||
// 构建并保存审核记录
|
|
||||||
QualFilingReviewEntity reviewEntity = new QualFilingReviewEntity();
|
|
||||||
reviewEntity.setFilingId(changeEntity.getChangeFilingId());
|
|
||||||
reviewEntity.setReviewResult(cmd.getReviewResult());
|
|
||||||
reviewEntity.setFilingExpertId(cmd.getFilingExpertId());
|
|
||||||
reviewEntity.setFilingExpertName(cmd.getFilingExpertName());
|
|
||||||
reviewEntity.setReviewOpinion(cmd.getReviewOpinion());
|
|
||||||
reviewEntity = qualFilingReviewDomainService.add(reviewEntity);
|
|
||||||
|
|
||||||
// 更新变更记录的 filing_review_id 和 filing_status_code
|
|
||||||
updateE.setFilingReviewId(reviewEntity.getId());
|
|
||||||
|
|
||||||
// 审核通过:将变更数据同步到正式备案表
|
|
||||||
if (QualFilingReviewResultEnum.PASS.getName().equals(cmd.getReviewResult())) {
|
|
||||||
updateE.setFilingStatusCode(QualFilingStatusEnum.FILED.getCode());
|
|
||||||
updateE.setFilingStatusName(QualFilingStatusEnum.FILED.getName());
|
|
||||||
|
|
||||||
// 转换变更基本信息 → 备案实体
|
|
||||||
QualFilingEntity entity = qualFilingChangeCmdConvertor.convertChangeEToEntity(changeEntity);
|
|
||||||
entity.setId(changeEntity.getChangeFilingId());
|
|
||||||
|
|
||||||
// 查询并转换承诺书
|
|
||||||
QualFilingCommitmentChangeE commitmentChangeE = qualFilingCommitmentChangeGateway.getByFilingId(changeFilingId);
|
|
||||||
QualFilingCommitmentEntity commitmentEntity = null;
|
|
||||||
if (commitmentChangeE != null) {
|
|
||||||
commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertChangeEToEntity(commitmentChangeE);
|
|
||||||
commitmentEntity.setFilingId(changeEntity.getChangeFilingId());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 查询并转换装备清单
|
|
||||||
List<QualFilingEquipmentChangeE> equipmentChangeEs = qualFilingEquipmentChangeGateway.listByFilingId(changeFilingId);
|
|
||||||
List<QualFilingEquipmentEntity> equipmentEntities = qualFilingEquipmentChangeCmdConvertor.convertChangeEListToEntityList(equipmentChangeEs);
|
|
||||||
equipmentEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId()));
|
|
||||||
|
|
||||||
// 查询并转换材料清单
|
|
||||||
List<QualFilingMaterialChangeE> materialChangeEs = qualFilingMaterialChangeGateway.listByFilingId(changeFilingId);
|
|
||||||
List<QualFilingMaterialEntity> materialEntities = qualFilingMaterialChangeCmdConvertor.convertChangeEListToEntityList(materialChangeEs);
|
|
||||||
materialEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId()));
|
|
||||||
|
|
||||||
// 查询并转换人员
|
|
||||||
List<QualFilingPersonnelChangeE> personnelChangeEs = qualFilingPersonnelChangeGateway.listByFilingId(changeFilingId);
|
|
||||||
List<QualFilingPersonnelEntity> personnelEntities = qualFilingPersonnelChangeCmdConvertor.convertChangeEListToEntityList(personnelChangeEs);
|
|
||||||
personnelEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId()));
|
|
||||||
|
|
||||||
// 查询并转换人员证书
|
|
||||||
List<QualFilingPersonnelCertChangeE> personnelCertChangeEs = qualFilingPersonnelCertChangeGateway.listByFilingId(changeFilingId);
|
|
||||||
List<QualFilingPersonnelCertEntity> personnelCertEntities = qualFilingPersonnelCertChangeCmdConvertor.convertChangeEListToEntityList(personnelCertChangeEs);
|
|
||||||
personnelCertEntities.forEach(e -> e.setFilingId(changeEntity.getChangeFilingId()));
|
|
||||||
|
|
||||||
// 调用聚合保存,将变更数据写入正式备案表
|
|
||||||
qualFilingDomainService.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities);
|
|
||||||
} else {
|
|
||||||
updateE.setFilingStatusCode(QualFilingStatusEnum.REJECTED.getCode());
|
|
||||||
updateE.setFilingStatusName(QualFilingStatusEnum.REJECTED.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 更新变更记录
|
|
||||||
qualFilingChangeDomainService.modify(updateE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 聚合保存或编辑前的状态校验
|
* 聚合保存或编辑前的状态校验
|
||||||
* <ul>
|
* <ul>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ import org.qinan.safetyeval.client.dto.SingleResponse;
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd;
|
import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd;
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangeModifyCmd;
|
import org.qinan.safetyeval.client.dto.QualFilingChangeModifyCmd;
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangePageQuery;
|
import org.qinan.safetyeval.client.dto.QualFilingChangePageQuery;
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangeReviewAddCmd;
|
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingChangeSubmitCmd;
|
import org.qinan.safetyeval.client.dto.QualFilingChangeSubmitCmd;
|
||||||
import org.qinan.safetyeval.client.dto.QualFilingRejectCmd;
|
import org.qinan.safetyeval.client.dto.QualFilingRejectCmd;
|
||||||
|
|
||||||
|
|
@ -43,6 +42,4 @@ public interface QualFilingChangeApi {
|
||||||
SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(Long id);
|
SingleResponse<List<QualFilingChangeComplianceCheckResultCO>> complianceCheck(Long id);
|
||||||
|
|
||||||
SingleResponse<QualFilingChangeCO> aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd);
|
SingleResponse<QualFilingChangeCO> aggregationSaveOrEdit(AggregationSaveOrEditQualFilingChangeCmd cmd);
|
||||||
|
|
||||||
void review(QualFilingChangeReviewAddCmd cmd);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,6 @@ public class QualFilingChangeCO {
|
||||||
@ApiModelProperty(value = "备案申请ID")
|
@ApiModelProperty(value = "备案申请ID")
|
||||||
private Long filingId;
|
private Long filingId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "审核ID")
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "变更备案ID")
|
@ApiModelProperty(value = "变更备案ID")
|
||||||
private Long changeFilingId;
|
private Long changeFilingId;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
package org.qinan.safetyeval.client.dto;
|
package org.qinan.safetyeval.client.dto;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备案变更新增命令
|
* 备案变更新增命令
|
||||||
|
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
package org.qinan.safetyeval.client.dto;
|
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.Data;
|
|
||||||
import org.qinan.safetyeval.domain.constant.QualFilingReviewResultEnum;
|
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 资质审核记录新增命令
|
|
||||||
*
|
|
||||||
* @author safety-eval
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class QualFilingChangeReviewAddCmd {
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "变更备案申请id")
|
|
||||||
@NotNull(message = "备案申请id 不能为空")
|
|
||||||
private Long changeFilingId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "备案审核id", hidden = true)
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = QualFilingReviewResultEnum.REMARKS)
|
|
||||||
@NotBlank(message = "审核结果 不能为空")
|
|
||||||
private String reviewResult;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "专家id")
|
|
||||||
private Long filingExpertId;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "专家名称")
|
|
||||||
private String filingExpertName;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "综合审核意见")
|
|
||||||
private String reviewOpinion;
|
|
||||||
}
|
|
||||||
|
|
@ -14,8 +14,6 @@ public enum QualFilingReviewResultEnum {
|
||||||
private final int code;
|
private final int code;
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
public static final String REMARKS = "审核结果(1通过2待定3不通过)";
|
|
||||||
|
|
||||||
QualFilingReviewResultEnum(int code, String name) {
|
QualFilingReviewResultEnum(int code, String name) {
|
||||||
this.code = code;
|
this.code = code;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,6 @@ public class QualFilingChangeEntity {
|
||||||
/** 打回原因 */
|
/** 打回原因 */
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
|
|
||||||
/** 审核ID */
|
|
||||||
private Long filingReviewId;
|
|
||||||
|
|
||||||
/** 提交时间 */
|
/** 提交时间 */
|
||||||
private java.time.LocalDateTime submitTime;
|
private java.time.LocalDateTime submitTime;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ public class QualFilingChangeDO {
|
||||||
private Long changeFilingId;
|
private Long changeFilingId;
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
private LocalDateTime submitTime;
|
private LocalDateTime submitTime;
|
||||||
private Long filingReviewId;
|
|
||||||
private String filingTerritoryCode;
|
private String filingTerritoryCode;
|
||||||
private String filingTerritoryName;
|
private String filingTerritoryName;
|
||||||
private String filingUnitName;
|
private String filingUnitName;
|
||||||
|
|
|
||||||
|
|
@ -228,7 +228,6 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
|
||||||
dataObject.setFilingId(entity.getFilingId());
|
dataObject.setFilingId(entity.getFilingId());
|
||||||
dataObject.setChangeFilingId(entity.getChangeFilingId());
|
dataObject.setChangeFilingId(entity.getChangeFilingId());
|
||||||
dataObject.setRejectReason(entity.getRejectReason());
|
dataObject.setRejectReason(entity.getRejectReason());
|
||||||
dataObject.setFilingReviewId(entity.getFilingReviewId());
|
|
||||||
dataObject.setSubmitTime(entity.getSubmitTime());
|
dataObject.setSubmitTime(entity.getSubmitTime());
|
||||||
dataObject.setFilingTerritoryCode(entity.getFilingTerritoryCode());
|
dataObject.setFilingTerritoryCode(entity.getFilingTerritoryCode());
|
||||||
dataObject.setFilingTerritoryName(entity.getFilingTerritoryName());
|
dataObject.setFilingTerritoryName(entity.getFilingTerritoryName());
|
||||||
|
|
@ -266,7 +265,6 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway {
|
||||||
entity.setFilingId(dataObject.getFilingId());
|
entity.setFilingId(dataObject.getFilingId());
|
||||||
entity.setChangeFilingId(dataObject.getChangeFilingId());
|
entity.setChangeFilingId(dataObject.getChangeFilingId());
|
||||||
entity.setRejectReason(dataObject.getRejectReason());
|
entity.setRejectReason(dataObject.getRejectReason());
|
||||||
entity.setFilingReviewId(dataObject.getFilingReviewId());
|
|
||||||
entity.setSubmitTime(dataObject.getSubmitTime());
|
entity.setSubmitTime(dataObject.getSubmitTime());
|
||||||
entity.setFilingTerritoryCode(dataObject.getFilingTerritoryCode());
|
entity.setFilingTerritoryCode(dataObject.getFilingTerritoryCode());
|
||||||
entity.setFilingTerritoryName(dataObject.getFilingTerritoryName());
|
entity.setFilingTerritoryName(dataObject.getFilingTerritoryName());
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@
|
||||||
<result column="filing_id" property="filingId"/>
|
<result column="filing_id" property="filingId"/>
|
||||||
<result column="change_filing_id" property="changeFilingId"/>
|
<result column="change_filing_id" property="changeFilingId"/>
|
||||||
<result column="reject_reason" property="rejectReason"/>
|
<result column="reject_reason" property="rejectReason"/>
|
||||||
<result column="filing_review_id" property="filingReviewId"/>
|
|
||||||
<result column="submit_time" property="submitTime"/>
|
<result column="submit_time" property="submitTime"/>
|
||||||
<result column="filing_territory_code" property="filingTerritoryCode"/>
|
<result column="filing_territory_code" property="filingTerritoryCode"/>
|
||||||
<result column="filing_territory_name" property="filingTerritoryName"/>
|
<result column="filing_territory_name" property="filingTerritoryName"/>
|
||||||
|
|
@ -49,7 +48,7 @@
|
||||||
|
|
||||||
<!-- 通用查询结果列 -->
|
<!-- 通用查询结果列 -->
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
`id`, `org_id`, `filing_id`, `change_filing_id`, `filing_review_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
|
`id`, `org_id`, `filing_id`, `change_filing_id`, `reject_reason`, `submit_time`, `filing_territory_code`, `filing_territory_name`, `filing_unit_name`, `filing_unit_type_code`, `filing_unit_type_name`, `filing_no`, `business_scope`, `register_address`, `office_address`, `credit_code`, `qual_cert_no`, `legal_person_phone`, `contact_phone`, `info_disclosure_url`, `fixed_asset_amount`, `archive_room_area`, `fulltime_evaluator_count`, `registered_engineer_count`, `workplace_area`, `unit_intro`, `attachment_url`, `filing_status_code`, `filing_status_name`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue