diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index 2db0dac3..c8ed8543 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -28,7 +28,6 @@ import org.qinan.safetyeval.infrastructure.dataobject.*; import org.qinan.safetyeval.infrastructure.mapper.*; import org.qinan.safetyeval.infrastructure.persistence.mapper.QualFilingPersonnelChangeMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; -import org.qinan.safetyeval.infrastructure.utils.CommonUtil; import org.qinan.safetyeval.infrastructure.utils.ComplianceCheckUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -195,6 +194,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); + domainQuery.setCreditCode(query.getCreditCode()); PageResult pageResult = qualFilingChangeDomainService.page(domainQuery); return PageResponse.of( pageResult.getRecords().stream().map(this::toCO).collect(java.util.stream.Collectors.toList()), @@ -275,8 +275,6 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { public SingleResponse> aggregationSaveOrEdit( AggregationSaveOrEditQualFilingChangeCmd cmd, boolean throwException) { validateBeforeSaveOrEdit(cmd); - - cmd.getQualFilingCommitmentChangeAddCmd().setLegalRepSignatureUrl(CommonUtil.COLON); // 合规性校验:只要有一项未通过则抛出异常 AggregationSaveOrEditQualFilingCmd qualFilingCmd = convertToQualFilingCmd(cmd); List complianceResults = ComplianceCheckUtil.complianceCheck(qualFilingCmd, throwException); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java index b06d20c8..52162349 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/regulator/RegulatorEvalProjectMonitorExecutor.java @@ -5,19 +5,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.qinan.safetyeval.app.executor.support.EvalProjectNodeOverviewAssembler; import org.qinan.safetyeval.app.executor.support.RegulatorMonitorCoConverter; import org.qinan.safetyeval.client.api.regulator.RegulatorEvalProjectMonitorApi; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorPageCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorStatCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectNodeOverviewCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyPageCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyStatCO; -import org.qinan.safetyeval.client.co.regulator.RegulatorEvalSurveyClockInCO; +import org.qinan.safetyeval.client.co.regulator.*; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorPageQuery; import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorRealtimePageQuery; import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectSurveyPageQuery; import org.qinan.safetyeval.domain.constant.ProjectProcessWaringStatusEnum; +import org.qinan.safetyeval.domain.constant.ProjectRoleEnum; import org.qinan.safetyeval.domain.entity.EvalProjectEntity; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; @@ -136,7 +131,13 @@ public class RegulatorEvalProjectMonitorExecutor implements RegulatorEvalProject @Override public SingleResponse> surveyClockInList(String projectId) { - return SingleResponse.success(evalProjectMapper.selectRegulatorSurveyClockInList(Long.parseLong(projectId))); + List regulatorEvalSurveyClockInCOS = evalProjectMapper.selectRegulatorSurveyClockInList(Long.parseLong(projectId)); + for (RegulatorEvalSurveyClockInCO regulatorEvalSurveyClockInCO : regulatorEvalSurveyClockInCOS) { + if (regulatorEvalSurveyClockInCO.getRole() != null) { + regulatorEvalSurveyClockInCO.setRole(ProjectRoleEnum.fromVals(regulatorEvalSurveyClockInCO.getRole())); + } + } + return SingleResponse.success(regulatorEvalSurveyClockInCOS); } private void fillDisplayFields(RegulatorEvalProjectMonitorPageCO co) { diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java index 6099a9ee..0f6de8d7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangePageQuery.java @@ -27,4 +27,7 @@ public class QualFilingChangePageQuery extends BasePageQuery { @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Long filingStatusCode; + + @ApiModelProperty(value = "统一社会信用代码") + private String creditCode; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java index 034214ef..0282c70d 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingChangeQuery.java @@ -38,4 +38,5 @@ public class QualFilingChangeQuery { /** 备案状态 */ private Long filingStatusCode; + private String creditCode; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java index c7d4d806..69e35231 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingChangeGatewayImpl.java @@ -128,6 +128,9 @@ public class QualFilingChangeGatewayImpl implements QualFilingChangeGateway { if (StringUtils.hasText(query.getFilingUnitName())) { wrapper.like(QualFilingChangeDO::getFilingUnitName, query.getFilingUnitName()); } + if (StringUtils.hasText(query.getCreditCode())) { + wrapper.eq(QualFilingChangeDO::getCreditCode, query.getCreditCode()); + } if (StringUtils.hasText(query.getFilingTerritoryCode())) { String territory = query.getFilingTerritoryCode(); wrapper.and(w -> w.eq(QualFilingChangeDO::getFilingTerritoryCode, territory)