From bd110575582144a764a0fc03c37dc37d39d81185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=91=E6=BA=AA?= <1015733727@qq.com> Date: Thu, 2 Jul 2026 09:10:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E8=B4=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=81=9A=E5=90=88=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/web/AccountController.java | 5 +- .../adapter/web/OrgDepartmentController.java | 5 +- .../adapter/web/OrgEquipmentController.java | 5 +- .../adapter/web/OrgInfoController.java | 7 +- .../web/OrgPersonnelCertController.java | 5 +- .../web/OrgPersonnelChangeController.java | 5 +- .../adapter/web/OrgPersonnelController.java | 7 +- .../adapter/web/OrgPositionController.java | 5 +- .../web/OrgQualificationController.java | 4 +- .../adapter/web/OrgResignApplyController.java | 5 +- .../web/QualFilingChangeController.java | 11 +- .../web/QualFilingChangeDetailController.java | 5 +- .../web/QualFilingCommitmentController.java | 5 +- .../adapter/web/QualFilingController.java | 120 +++-------- .../web/QualFilingEquipmentController.java | 5 +- .../web/QualFilingExpertController.java | 5 +- .../web/QualFilingMaterialController.java | 7 +- .../QualFilingPersonnelCertController.java | 5 +- .../web/QualFilingPersonnelController.java | 5 +- .../web/QualFilingReviewController.java | 5 +- .../app/executor/QualFilingExecutor.java | 62 +++++- .../orchestrator/QualFilingOrchestrator.java | 5 +- .../safetyeval/client/api/QualFilingApi.java | 12 +- .../qinan/safetyeval/client/co/AccountCO.java | 2 +- .../safetyeval/client/co/OrgEquipmentCO.java | 4 +- .../qinan/safetyeval/client/co/OrgInfoCO.java | 8 +- .../safetyeval/client/co/OrgPersonnelCO.java | 12 +- .../client/co/OrgQualificationCO.java | 2 +- .../client/co/OrgResignApplyCO.java | 2 +- .../safetyeval/client/co/QualFilingCO.java | 4 +- .../client/co/QualFilingChangeCO.java | 2 +- .../client/co/QualFilingEquipmentCO.java | 2 +- .../client/co/QualFilingExpertCO.java | 2 +- .../client/co/QualFilingMaterialCO.java | 6 +- .../client/co/QualFilingPersonnelCO.java | 6 +- .../client/co/QualFilingReviewCO.java | 4 +- .../safetyeval/client/dto/AccountAddCmd.java | 13 +- .../client/dto/AccountModifyCmd.java | 15 +- .../client/dto/AccountPageQuery.java | 9 +- .../AggregationSaveOrEditQualFilingCmd.java | 33 +++ .../safetyeval/client/dto/BasePageQuery.java | 7 +- .../client/dto/OrgDepartmentAddCmd.java | 13 +- .../client/dto/OrgDepartmentModifyCmd.java | 17 +- .../client/dto/OrgDepartmentPageQuery.java | 7 +- .../client/dto/OrgEquipmentAddCmd.java | 33 +-- .../client/dto/OrgEquipmentModifyCmd.java | 37 ++-- .../client/dto/OrgEquipmentPageQuery.java | 11 +- .../safetyeval/client/dto/OrgInfoAddCmd.java | 85 ++++---- .../client/dto/OrgInfoModifyCmd.java | 89 ++++---- .../client/dto/OrgInfoPageQuery.java | 23 +- .../client/dto/OrgInfoUpdateStateCmd.java | 5 +- .../client/dto/OrgPersonnelAddCmd.java | 65 +++--- .../client/dto/OrgPersonnelCertAddCmd.java | 29 +-- .../client/dto/OrgPersonnelCertModifyCmd.java | 33 +-- .../client/dto/OrgPersonnelCertPageQuery.java | 9 +- .../client/dto/OrgPersonnelChangeAddCmd.java | 7 +- .../dto/OrgPersonnelChangeModifyCmd.java | 11 +- .../dto/OrgPersonnelChangePageQuery.java | 7 +- .../client/dto/OrgPersonnelModifyCmd.java | 69 +++--- .../client/dto/OrgPersonnelPageQuery.java | 15 +- .../client/dto/OrgPositionAddCmd.java | 9 +- .../client/dto/OrgPositionModifyCmd.java | 13 +- .../client/dto/OrgPositionPageQuery.java | 7 +- .../client/dto/OrgQualificationAddCmd.java | 23 +- .../client/dto/OrgQualificationModifyCmd.java | 27 +-- .../client/dto/OrgQualificationPageQuery.java | 9 +- .../client/dto/OrgResignApplyAddCmd.java | 21 +- .../client/dto/OrgResignApplyModifyCmd.java | 25 +-- .../client/dto/OrgResignApplyPageQuery.java | 9 +- .../client/dto/QualFilingAddCmd.java | 56 ++--- .../dto/QualFilingAttachmentUploadCmd.java | 3 + .../client/dto/QualFilingChangeAddCmd.java | 49 ++--- .../dto/QualFilingChangeDetailAddCmd.java | 5 +- .../dto/QualFilingChangeDetailModifyCmd.java | 9 +- .../dto/QualFilingChangeDetailPageQuery.java | 5 +- .../client/dto/QualFilingChangeModifyCmd.java | 53 ++--- .../client/dto/QualFilingChangePageQuery.java | 9 +- .../client/dto/QualFilingChangeSubmitCmd.java | 2 + .../dto/QualFilingCommitmentAddCmd.java | 11 +- .../dto/QualFilingCommitmentModifyCmd.java | 17 +- .../dto/QualFilingCommitmentPageQuery.java | 3 +- .../client/dto/QualFilingEquipmentAddCmd.java | 37 ++-- .../dto/QualFilingEquipmentBatchAddCmd.java | 3 + .../dto/QualFilingEquipmentModifyCmd.java | 35 +-- .../dto/QualFilingEquipmentPageQuery.java | 5 +- .../client/dto/QualFilingExpertAddCmd.java | 13 +- .../client/dto/QualFilingExpertModifyCmd.java | 15 +- .../client/dto/QualFilingExpertPageQuery.java | 9 +- .../client/dto/QualFilingMaterialAddCmd.java | 26 ++- .../dto/QualFilingMaterialModifyCmd.java | 15 +- .../dto/QualFilingMaterialPageQuery.java | 7 +- .../client/dto/QualFilingModifyCmd.java | 57 ++--- .../client/dto/QualFilingPageQuery.java | 20 +- .../client/dto/QualFilingPersonnelAddCmd.java | 50 +++-- .../dto/QualFilingPersonnelBatchAddCmd.java | 3 + .../dto/QualFilingPersonnelCertAddCmd.java | 33 +-- .../dto/QualFilingPersonnelCertModifyCmd.java | 31 +-- .../dto/QualFilingPersonnelCertPageQuery.java | 7 +- .../dto/QualFilingPersonnelModifyCmd.java | 51 ++--- .../dto/QualFilingPersonnelPageQuery.java | 5 +- .../client/dto/QualFilingRejectCmd.java | 3 + .../client/dto/QualFilingReviewAddCmd.java | 13 +- .../client/dto/QualFilingReviewModifyCmd.java | 15 +- .../client/dto/QualFilingReviewPageQuery.java | 7 +- .../entity/QualFilingCommitmentEntity.java | 1 + .../domain/entity/QualFilingEntity.java | 1 + .../entity/QualFilingEquipmentEntity.java | 1 + .../entity/QualFilingMaterialEntity.java | 1 + .../entity/QualFilingPersonnelCertEntity.java | 1 + .../entity/QualFilingPersonnelEntity.java | 1 + .../domain/gateway/QualFilingGateway.java | 9 +- .../domain/query/QualFilingQuery.java | 4 + .../service/QualFilingDomainService.java | 19 +- .../gatewayimpl/QualFilingGatewayImpl.java | 199 ++++++++++++++++-- 114 files changed, 1197 insertions(+), 868 deletions(-) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingCmd.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java index 3d4afd80..3ac334f9 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; import org.qinan.safetyeval.client.dto.AccountAddCmd; @@ -40,7 +41,7 @@ public class AccountController { @ApiOperation("查询用户详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return accountApi.get(id); } @@ -52,7 +53,7 @@ public class AccountController { @ApiOperation("删除用户") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return accountApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java index dd7d3fe4..fcb7c6eb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgDepartmentApi; import org.qinan.safetyeval.client.co.OrgDepartmentCO; import org.qinan.safetyeval.client.dto.OrgDepartmentAddCmd; @@ -39,7 +40,7 @@ public class OrgDepartmentController { @ApiOperation("查询部门详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgDepartmentApi.get(id); } @@ -51,7 +52,7 @@ public class OrgDepartmentController { @ApiOperation("删除部门") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgDepartmentApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java index 79c72192..50782112 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgEquipmentApi; import org.qinan.safetyeval.client.co.OrgEquipmentCO; import org.qinan.safetyeval.client.dto.OrgEquipmentAddCmd; @@ -35,7 +36,7 @@ public class OrgEquipmentController { @ApiOperation("查询装备信息详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgEquipmentApi.get(id); } @@ -47,7 +48,7 @@ public class OrgEquipmentController { @ApiOperation("删除装备信息") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgEquipmentApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java index 8725182f..9b58fdcc 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgInfoApi; import org.qinan.safetyeval.client.co.OrgInfoCO; import org.qinan.safetyeval.client.dto.OrgInfoAddCmd; @@ -36,7 +37,7 @@ public class OrgInfoController { @ApiOperation("根据查询机构信息详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgInfoApi.get(id); } @@ -54,7 +55,7 @@ public class OrgInfoController { @ApiOperation("删除机构信息") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgInfoApi.delete(id); } @@ -66,7 +67,7 @@ public class OrgInfoController { @ApiOperation("重置机构密码") @PostMapping("/reset-password") - public SingleResponse resetPassword(@RequestParam Long id) { + public SingleResponse resetPassword(@ApiParam("主键ID") @RequestParam Long id) { return orgInfoApi.resetPassword(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java index 7cb5ac74..4cfe9f68 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelCertApi; import org.qinan.safetyeval.client.co.OrgPersonnelCertCO; import org.qinan.safetyeval.client.dto.OrgPersonnelCertAddCmd; @@ -35,7 +36,7 @@ public class OrgPersonnelCertController { @ApiOperation("查询人员证书详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelCertApi.get(id); } @@ -47,7 +48,7 @@ public class OrgPersonnelCertController { @ApiOperation("删除人员证书") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelCertApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java index 30ce2b4a..f5d3e6fb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelChangeApi; import org.qinan.safetyeval.client.co.OrgPersonnelChangeCO; import org.qinan.safetyeval.client.dto.OrgPersonnelChangeAddCmd; @@ -35,7 +36,7 @@ public class OrgPersonnelChangeController { @ApiOperation("查询人员变更记录详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelChangeApi.get(id); } @@ -47,7 +48,7 @@ public class OrgPersonnelChangeController { @ApiOperation("删除人员变更记录") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelChangeApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java index eeb72e59..8d01c5bf 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelApi; import org.qinan.safetyeval.client.co.OrgPersonnelCO; import org.qinan.safetyeval.client.dto.OrgPersonnelAddCmd; @@ -35,7 +36,7 @@ public class OrgPersonnelController { @ApiOperation("查询人员信息详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelApi.get(id); } @@ -47,7 +48,7 @@ public class OrgPersonnelController { @ApiOperation("删除人员信息") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelApi.delete(id); } @@ -59,7 +60,7 @@ public class OrgPersonnelController { @ApiOperation("重置人员密码") @PostMapping("/reset-password") - public SingleResponse resetPassword(@RequestParam Long id) { + public SingleResponse resetPassword(@ApiParam("主键ID") @RequestParam Long id) { return orgPersonnelApi.resetPassword(id); } } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java index 9911b145..5c53a2ab 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPositionApi; import org.qinan.safetyeval.client.co.OrgPositionCO; import org.qinan.safetyeval.client.dto.OrgPositionAddCmd; @@ -35,7 +36,7 @@ public class OrgPositionController { @ApiOperation("查询岗位详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgPositionApi.get(id); } @@ -47,7 +48,7 @@ public class OrgPositionController { @ApiOperation("删除岗位") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgPositionApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java index 44eb3d9a..4389c996 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java @@ -38,7 +38,7 @@ public class OrgQualificationController { @ApiOperation("查询机构资质证书详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgQualificationApi.get(id); } @@ -50,7 +50,7 @@ public class OrgQualificationController { @ApiOperation("删除机构资质证书") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgQualificationApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java index dd0b7e1d..d9ab6acb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgResignApplyApi; import org.qinan.safetyeval.client.co.OrgResignApplyCO; import org.qinan.safetyeval.client.dto.OrgResignApplyAddCmd; @@ -35,7 +36,7 @@ public class OrgResignApplyController { @ApiOperation("查询人员离职申请详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return orgResignApplyApi.get(id); } @@ -47,7 +48,7 @@ public class OrgResignApplyController { @ApiOperation("删除人员离职申请") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return orgResignApplyApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index b0a648e6..e8ca5a75 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.*; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingChangeApi; import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.springframework.validation.annotation.Validated; @@ -31,7 +32,7 @@ public class QualFilingChangeController { @ApiOperation("查询备案变更详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingChangeApi.get(id); } @@ -43,7 +44,7 @@ public class QualFilingChangeController { @ApiOperation("删除备案变更") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingChangeApi.delete(id); } @@ -55,7 +56,7 @@ public class QualFilingChangeController { @ApiOperation("发起备案变更（克隆草稿）") @PostMapping("/start") - public SingleResponse start(@RequestParam Long originFilingId) { + public SingleResponse start(@ApiParam("原备案申请id") @RequestParam Long originFilingId) { return qualFilingChangeApi.start(originFilingId); } @@ -68,13 +69,13 @@ public class QualFilingChangeController { @ApiOperation("备案变更历史") @GetMapping("/history") public SingleResponse history( - @RequestParam Long originFilingId) { + @ApiParam("原备案申请id") @RequestParam Long originFilingId) { return qualFilingChangeApi.history(originFilingId); } @ApiOperation("变更审核通过") @PostMapping("/approve") - public SingleResponse approve(@RequestParam Long changeId) { + public SingleResponse approve(@ApiParam("备案变更id") @RequestParam Long changeId) { return qualFilingChangeApi.approve(changeId); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java index 9668171b..7a02ffcb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingChangeDetailApi; import org.qinan.safetyeval.client.co.QualFilingChangeDetailCO; import org.qinan.safetyeval.client.dto.QualFilingChangeDetailAddCmd; @@ -35,7 +36,7 @@ public class QualFilingChangeDetailController { @ApiOperation("查询备案变更明细详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingChangeDetailApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingChangeDetailController { @ApiOperation("删除备案变更明细") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingChangeDetailApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java index fe8226e7..7df3812a 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingCommitmentApi; import org.qinan.safetyeval.client.co.QualFilingCommitmentCO; import org.qinan.safetyeval.client.dto.QualFilingCommitmentAddCmd; @@ -35,7 +36,7 @@ public class QualFilingCommitmentController { @ApiOperation("查询法定代表人承诺书详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingCommitmentApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingCommitmentController { @ApiOperation("删除法定代表人承诺书") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingCommitmentApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java index bec8042b..381b1602 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java @@ -2,17 +2,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingApi; import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.QualFilingAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingAttachmentUploadCmd; -import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingPageQuery; -import org.qinan.safetyeval.client.dto.QualFilingRejectCmd; +import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.domain.constant.QualFilingApplyTypeEnum; import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; import org.springframework.validation.annotation.Validated; @@ -39,85 +34,9 @@ public class QualFilingController { return qualFilingApi.add(cmd); } - @ApiOperation("创建备案草稿") - @PostMapping("/draft") - public SingleResponse draft( - @RequestParam(defaultValue = "1") Integer applyTypeCode) { - return qualFilingApi.draft(applyTypeCode); - } - - @ApiOperation("暂存备案信息") - @PostMapping("/save-draft") - public SingleResponse saveDraft(@Validated @RequestBody QualFilingModifyCmd cmd) { - return qualFilingApi.saveDraft(cmd); - } - - @ApiOperation("提交备案审核") - @PostMapping("/submit") - public SingleResponse submit(@RequestParam Long id) { - return qualFilingApi.submit(id); - } - - @ApiOperation("审核通过") - @PostMapping("/approve") - public SingleResponse approve(@RequestParam Long id) { - return qualFilingApi.approve(id); - } - - @ApiOperation("审核打回") - @PostMapping("/reject") - public SingleResponse reject(@Validated @RequestBody QualFilingRejectCmd cmd) { - return qualFilingApi.reject(cmd); - } - - @ApiOperation("备案详情（5步聚合）") - @GetMapping("/detail") - public SingleResponse detail(@RequestParam Long id) { - return qualFilingApi.detail(id); - } - - @ApiOperation("上传主表附件") - @PostMapping("/upload-attachment") - public SingleResponse uploadAttachment(@Validated @RequestBody QualFilingAttachmentUploadCmd cmd) { - return qualFilingApi.uploadAttachment(cmd); - } - - @ApiOperation("已备案资质填报-创建草稿") - @PostMapping("/filed/draft") - public SingleResponse filedDraft() { - return qualFilingApi.filedDraft(); - } - - @ApiOperation("已备案资质管理-分页") - @GetMapping("/filed/page") - public PageResponse filedPage(@Validated QualFilingPageQuery query) { - query.setApplyTypeCode(QualFilingApplyTypeEnum.FILED_MANAGE.getCode()); - applyDefaultStatusCodes(query, Arrays.asList( - QualFilingStatusEnum.FILED.getCode(), - QualFilingStatusEnum.REVIEWING.getCode())); - return qualFilingApi.page(query); - } - - @ApiOperation("备案变更管理-分页") - @GetMapping("/change/page") - public PageResponse changePage(@Validated QualFilingPageQuery query) { - query.setScene("change"); - applyDefaultStatusCodes(query, Arrays.asList( - QualFilingStatusEnum.FILED.getCode(), - QualFilingStatusEnum.CHANGE_REVIEWING.getCode())); - return qualFilingApi.page(query); - } - - private void applyDefaultStatusCodes(QualFilingPageQuery query, List defaults) { - if (query.getFilingStatusCode() == null - && (query.getFilingStatusCodes() == null || query.getFilingStatusCodes().isEmpty())) { - query.setFilingStatusCodes(defaults); - } - } - @ApiOperation("查询资质备案申请详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingApi.get(id); } @@ -127,21 +46,42 @@ public class QualFilingController { return qualFilingApi.modify(cmd); } - @ApiOperation("删除资质备案申请") - @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { - return qualFilingApi.delete(id); +/////////////////////////////////////聚合接口 + @ApiOperation("聚合新增or编辑资质备案申请") + @PostMapping("/aggregationSaveOrEdit") + public SingleResponse aggregationSaveOrEdit(@RequestBody AggregationSaveOrEditQualFilingCmd cmd) { + return qualFilingApi.aggregationSaveOrEdit(cmd); } - @ApiOperation("分页查询资质备案申请") + @ApiOperation("分页查询资质备案,已备案资质管理列表") @GetMapping("/page") public PageResponse page(@Validated QualFilingPageQuery query) { return qualFilingApi.page(query); } + @ApiOperation("审核") + @PostMapping("/review") + public SingleResponse review(@Validated @RequestBody QualFilingReviewAddCmd cmd) { + qualFilingApi.review(cmd); + return SingleResponse.success(); + } + + @ApiOperation("删除资质备案申请") + @PostMapping("/delete") + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { + return qualFilingApi.delete(id); + } + @ApiOperation("合规检查") @GetMapping("/compliance-check") - public SingleResponse> complianceCheck(@RequestParam Long id) { + public SingleResponse> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingApi.complianceCheck(id); } + + @ApiOperation("备案详情（5步聚合）") + @GetMapping("/detail") + public SingleResponse detail(@ApiParam("主键ID") @RequestParam Long id) { + return qualFilingApi.detail(id); + } + } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java index f3ef218b..c5e80f41 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingEquipmentApi; import org.qinan.safetyeval.client.co.QualFilingEquipmentCO; import org.qinan.safetyeval.client.dto.QualFilingEquipmentAddCmd; @@ -35,7 +36,7 @@ public class QualFilingEquipmentController { @ApiOperation("查询备案申请装备详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingEquipmentApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingEquipmentController { @ApiOperation("删除备案申请装备") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingEquipmentApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java index 2e567f6c..cac6256a 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingExpertApi; import org.qinan.safetyeval.client.co.QualFilingExpertCO; import org.qinan.safetyeval.client.dto.PageResponse; @@ -40,7 +41,7 @@ public class QualFilingExpertController { @ApiOperation("查询审核专家详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingExpertApi.get(id); } @@ -52,7 +53,7 @@ public class QualFilingExpertController { @ApiOperation("删除审核专家") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingExpertApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java index 64eaccef..a66772d0 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingMaterialApi; import org.qinan.safetyeval.client.co.QualFilingMaterialCO; import org.qinan.safetyeval.client.dto.QualFilingMaterialAddCmd; @@ -35,7 +36,7 @@ public class QualFilingMaterialController { @ApiOperation("查询备案申请材料详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingMaterialApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingMaterialController { @ApiOperation("删除备案申请材料") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingMaterialApi.delete(id); } @@ -59,7 +60,7 @@ public class QualFilingMaterialController { @ApiOperation("初始化材料模板") @PostMapping("/init-template") - public SingleResponse initTemplate(@RequestParam Long filingId) { + public SingleResponse initTemplate(@ApiParam("备案申请id") @RequestParam Long filingId) { return qualFilingMaterialApi.initTemplate(filingId); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java index 3619dabd..f52118a4 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingPersonnelCertApi; import org.qinan.safetyeval.client.co.QualFilingPersonnelCertCO; import org.qinan.safetyeval.client.dto.QualFilingPersonnelCertAddCmd; @@ -35,7 +36,7 @@ public class QualFilingPersonnelCertController { @ApiOperation("查询备案申请人员证书详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingPersonnelCertApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingPersonnelCertController { @ApiOperation("删除备案申请人员证书") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingPersonnelCertApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java index 06bf6082..bcb0a94e 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import org.qinan.safetyeval.client.dto.PageResponse; import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingPersonnelApi; import org.qinan.safetyeval.client.co.QualFilingPersonnelCO; import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd; @@ -35,7 +36,7 @@ public class QualFilingPersonnelController { @ApiOperation("查询备案申请人员详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingPersonnelApi.get(id); } @@ -47,7 +48,7 @@ public class QualFilingPersonnelController { @ApiOperation("删除备案申请人员") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingPersonnelApi.delete(id); } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java index 2edbb3c7..c91944eb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingReviewApi; import org.qinan.safetyeval.client.co.QualFilingReviewCO; import org.qinan.safetyeval.client.dto.PageResponse; @@ -40,7 +41,7 @@ public class QualFilingReviewController { @ApiOperation("查询资质审核记录详情") @GetMapping("/get") - public SingleResponse get(@RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingReviewApi.get(id); } @@ -52,7 +53,7 @@ public class QualFilingReviewController { @ApiOperation("删除资质审核记录") @PostMapping("/delete") - public SingleResponse delete(@RequestParam Long id) { + public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { return qualFilingReviewApi.delete(id); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java index 0f48c84b..0728af8d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExecutor.java @@ -5,23 +5,22 @@ import org.qinan.safetyeval.client.api.QualFilingApi; import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.QualFilingAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingAttachmentUploadCmd; -import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingPageQuery; -import org.qinan.safetyeval.client.dto.QualFilingRejectCmd; +import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.domain.constant.QualFilingApplyTypeEnum; -import org.qinan.safetyeval.domain.entity.QualFilingEntity; +import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.QualFilingDomainService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** * 资质备案申请执行器（App层） @@ -137,6 +136,53 @@ public class QualFilingExecutor implements QualFilingApi { return SingleResponse.success(qualFilingOrchestrator.complianceCheck(id)); } + @Override + public SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingCmd cmd) { + QualFilingCO co = new QualFilingCO(); + BeanUtils.copyProperties(co, cmd); + // 拷贝基本信息 + QualFilingEntity entity = new QualFilingEntity(); + BeanUtils.copyProperties(entity, cmd.getQualFilingAddCmd()); + //备案承诺书 + QualFilingCommitmentEntity commitmentEntity = new QualFilingCommitmentEntity(); + BeanUtils.copyProperties(commitmentEntity, cmd.getQualFilingCommitmentAddCmd()); + //备案装备 + List equipmentEntities = cmd.getQualFilingEquipmentAddCmds().stream().map(item -> { + QualFilingEquipmentEntity equipmentEntity = new QualFilingEquipmentEntity(); + BeanUtils.copyProperties(equipmentEntity, equipmentEntity); + return equipmentEntity; + }).collect(Collectors.toList()); + //备案材料清单 + List materialEntities = cmd.getQualFilingMaterialAddCmds().stream().map(item -> { + QualFilingMaterialEntity materialEntity = new QualFilingMaterialEntity(); + BeanUtils.copyProperties(materialEntity, item); + return materialEntity; + }).collect(Collectors.toList()); + //备案人员 + List personnelEntities = cmd.getQualFilingPersonnelAddCmds().stream().map(item -> { + QualFilingPersonnelEntity personnelEntity = new QualFilingPersonnelEntity(); + BeanUtils.copyProperties(personnelEntity, item); + return personnelEntity; + }).collect(Collectors.toList()); + //备案人员证书列表 + List personnelCertEntities = Collections.emptyList(); + if (!CollectionUtils.isEmpty(cmd.getQualFilingPersonnelCertAddCmds())) { + personnelCertEntities = cmd.getQualFilingPersonnelCertAddCmds().stream().map(item -> { + QualFilingPersonnelCertEntity personnelCertEntity = new QualFilingPersonnelCertEntity(); + BeanUtils.copyProperties(personnelCertEntity, item); + return personnelCertEntity; + }).collect(Collectors.toList()); + } + Long id = qualFilingDomainService.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + co.setId(id); + return SingleResponse.success(co); + } + + @Override + public void review(QualFilingReviewAddCmd cmd) { + qualFilingDomainService.review(cmd.getFilingId(), cmd.getReviewResult(), cmd.getReviewResultRemark(), cmd.getFilingExpertId(), cmd.getFilingExpertName(), cmd.getReviewOpinion()); + } + private QualFilingCO toLegacyCO(QualFilingEntity entity) { if (entity == null) { return null; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index ab424aa9..34116ed6 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -2,8 +2,10 @@ package org.qinan.safetyeval.app.orchestrator; import org.qinan.safetyeval.app.support.*; import org.qinan.safetyeval.client.co.*; +import org.qinan.safetyeval.client.dto.AggregationSaveOrEditQualFilingCmd; import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; import org.qinan.safetyeval.client.dto.QualFilingPageQuery; +import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.domain.constant.*; import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.exception.BizException; @@ -194,10 +196,9 @@ public class QualFilingOrchestrator { domainQuery.setFilingNo(query.getFilingNo()); domainQuery.setFilingUnitName(query.getFilingUnitName()); domainQuery.setFilingStatusCode(query.getFilingStatusCode()); - domainQuery.setFilingStatusCodes(query.getFilingStatusCodes()); domainQuery.setApplyTypeCode(query.getApplyTypeCode()); domainQuery.setFilingTerritoryCode(query.getFilingTerritoryCode()); - domainQuery.setScene(query.getScene()); + domainQuery.setSupervision(query.getSupervision()); PageResult pageResult = qualFilingGateway.page(domainQuery); List records = pageResult.getRecords().stream() .map(entity -> { diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java index 62407fdf..d2e363ea 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/QualFilingApi.java @@ -3,13 +3,7 @@ package org.qinan.safetyeval.client.api; import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; -import org.qinan.safetyeval.client.dto.QualFilingAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingAttachmentUploadCmd; -import org.qinan.safetyeval.client.dto.QualFilingModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingPageQuery; -import org.qinan.safetyeval.client.dto.QualFilingRejectCmd; +import org.qinan.safetyeval.client.dto.*; import java.util.List; @@ -45,4 +39,8 @@ public interface QualFilingApi { SingleResponse uploadAttachment(QualFilingAttachmentUploadCmd cmd); SingleResponse> complianceCheck(Long id); + + SingleResponse aggregationSaveOrEdit(AggregationSaveOrEditQualFilingCmd cmd); + + void review(QualFilingReviewAddCmd cmd); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/AccountCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/AccountCO.java index 54a62650..b1dded1c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/AccountCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/AccountCO.java @@ -26,7 +26,7 @@ public class AccountCO { @ApiModelProperty(value = "头像地址") private String profileUrl; - @ApiModelProperty(value = "类型: 1-机构端,2监管端") + @ApiModelProperty(value = "类型(1机构端2监管端)") private Integer type; @ApiModelProperty(value = "租户ID") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java index 9285582a..dce38763 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgEquipmentCO.java @@ -58,10 +58,10 @@ public class OrgEquipmentCO { @ApiModelProperty(value = "现场校准类型名称") private String fieldCalibrationTypeName; - @ApiModelProperty(value = "是否双通道") + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; - @ApiModelProperty(value = "是否启用") + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; @ApiModelProperty(value = "租户ID") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java index ccbd11eb..2d608795 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java @@ -110,13 +110,13 @@ public class OrgInfoCO { @ApiModelProperty(value = "经济行业名称") private String economyIndustryName; - @ApiModelProperty(value = "认证状态编码") + @ApiModelProperty(value = "认证状态编码(1填写信息2审核中3通过)") private Integer authStatusCode; @ApiModelProperty(value = "认证状态名称") private String authStatusName; - @ApiModelProperty(value = "企业状态编码") + @ApiModelProperty(value = "企业状态编码(1正常2停业3注销)") private Integer enterpriseStatusCode; @ApiModelProperty(value = "企业状态名称") @@ -128,13 +128,13 @@ public class OrgInfoCO { @ApiModelProperty(value = "企业规模名称") private String enterpriseScaleName; - @ApiModelProperty(value = "备案类型编码") + @ApiModelProperty(value = "备案类型编码(1审核备案2确认备案)") private String filingTypeCode; @ApiModelProperty(value = "备案类型名称") private String filingTypeName; - @ApiModelProperty(value = "备案记录状态编码") + @ApiModelProperty(value = "备案状态编码(1已备案2未备案)") private Integer filingRecordStatusCode; @ApiModelProperty(value = "备案记录状态名称") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java index 9de6a66c..0766aae1 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java @@ -27,7 +27,7 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "账号") private String account; - @ApiModelProperty(value = "性别编码") + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; @ApiModelProperty(value = "性别名称") @@ -57,13 +57,13 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "专业") private String major; - @ApiModelProperty(value = "从业状态编码") + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; @ApiModelProperty(value = "从业状态名称") private String employmentStatusName; - @ApiModelProperty(value = "人员类型编码") + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; @ApiModelProperty(value = "人员类型名称") @@ -81,13 +81,13 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "评价师证书编号") private String evaluatorCertNo; - @ApiModelProperty(value = "教育类型编码") + @ApiModelProperty(value = "学历类型编码(全日制/在职教育)") private String educationTypeCode; @ApiModelProperty(value = "教育类型名称") private String educationTypeName; - @ApiModelProperty(value = "教育水平编码") + @ApiModelProperty(value = "学历层次编码(专科/本科/硕士/博士)") private String educationLevelCode; @ApiModelProperty(value = "教育水平名称") @@ -96,7 +96,7 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "职称名称") private String titleName; - @ApiModelProperty(value = "是否注册安全工程师") + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; @ApiModelProperty(value = "发表著作") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgQualificationCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgQualificationCO.java index cf591de4..ab538263 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgQualificationCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgQualificationCO.java @@ -42,7 +42,7 @@ public class OrgQualificationCO { @ApiModelProperty(value = "证书图片地址") private String certImageUrl; - @ApiModelProperty(value = "是否启用") + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; @ApiModelProperty(value = "备注") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java index 065188b2..41194603 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgResignApplyCO.java @@ -34,7 +34,7 @@ public class OrgResignApplyCO { @ApiModelProperty(value = "报告文件地址") private String reportFileUrl; - @ApiModelProperty(value = "审核状态编码") + @ApiModelProperty(value = "离职申请审核状态编码(0未审核1已审核)") private Integer auditStatusCode; @ApiModelProperty(value = "审核状态名称") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java index edeb55ca..26022c06 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingCO.java @@ -79,13 +79,13 @@ public class QualFilingCO { @ApiModelProperty(value = "附件地址") private String attachmentUrl; - @ApiModelProperty(value = "备案状态编码") + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; @ApiModelProperty(value = "备案状态名称") private String filingStatusName; - @ApiModelProperty(value = "申请类型编码") + @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿3已备案资质填报)") private Integer applyTypeCode; @ApiModelProperty(value = "申请类型名称") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java index da3dbf05..5f939f67 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingChangeCO.java @@ -84,7 +84,7 @@ public class QualFilingChangeCO { @ApiModelProperty(value = "附件地址") private String attachmentUrl; - @ApiModelProperty(value = "备案状态编码") + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; @ApiModelProperty(value = "备案状态名称") 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 af43b3f8..f3ef5bf2 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 @@ -64,7 +64,7 @@ public class QualFilingEquipmentCO { @ApiModelProperty(value = "现场校准类型名称") private String fieldCalibrationTypeName; - @ApiModelProperty(value = "是否双通道") + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; @ApiModelProperty(value = "校准报告附件地址") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingExpertCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingExpertCO.java index 68cfd902..22d92520 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingExpertCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingExpertCO.java @@ -20,7 +20,7 @@ public class QualFilingExpertCO { @ApiModelProperty(value = "账号") private String account; - @ApiModelProperty(value = "性别编码") + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; @ApiModelProperty(value = "性别名称") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingMaterialCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingMaterialCO.java index 527b3822..2908b610 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingMaterialCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingMaterialCO.java @@ -17,7 +17,7 @@ public class QualFilingMaterialCO { @ApiModelProperty(value = "备案ID") private Long filingId; - @ApiModelProperty(value = "材料类型") + @ApiModelProperty(value = "材料类型编码(1申请材料目录2申请书3法人证明4三年内无重大违法失信记录查询证明5法定代表人承诺书6固定资产法定证明材料7工作场所及档案室面积证明8安全评价师专业能力证明9相关负责人证明材料10机构内部管理制度)") private Integer materialType; @ApiModelProperty(value = "材料内容") @@ -29,10 +29,10 @@ public class QualFilingMaterialCO { @ApiModelProperty(value = "排序顺序") private Integer sortOrder; - @ApiModelProperty(value = "是否必需") + @ApiModelProperty(value = "是否必需(1是2否)") private Integer requiredFlag; - @ApiModelProperty(value = "上传状态编码") + @ApiModelProperty(value = "上传状态编码(1待上传2已上传)") private Integer uploadStatusCode; @ApiModelProperty(value = "上传状态名称") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java index 995f8381..50a0b2bd 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java @@ -25,7 +25,7 @@ public class QualFilingPersonnelCO { @ApiModelProperty(value = "人员姓名") private String personName; - @ApiModelProperty(value = "人员类型编码") + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; @ApiModelProperty(value = "人员类型名称") @@ -37,7 +37,7 @@ public class QualFilingPersonnelCO { @ApiModelProperty(value = "职称名称") private String titleName; - @ApiModelProperty(value = "性别编码") + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; @ApiModelProperty(value = "性别名称") @@ -79,7 +79,7 @@ public class QualFilingPersonnelCO { @ApiModelProperty(value = "职业资格等级证书") private String professionalLevelCert; - @ApiModelProperty(value = "是否注册安全工程师") + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; @ApiModelProperty(value = "能力声明") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingReviewCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingReviewCO.java index 843360b2..821f887f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingReviewCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingReviewCO.java @@ -11,13 +11,13 @@ import lombok.Data; @Data public class QualFilingReviewCO { - @ApiModelProperty(value = "主键") + @ApiModelProperty(value = "主键ID") private Long id; @ApiModelProperty(value = "机构id") private Long filingId; - @ApiModelProperty(value = "审核结果 1通过 2待定 3不通过") + @ApiModelProperty(value = "审核结果(1通过2待定3不通过)") private String reviewResult; @ApiModelProperty(value = "审核结果文字描述") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountAddCmd.java index c4892261..40013487 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,21 +11,21 @@ import lombok.Data; @Data public class AccountAddCmd { - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** phone */ + @ApiModelProperty(value = "手机号") private String phone; - /** password */ + @ApiModelProperty(value = "密码") private String password; - /** profileUrl */ + @ApiModelProperty(value = "头像地址") private String profileUrl; - /** type: 1-机构端,2监管端 */ + @ApiModelProperty(value = "类型(1机构端2监管端)") private Integer type; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountModifyCmd.java index 19cec987..15d2ae29 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,24 +11,24 @@ import lombok.Data; @Data public class AccountModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** phone */ + @ApiModelProperty(value = "手机号") private String phone; - /** password（可选，为空时不更新） */ + @ApiModelProperty(value = "密码") private String password; - /** profileUrl */ + @ApiModelProperty(value = "头像地址") private String profileUrl; - /** type: 1-机构端,2监管端 */ + @ApiModelProperty(value = "类型(1机构端2监管端)") private Integer type; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountPageQuery.java index 2e7867ec..801e4476 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AccountPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class AccountPageQuery extends BasePageQuery { - /** 用户名称/姓名 */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** 账号 */ + @ApiModelProperty(value = "账号") private String account; - /** 手机号 */ + @ApiModelProperty(value = "手机号") private String phone; - /** 类型: 1-机构端,2监管端 */ + @ApiModelProperty(value = "类型(1机构端2监管端)") private Integer type; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingCmd.java new file mode 100644 index 00000000..b7d3f241 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingCmd.java @@ -0,0 +1,33 @@ +package org.qinan.safetyeval.client.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.qinan.safetyeval.domain.entity.QualFilingPersonnelCertEntity; + +import java.util.List; + +@Data +public class AggregationSaveOrEditQualFilingCmd { + + @ApiModelProperty(value = "基本信息") + private QualFilingAddCmd qualFilingAddCmd; + + @ApiModelProperty(value = "备案承诺书") + private QualFilingCommitmentAddCmd qualFilingCommitmentAddCmd; + + @ApiModelProperty(value = "备案装备") + private List qualFilingEquipmentAddCmds; + + @ApiModelProperty(value = "备案材料清单") + private List qualFilingMaterialAddCmds; + + @ApiModelProperty(value = "备案人员") + private List qualFilingPersonnelAddCmds; + + @ApiModelProperty(value = "备案人员证书列表") + private List qualFilingPersonnelCertAddCmds; + + + + +} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java index 0673bc52..9a4d094b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,12 +14,12 @@ import lombok.Data; @Data public class BasePageQuery { - /** 当前页（默认1） */ + @ApiModelProperty(value = "当前页（默认1）") private Long current = 1L; - /** 每页条数（默认10） */ + @ApiModelProperty(value = "每页条数（默认10）") private Long size = 10L; - /** 排序（格式: column:asc|desc, 多个用逗号分隔） */ + @ApiModelProperty(value = "排序（格式: column:asc|desc, 多个用逗号分隔）") private String orders; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentAddCmd.java index 4e59b318..92a6e46b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,21 +11,21 @@ import lombok.Data; @Data public class OrgDepartmentAddCmd { - /** parentId */ + @ApiModelProperty(value = "上级部门id，0为根") private Long parentId; - /** deptName */ + @ApiModelProperty(value = "部门名称") private String deptName; - /** managerName */ + @ApiModelProperty(value = "负责人姓名") private String managerName; - /** managerAccount */ + @ApiModelProperty(value = "负责人账号") private String managerAccount; - /** deptLevelCode */ + @ApiModelProperty(value = "部门级别编码") private String deptLevelCode; - /** deptLevelName */ + @ApiModelProperty(value = "部门级别名称") private String deptLevelName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentModifyCmd.java index 4294af15..a09f11f8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,27 +11,27 @@ import lombok.Data; @Data public class OrgDepartmentModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** parentId */ + @ApiModelProperty(value = "上级部门id，0为根") private Long parentId; - /** deptName */ + @ApiModelProperty(value = "部门名称") private String deptName; - /** managerName */ + @ApiModelProperty(value = "负责人姓名") private String managerName; - /** managerAccount */ + @ApiModelProperty(value = "负责人账号") private String managerAccount; - /** deptLevelCode */ + @ApiModelProperty(value = "部门级别编码") private String deptLevelCode; - /** deptLevelName */ + @ApiModelProperty(value = "部门级别名称") private String deptLevelName; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentPageQuery.java index 7101c695..558c9a30 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgDepartmentPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgDepartmentPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 上级部门ID */ + @ApiModelProperty(value = "上级部门id，0为根") private Long parentId; - /** 部门名称 */ + @ApiModelProperty(value = "部门名称") private String deptName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java index 2f24b76d..e1f1fa55 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,51 +12,51 @@ import lombok.Data; @Data public class OrgEquipmentAddCmd { - /** deviceName */ + @ApiModelProperty(value = "设备名称") private String deviceName; - /** deviceModel */ + @ApiModelProperty(value = "设备型号") private String deviceModel; - /** instrumentTypeCode */ + @ApiModelProperty(value = "仪器类型编码") private String instrumentTypeCode; - /** instrumentTypeName */ + @ApiModelProperty(value = "仪器类型名称") private String instrumentTypeName; - /** deviceTypeCode */ + @ApiModelProperty(value = "设备类型编码") private String deviceTypeCode; - /** deviceTypeName */ + @ApiModelProperty(value = "设备类型名称") private String deviceTypeName; - /** manufacturer */ + @ApiModelProperty(value = "厂家") private String manufacturer; - /** flowDesc */ + @ApiModelProperty(value = "设备流量说明") private String flowDesc; - /** minFlow */ + @ApiModelProperty(value = "最小流量") private BigDecimal minFlow; - /** maxFlow */ + @ApiModelProperty(value = "最大流量") private BigDecimal maxFlow; - /** calibrationUnit */ + @ApiModelProperty(value = "校准单位") private String calibrationUnit; - /** calibrationInitValue */ + @ApiModelProperty(value = "校准初始值") private String calibrationInitValue; - /** fieldCalibrationTypeCode */ + @ApiModelProperty(value = "现场校验类型编码") private String fieldCalibrationTypeCode; - /** fieldCalibrationTypeName */ + @ApiModelProperty(value = "现场校验类型名称") private String fieldCalibrationTypeName; - /** dualChannelFlag */ + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; - /** enableFlag */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java index 8b329372..a07d12ec 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,57 +12,57 @@ import lombok.Data; @Data public class OrgEquipmentModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** deviceName */ + @ApiModelProperty(value = "设备名称") private String deviceName; - /** deviceModel */ + @ApiModelProperty(value = "设备型号") private String deviceModel; - /** instrumentTypeCode */ + @ApiModelProperty(value = "仪器类型编码") private String instrumentTypeCode; - /** instrumentTypeName */ + @ApiModelProperty(value = "仪器类型名称") private String instrumentTypeName; - /** deviceTypeCode */ + @ApiModelProperty(value = "设备类型编码") private String deviceTypeCode; - /** deviceTypeName */ + @ApiModelProperty(value = "设备类型名称") private String deviceTypeName; - /** manufacturer */ + @ApiModelProperty(value = "厂家") private String manufacturer; - /** flowDesc */ + @ApiModelProperty(value = "设备流量说明") private String flowDesc; - /** minFlow */ + @ApiModelProperty(value = "最小流量") private BigDecimal minFlow; - /** maxFlow */ + @ApiModelProperty(value = "最大流量") private BigDecimal maxFlow; - /** calibrationUnit */ + @ApiModelProperty(value = "校准单位") private String calibrationUnit; - /** calibrationInitValue */ + @ApiModelProperty(value = "校准初始值") private String calibrationInitValue; - /** fieldCalibrationTypeCode */ + @ApiModelProperty(value = "现场校验类型编码") private String fieldCalibrationTypeCode; - /** fieldCalibrationTypeName */ + @ApiModelProperty(value = "现场校验类型名称") private String fieldCalibrationTypeName; - /** dualChannelFlag */ + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; - /** enableFlag */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java index b4082ca0..279eb1f6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgEquipmentPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,18 +13,18 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgEquipmentPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 设备名称 */ + @ApiModelProperty(value = "设备名称") private String deviceName; - /** 仪器类型（模糊匹配名称或编码） */ + @ApiModelProperty(value = "仪器类型（模糊匹配名称或编码）") private String instrumentType; - /** 设备类型（模糊匹配名称或编码） */ + @ApiModelProperty(value = "设备类型（模糊匹配名称或编码）") private String deviceType; - /** 设备状态 */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Long enableFlag; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java index df8834fe..d5c23911 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; import lombok.Data; @@ -12,129 +13,129 @@ import lombok.Data; @Data public class OrgInfoAddCmd { - /** unitName */ + @ApiModelProperty(value = "生产经营单位名称") private String unitName; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** safetyIndustryCategoryCode */ + @ApiModelProperty(value = "安全生产监管行业类别编码") private String safetyIndustryCategoryCode; - /** safetyIndustryCategoryName */ + @ApiModelProperty(value = "安全生产监管行业类别名称") private String safetyIndustryCategoryName; - /** districtCode */ + @ApiModelProperty(value = "所属县区编码") private String districtCode; - /** districtName */ + @ApiModelProperty(value = "所属县区名称") private String districtName; - /** townStreet */ + @ApiModelProperty(value = "所属镇街道") private String townStreet; - /** villageCommunity */ + @ApiModelProperty(value = "属村社区") private String villageCommunity; - /** longitude */ + @ApiModelProperty(value = "经度") private BigDecimal longitude; - /** latitude */ + @ApiModelProperty(value = "纬度") private BigDecimal latitude; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** businessAddress */ + @ApiModelProperty(value = "经营地址") private String businessAddress; - /** ownershipTypeCode */ + @ApiModelProperty(value = "归属类型编码") private String ownershipTypeCode; - /** ownershipTypeName */ + @ApiModelProperty(value = "归属类型名称") private String ownershipTypeName; - /** legalRepresentative */ + @ApiModelProperty(value = "法定代表人") private String legalRepresentative; - /** legalRepresentativePhone */ + @ApiModelProperty(value = "法定代表人联系电话") private String legalRepresentativePhone; - /** principalName */ + @ApiModelProperty(value = "主要负责人") private String principalName; - /** principalPhone */ + @ApiModelProperty(value = "主要负责人联系电话") private String principalPhone; - /** safetyDeptManager */ + @ApiModelProperty(value = "安全管理部门负责人") private String safetyDeptManager; - /** safetyDeptManagerPhone */ + @ApiModelProperty(value = "安全管理部门负责人联系电话") private String safetyDeptManagerPhone; - /** safetyDeputyPhone */ + @ApiModelProperty(value = "主管安全副总联系电话") private String safetyDeputyPhone; - /** productionDate */ + @ApiModelProperty(value = "投产日期") private LocalDate productionDate; - /** businessStatusCode */ + @ApiModelProperty(value = "企业经营状态编码") private Integer businessStatusCode; - /** businessStatusName */ + @ApiModelProperty(value = "企业经营状态名称") private String businessStatusName; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** economyIndustryCode */ + @ApiModelProperty(value = "国民经济行业分类编码") private String economyIndustryCode; - /** economyIndustryName */ + @ApiModelProperty(value = "国民经济行业分类名称") private String economyIndustryName; - /** authStatusCode */ + @ApiModelProperty(value = "认证状态编码(1填写信息2审核中3通过)") private Integer authStatusCode; - /** authStatusName */ + @ApiModelProperty(value = "认证状态名称") private String authStatusName; - /** enterpriseStatusCode */ + @ApiModelProperty(value = "企业状态编码(1正常2停业3注销)") private Integer enterpriseStatusCode; - /** enterpriseStatusName */ + @ApiModelProperty(value = "企业状态名称") private String enterpriseStatusName; - /** enterpriseScaleCode */ + @ApiModelProperty(value = "企业规模编码") private String enterpriseScaleCode; - /** enterpriseScaleName */ + @ApiModelProperty(value = "企业规模名称(大/中/小/微型)") private String enterpriseScaleName; - /** filingTypeCode */ + @ApiModelProperty(value = "备案类型编码(1审核备案2确认备案)") private String filingTypeCode; - /** filingTypeName */ + @ApiModelProperty(value = "备案类型名称(审核备案/确认备案)") private String filingTypeName; - /** filingRecordStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2未备案)") private Integer filingRecordStatusCode; - /** filingRecordStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingRecordStatusName; - /** attachmentUrls */ + @ApiModelProperty(value = "上传附件地址(多个逗号分隔)") private String attachmentUrls; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java index ee8a3fc5..46ea9a82 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.time.LocalDate; import lombok.Data; @@ -12,135 +13,135 @@ import lombok.Data; @Data public class OrgInfoModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** unitName */ + @ApiModelProperty(value = "生产经营单位名称") private String unitName; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** safetyIndustryCategoryCode */ + @ApiModelProperty(value = "安全生产监管行业类别编码") private String safetyIndustryCategoryCode; - /** safetyIndustryCategoryName */ + @ApiModelProperty(value = "安全生产监管行业类别名称") private String safetyIndustryCategoryName; - /** districtCode */ + @ApiModelProperty(value = "所属县区编码") private String districtCode; - /** districtName */ + @ApiModelProperty(value = "所属县区名称") private String districtName; - /** townStreet */ + @ApiModelProperty(value = "所属镇街道") private String townStreet; - /** villageCommunity */ + @ApiModelProperty(value = "属村社区") private String villageCommunity; - /** longitude */ + @ApiModelProperty(value = "经度") private BigDecimal longitude; - /** latitude */ + @ApiModelProperty(value = "纬度") private BigDecimal latitude; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** businessAddress */ + @ApiModelProperty(value = "经营地址") private String businessAddress; - /** ownershipTypeCode */ + @ApiModelProperty(value = "归属类型编码") private String ownershipTypeCode; - /** ownershipTypeName */ + @ApiModelProperty(value = "归属类型名称") private String ownershipTypeName; - /** legalRepresentative */ + @ApiModelProperty(value = "法定代表人") private String legalRepresentative; - /** legalRepresentativePhone */ + @ApiModelProperty(value = "法定代表人联系电话") private String legalRepresentativePhone; - /** principalName */ + @ApiModelProperty(value = "主要负责人") private String principalName; - /** principalPhone */ + @ApiModelProperty(value = "主要负责人联系电话") private String principalPhone; - /** safetyDeptManager */ + @ApiModelProperty(value = "安全管理部门负责人") private String safetyDeptManager; - /** safetyDeptManagerPhone */ + @ApiModelProperty(value = "安全管理部门负责人联系电话") private String safetyDeptManagerPhone; - /** safetyDeputyPhone */ + @ApiModelProperty(value = "主管安全副总联系电话") private String safetyDeputyPhone; - /** productionDate */ + @ApiModelProperty(value = "投产日期") private LocalDate productionDate; - /** businessStatusCode */ + @ApiModelProperty(value = "企业经营状态编码") private Integer businessStatusCode; - /** businessStatusName */ + @ApiModelProperty(value = "企业经营状态名称") private String businessStatusName; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** economyIndustryCode */ + @ApiModelProperty(value = "国民经济行业分类编码") private String economyIndustryCode; - /** economyIndustryName */ + @ApiModelProperty(value = "国民经济行业分类名称") private String economyIndustryName; - /** authStatusCode */ + @ApiModelProperty(value = "认证状态编码(1填写信息2审核中3通过)") private Integer authStatusCode; - /** authStatusName */ + @ApiModelProperty(value = "认证状态名称") private String authStatusName; - /** enterpriseStatusCode */ + @ApiModelProperty(value = "企业状态编码(1正常2停业3注销)") private Integer enterpriseStatusCode; - /** enterpriseStatusName */ + @ApiModelProperty(value = "企业状态名称") private String enterpriseStatusName; - /** enterpriseScaleCode */ + @ApiModelProperty(value = "企业规模编码") private String enterpriseScaleCode; - /** enterpriseScaleName */ + @ApiModelProperty(value = "企业规模名称(大/中/小/微型)") private String enterpriseScaleName; - /** filingTypeCode */ + @ApiModelProperty(value = "备案类型编码(1审核备案2确认备案)") private String filingTypeCode; - /** filingTypeName */ + @ApiModelProperty(value = "备案类型名称(审核备案/确认备案)") private String filingTypeName; - /** filingRecordStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2未备案)") private Integer filingRecordStatusCode; - /** filingRecordStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingRecordStatusName; - /** attachmentUrls */ + @ApiModelProperty(value = "上传附件地址(多个逗号分隔)") private String attachmentUrls; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoPageQuery.java index f93d3520..29244843 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,38 +15,38 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = true) public class OrgInfoPageQuery extends BasePageQuery { - /** 单位名称 */ + @ApiModelProperty(value = "生产经营单位名称") private String unitName; - /** 信用代码 */ + @ApiModelProperty(value = "统一社会信用代码") private Long creditCode; - /** 认证状态 */ + @ApiModelProperty(value = "认证状态编码(1填写信息2审核中3通过)") private Long authStatusCode; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; - /** 属地名称 */ + @ApiModelProperty(value = "所属县区名称") private String districtName; - /** 状态(0启用1禁用) */ + @ApiModelProperty(value = "状态(0启用1禁用)") private Integer state; - /** 开户时间（创建时间）起 */ + @ApiModelProperty(value = "开户时间（创建时间）起") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeStart; - /** 开户时间（创建时间）止 */ + @ApiModelProperty(value = "开户时间（创建时间）止") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate createTimeEnd; - /** 注册地址（模糊） */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** 备案类型编码(1审核备案2确认备案) */ + @ApiModelProperty(value = "备案类型编码(1审核备案2确认备案)") private String filingTypeCode; - /** 备案状态编码(1已备案2未备案) */ + @ApiModelProperty(value = "备案状态编码(1已备案2未备案)") private Integer filingRecordStatusCode; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoUpdateStateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoUpdateStateCmd.java index 569a85ec..2ed68359 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoUpdateStateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgInfoUpdateStateCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Max; @@ -12,11 +13,11 @@ import javax.validation.constraints.NotNull; @Data public class OrgInfoUpdateStateCmd { - /** 主键ID */ + @ApiModelProperty(value = "主键ID") @NotNull(message = "机构ID不能为空") private Long id; - /** 状态(0启用1禁用) */ + @ApiModelProperty(value = "状态(0启用1禁用)") @NotNull(message = "状态不能为空") @Min(value = 0, message = "状态值无效") @Max(value = 1, message = "状态值无效") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java index 1720c0c2..ba0fb6dd 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,99 +12,99 @@ import lombok.Data; @Data public class OrgPersonnelAddCmd { - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** birthDate */ + @ApiModelProperty(value = "出生日期") private LocalDate birthDate; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** currentAddress */ + @ApiModelProperty(value = "现住地址") private String currentAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** educationCode */ + @ApiModelProperty(value = "学历编码") private String educationCode; - /** educationName */ + @ApiModelProperty(value = "学历名称") private String educationName; - /** graduateSchool */ + @ApiModelProperty(value = "毕业院校") private String graduateSchool; - /** major */ + @ApiModelProperty(value = "专业") private String major; - /** employmentStatusCode */ + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; - /** employmentStatusName */ + @ApiModelProperty(value = "就职状态名称") private String employmentStatusName; - /** personTypeCode */ + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - /** personTypeName */ + @ApiModelProperty(value = "人员类型名称") private String personTypeName; - /** qualScope */ + @ApiModelProperty(value = "资质范围") private String qualScope; - /** professionalLevelCode */ + @ApiModelProperty(value = "职业等级编码") private String professionalLevelCode; - /** professionalLevelName */ + @ApiModelProperty(value = "职业等级名称") private String professionalLevelName; - /** evaluatorCertNo */ + @ApiModelProperty(value = "安全评价师证书编号") private String evaluatorCertNo; - /** educationTypeCode */ + @ApiModelProperty(value = "学历类型编码(全日制/在职教育)") private String educationTypeCode; - /** educationTypeName */ + @ApiModelProperty(value = "学历类型名称") private String educationTypeName; - /** educationLevelCode */ + @ApiModelProperty(value = "学历层次编码(专科/本科/硕士/博士)") private String educationLevelCode; - /** educationLevelName */ + @ApiModelProperty(value = "学历层次名称") private String educationLevelName; - /** titleName */ + @ApiModelProperty(value = "职称") private String titleName; - /** registerEngineerFlag */ + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; - /** publications */ + @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; - /** abilityDeclaration */ + @ApiModelProperty(value = "自我申报的专业能力及认定方式") private String abilityDeclaration; - /** workExperience */ + @ApiModelProperty(value = "主要学习工作经历") private String workExperience; - /** proofMaterialUrl */ + @ApiModelProperty(value = "申报专业能力证明材料地址") private String proofMaterialUrl; - /** deptId */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** postId */ + @ApiModelProperty(value = "岗位id") private Long postId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java index 94ba6eb0..b45cfd4a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,45 +12,45 @@ import lombok.Data; @Data public class OrgPersonnelCertAddCmd { - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certTypeCode */ + @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - /** certTypeName */ + @ApiModelProperty(value = "证书类型名称") private String certTypeName; - /** certCategoryCode */ + @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; - /** certCategoryName */ + @ApiModelProperty(value = "证书类别名称") private String certCategoryName; - /** operationCategoryCode */ + @ApiModelProperty(value = "证书作业类别编码") private String operationCategoryCode; - /** operationCategoryName */ + @ApiModelProperty(value = "证书作业类别名称") private String operationCategoryName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** reviewDate */ + @ApiModelProperty(value = "复核日期") private LocalDate reviewDate; - /** certAttachmentUrl */ + @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; - /** personnelId */ + @ApiModelProperty(value = "人员id") private Long personnelId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java index 0fbb53ff..1b91357b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,51 +12,51 @@ import lombok.Data; @Data public class OrgPersonnelCertModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certTypeCode */ + @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - /** certTypeName */ + @ApiModelProperty(value = "证书类型名称") private String certTypeName; - /** certCategoryCode */ + @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; - /** certCategoryName */ + @ApiModelProperty(value = "证书类别名称") private String certCategoryName; - /** operationCategoryCode */ + @ApiModelProperty(value = "证书作业类别编码") private String operationCategoryCode; - /** operationCategoryName */ + @ApiModelProperty(value = "证书作业类别名称") private String operationCategoryName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** reviewDate */ + @ApiModelProperty(value = "复核日期") private LocalDate reviewDate; - /** certAttachmentUrl */ + @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; - /** personnelId */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java index a4012103..eca2c24f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgPersonnelCertPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 人员ID */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 证书名称 */ + @ApiModelProperty(value = "证照名称") private String certName; - /** 证书类型 */ + @ApiModelProperty(value = "证书类型编码") private Long certTypeCode; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java index bb4c6d57..b386ccd9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; @@ -12,12 +13,12 @@ import lombok.Data; @Data public class OrgPersonnelChangeAddCmd { - /** changeItem */ + @ApiModelProperty(value = "变更事项") private String changeItem; - /** changeTime */ + @ApiModelProperty(value = "变更时间") private LocalDateTime changeTime; - /** operatorName */ + @ApiModelProperty(value = "操作人") private String operatorName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java index 721b9bae..5c531358 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangeModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; @@ -12,18 +13,18 @@ import lombok.Data; @Data public class OrgPersonnelChangeModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** changeItem */ + @ApiModelProperty(value = "变更事项") private String changeItem; - /** changeTime */ + @ApiModelProperty(value = "变更时间") private LocalDateTime changeTime; - /** operatorName */ + @ApiModelProperty(value = "操作人") private String operatorName; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangePageQuery.java index 1e0685bc..c3494f2a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelChangePageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgPersonnelChangePageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 人员ID */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 变更事项 */ + @ApiModelProperty(value = "变更事项") private String changeItem; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java index 9e03fe03..67250b6b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,105 +12,105 @@ import lombok.Data; @Data public class OrgPersonnelModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** birthDate */ + @ApiModelProperty(value = "出生日期") private LocalDate birthDate; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** currentAddress */ + @ApiModelProperty(value = "现住地址") private String currentAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** educationCode */ + @ApiModelProperty(value = "学历编码") private String educationCode; - /** educationName */ + @ApiModelProperty(value = "学历名称") private String educationName; - /** graduateSchool */ + @ApiModelProperty(value = "毕业院校") private String graduateSchool; - /** major */ + @ApiModelProperty(value = "专业") private String major; - /** employmentStatusCode */ + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; - /** employmentStatusName */ + @ApiModelProperty(value = "就职状态名称") private String employmentStatusName; - /** personTypeCode */ + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - /** personTypeName */ + @ApiModelProperty(value = "人员类型名称") private String personTypeName; - /** qualScope */ + @ApiModelProperty(value = "资质范围") private String qualScope; - /** professionalLevelCode */ + @ApiModelProperty(value = "职业等级编码") private String professionalLevelCode; - /** professionalLevelName */ + @ApiModelProperty(value = "职业等级名称") private String professionalLevelName; - /** evaluatorCertNo */ + @ApiModelProperty(value = "安全评价师证书编号") private String evaluatorCertNo; - /** educationTypeCode */ + @ApiModelProperty(value = "学历类型编码(全日制/在职教育)") private String educationTypeCode; - /** educationTypeName */ + @ApiModelProperty(value = "学历类型名称") private String educationTypeName; - /** educationLevelCode */ + @ApiModelProperty(value = "学历层次编码(专科/本科/硕士/博士)") private String educationLevelCode; - /** educationLevelName */ + @ApiModelProperty(value = "学历层次名称") private String educationLevelName; - /** titleName */ + @ApiModelProperty(value = "职称") private String titleName; - /** registerEngineerFlag */ + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; - /** publications */ + @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; - /** abilityDeclaration */ + @ApiModelProperty(value = "自我申报的专业能力及认定方式") private String abilityDeclaration; - /** workExperience */ + @ApiModelProperty(value = "主要学习工作经历") private String workExperience; - /** proofMaterialUrl */ + @ApiModelProperty(value = "申报专业能力证明材料地址") private String proofMaterialUrl; - /** deptId */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** postId */ + @ApiModelProperty(value = "岗位id") private Long postId; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelPageQuery.java index 58e95951..b872db6c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,24 +13,24 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgPersonnelPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 部门ID */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** 岗位ID */ + @ApiModelProperty(value = "岗位id") private Long postId; - /** 姓名 */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** 账号（模糊） */ + @ApiModelProperty(value = "账号") private String account; - /** 就职状态编码 */ + @ApiModelProperty(value = "就职状态编码(1在职2离职)") private Integer employmentStatusCode; - /** 离职申请审核状态（0未审核 1已审核 2已退回） */ + @ApiModelProperty(value = "离职申请审核状态（列表展示，非持久化）") private Integer resignAuditStatus; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionAddCmd.java index cf117e5e..4fb60233 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,15 +11,15 @@ import lombok.Data; @Data public class OrgPositionAddCmd { - /** positionName */ + @ApiModelProperty(value = "职务") private String positionName; - /** dutyDesc */ + @ApiModelProperty(value = "岗位职责") private String dutyDesc; - /** deptId */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionModifyCmd.java index 8a42d94d..033ea8b6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,21 +11,21 @@ import lombok.Data; @Data public class OrgPositionModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** positionName */ + @ApiModelProperty(value = "职务") private String positionName; - /** dutyDesc */ + @ApiModelProperty(value = "岗位职责") private String dutyDesc; - /** deptId */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** 备注 */ + @ApiModelProperty(value = "备注") private String remark; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionPageQuery.java index 6e4a5b9f..38420d23 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPositionPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgPositionPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 部门ID */ + @ApiModelProperty(value = "部门id") private Long deptId; - /** 岗位名称 */ + @ApiModelProperty(value = "职务") private String positionName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationAddCmd.java index f120673e..9e2446a4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,36 +12,36 @@ import lombok.Data; @Data public class OrgQualificationAddCmd { - /** licenseTypeCode */ + @ApiModelProperty(value = "证照类型编码") private String licenseTypeCode; - /** licenseTypeName */ + @ApiModelProperty(value = "证照类型名称") private String licenseTypeName; - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueDate */ + @ApiModelProperty(value = "发证日期") private LocalDate issueDate; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** certImageUrl */ + @ApiModelProperty(value = "证书图片地址") private String certImageUrl; - /** enableFlag */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; - /** 备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationModifyCmd.java index e8b169cf..655316ef 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,42 +12,42 @@ import lombok.Data; @Data public class OrgQualificationModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** licenseTypeCode */ + @ApiModelProperty(value = "证照类型编码") private String licenseTypeCode; - /** licenseTypeName */ + @ApiModelProperty(value = "证照类型名称") private String licenseTypeName; - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueDate */ + @ApiModelProperty(value = "发证日期") private LocalDate issueDate; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** certImageUrl */ + @ApiModelProperty(value = "证书图片地址") private String certImageUrl; - /** enableFlag */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Integer enableFlag; - /** 备注 */ + @ApiModelProperty(value = "备注") private String remark; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationPageQuery.java index ca73322e..ac62b63d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgQualificationPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgQualificationPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 证书名称 */ + @ApiModelProperty(value = "证照名称") private String certName; - /** 证书编号 */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** 启用标识 */ + @ApiModelProperty(value = "启用标识(1启用2禁用)") private Long enableFlag; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java index 98122801..2728670f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; @@ -12,33 +13,33 @@ import lombok.Data; @Data public class OrgResignApplyAddCmd { - /** applicantName */ + @ApiModelProperty(value = "申请人") private String applicantName; - /** applyTime */ + @ApiModelProperty(value = "申请时间") private LocalDateTime applyTime; - /** resignReason */ + @ApiModelProperty(value = "离职原因") private String resignReason; - /** expectedResignDate */ + @ApiModelProperty(value = "预计离职日期") private LocalDate expectedResignDate; - /** reportFileUrl */ + @ApiModelProperty(value = "离职通知报告附件地址") private String reportFileUrl; - /** auditStatusCode */ + @ApiModelProperty(value = "离职申请审核状态编码(0未审核1已审核)") private Integer auditStatusCode; - /** auditStatusName */ + @ApiModelProperty(value = "离职申请审核状态名称") private String auditStatusName; - /** rejectReason */ + @ApiModelProperty(value = "打回原因") private String rejectReason; - /** personnelId */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 申请备注 */ + @ApiModelProperty(value = "备注") private String remark; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java index daab3afb..b8460ee9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import java.time.LocalDateTime; import lombok.Data; @@ -12,39 +13,39 @@ import lombok.Data; @Data public class OrgResignApplyModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** applicantName */ + @ApiModelProperty(value = "申请人") private String applicantName; - /** applyTime */ + @ApiModelProperty(value = "申请时间") private LocalDateTime applyTime; - /** resignReason */ + @ApiModelProperty(value = "离职原因") private String resignReason; - /** expectedResignDate */ + @ApiModelProperty(value = "预计离职日期") private LocalDate expectedResignDate; - /** reportFileUrl */ + @ApiModelProperty(value = "离职通知报告附件地址") private String reportFileUrl; - /** auditStatusCode */ + @ApiModelProperty(value = "离职申请审核状态编码(0未审核1已审核)") private Integer auditStatusCode; - /** auditStatusName */ + @ApiModelProperty(value = "离职申请审核状态名称") private String auditStatusName; - /** rejectReason */ + @ApiModelProperty(value = "打回原因") private String rejectReason; - /** 申请备注 */ + @ApiModelProperty(value = "备注") private String remark; - /** personnelId */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyPageQuery.java index e23078cf..ff44cfbe 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgResignApplyPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class OrgResignApplyPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 人员ID */ + @ApiModelProperty(value = "人员id") private Long personnelId; - /** 审核状态 */ + @ApiModelProperty(value = "离职申请审核状态编码(0未审核1已审核)") private Integer auditStatusCode; - /** 申请人姓名（模糊） */ + @ApiModelProperty(value = "申请人") private String applicantName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java index 953d6f6b..8d7862cf 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,81 +12,84 @@ import lombok.Data; @Data public class QualFilingAddCmd { - /** filingTerritoryCode */ + @ApiModelProperty(value = "主键id,为空新增") + private Long id; + + @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; - /** filingTerritoryName */ + @ApiModelProperty(value = "备案属地名称") private String filingTerritoryName; - /** filingUnitName */ + @ApiModelProperty(value = "备案单位") private String filingUnitName; - /** filingUnitTypeCode */ + @ApiModelProperty(value = "备案单位类型编码1-本地,2外地") private String filingUnitTypeCode; - /** filingUnitTypeName */ + @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - /** filingNo */ + @ApiModelProperty(value = "备案编号-暂时使用id") private String filingNo; - /** businessScope */ + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** qualCertNo */ + @ApiModelProperty(value = "资质证书编号") private String qualCertNo; - /** legalPersonPhone */ + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; - /** contactPhone */ + @ApiModelProperty(value = "联系人及电话") private String contactPhone; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** fixedAssetAmount */ + @ApiModelProperty(value = "固定资产总值(单位:分)") private Long fixedAssetAmount; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** unitIntro */ + @ApiModelProperty(value = "单位基本情况介绍") private String unitIntro; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** 审核id */ + @ApiModelProperty(value = "审核id") private Long filingReviewId; - /** filingStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; - /** filingStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingStatusName; - /** applyTypeCode */ + @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿3已备案资质填报-暂时不用)") private Integer applyTypeCode; - /** applyTypeName */ + @ApiModelProperty(value = "申请类型名称") private String applyTypeName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAttachmentUploadCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAttachmentUploadCmd.java index bfba6038..62b6740f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAttachmentUploadCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingAttachmentUploadCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,7 +9,9 @@ import lombok.Data; @Data public class QualFilingAttachmentUploadCmd { + @ApiModelProperty(value = "主键ID") private Long id; + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java index 40b8c3d9..7eaef703 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,75 +12,75 @@ import lombok.Data; @Data public class QualFilingChangeAddCmd { - /** originFilingId */ + @ApiModelProperty(value = "原备案申请id") private Long originFilingId; - /** filingTerritoryCode */ + @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; - /** filingTerritoryName */ + @ApiModelProperty(value = "备案属地名称") private String filingTerritoryName; - /** filingUnitName */ + @ApiModelProperty(value = "备案单位") private String filingUnitName; - /** filingUnitTypeCode */ + @ApiModelProperty(value = "备案单位类型编码") private String filingUnitTypeCode; - /** filingUnitTypeName */ + @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - /** filingNo */ + @ApiModelProperty(value = "备案编号") private String filingNo; - /** businessScope */ + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** qualCertNo */ + @ApiModelProperty(value = "资质证书编号") private String qualCertNo; - /** legalPersonPhone */ + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; - /** contactPhone */ + @ApiModelProperty(value = "联系人及电话") private String contactPhone; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** fixedAssetAmount */ + @ApiModelProperty(value = "固定资产总值(单位:分)") private Long fixedAssetAmount; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** unitIntro */ + @ApiModelProperty(value = "单位基本情况介绍") private String unitIntro; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** filingStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; - /** filingStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingStatusName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailAddCmd.java index 70309c19..0f35ef8d 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,9 +11,9 @@ import lombok.Data; @Data public class QualFilingChangeDetailAddCmd { - /** changeField */ + @ApiModelProperty(value = "变更字段") private String changeField; - /** changeContent */ + @ApiModelProperty(value = "变更内容摘要") private String changeContent; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailModifyCmd.java index 228225d2..26ec2ae3 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,15 +11,15 @@ import lombok.Data; @Data public class QualFilingChangeDetailModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** changeField */ + @ApiModelProperty(value = "变更字段") private String changeField; - /** changeContent */ + @ApiModelProperty(value = "变更内容摘要") private String changeContent; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailPageQuery.java index 6945f731..42ebf072 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeDetailPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +13,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingChangeDetailPageQuery extends BasePageQuery { - /** 变更ID */ + @ApiModelProperty(value = "备案变更id") private Long changeId; - /** 变更字段 */ + @ApiModelProperty(value = "变更字段") private String changeField; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java index 4f984d65..b6644599 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,81 +12,81 @@ import lombok.Data; @Data public class QualFilingChangeModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** originFilingId */ + @ApiModelProperty(value = "原备案申请id") private Long originFilingId; - /** filingTerritoryCode */ + @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; - /** filingTerritoryName */ + @ApiModelProperty(value = "备案属地名称") private String filingTerritoryName; - /** filingUnitName */ + @ApiModelProperty(value = "备案单位") private String filingUnitName; - /** filingUnitTypeCode */ + @ApiModelProperty(value = "备案单位类型编码") private String filingUnitTypeCode; - /** filingUnitTypeName */ + @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - /** filingNo */ + @ApiModelProperty(value = "备案编号") private String filingNo; - /** businessScope */ + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** qualCertNo */ + @ApiModelProperty(value = "资质证书编号") private String qualCertNo; - /** legalPersonPhone */ + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; - /** contactPhone */ + @ApiModelProperty(value = "联系人及电话") private String contactPhone; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** fixedAssetAmount */ + @ApiModelProperty(value = "固定资产总值(单位:分)") private Long fixedAssetAmount; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** unitIntro */ + @ApiModelProperty(value = "单位基本情况介绍") private String unitIntro; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** filingStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; - /** filingStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingStatusName; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } 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 70f0ce25..d51e4775 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 @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingChangePageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 原备案ID */ + @ApiModelProperty(value = "原备案申请id") private Long originFilingId; - /** 备案编号 */ + @ApiModelProperty(value = "备案编号") private String filingNo; - /** 备案状态 */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Long filingStatusCode; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeSubmitCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeSubmitCmd.java index 6a3299e7..9b6f8327 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeSubmitCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeSubmitCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,5 +9,6 @@ import lombok.Data; @Data public class QualFilingChangeSubmitCmd { + @ApiModelProperty(value = "变更草稿备案id") private Long draftFilingId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentAddCmd.java index b282cc42..0c078382 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,18 +12,18 @@ import lombok.Data; @Data public class QualFilingCommitmentAddCmd { - /** commitmentContent */ + @ApiModelProperty(value = "承诺内容") private String commitmentContent; - /** legalRepSignatureUrl */ + @ApiModelProperty(value = "法定代表人签名图片地址") private String legalRepSignatureUrl; - /** signDate */ + @ApiModelProperty(value = "签署日期") private LocalDate signDate; - /** 法定代表人机构人员id */ + @ApiModelProperty(value = "法定代表人机构人员id") private Long legalRepPersonnelId; - /** 法定代表人姓名 */ + @ApiModelProperty(value = "法定代表人姓名") private String legalRepName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentModifyCmd.java index 17d9da66..bebf62f2 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,27 +12,27 @@ import lombok.Data; @Data public class QualFilingCommitmentModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** filingId */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** commitmentContent */ + @ApiModelProperty(value = "承诺内容") private String commitmentContent; - /** legalRepSignatureUrl */ + @ApiModelProperty(value = "法定代表人签名图片地址") private String legalRepSignatureUrl; - /** signDate */ + @ApiModelProperty(value = "签署日期") private LocalDate signDate; - /** 法定代表人机构人员id */ + @ApiModelProperty(value = "法定代表人机构人员id") private Long legalRepPersonnelId; - /** 法定代表人姓名 */ + @ApiModelProperty(value = "法定代表人姓名") private String legalRepName; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentPageQuery.java index 134280db..04bcd8ec 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingCommitmentPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingCommitmentPageQuery extends BasePageQuery { - /** 备案ID */ + @ApiModelProperty(value = "备案申请id") private Long filingId; } 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 d4baf1b6..1d2f157e 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 @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,48 +12,54 @@ import lombok.Data; @Data public class QualFilingEquipmentAddCmd { - /** deviceName */ + @ApiModelProperty(value = "设备名称") private String deviceName; - /** deviceModel */ + @ApiModelProperty(value = "设备型号") private String deviceModel; - /** instrumentTypeCode */ + @ApiModelProperty(value = "仪器类型编码") private String instrumentTypeCode; - /** instrumentTypeName */ + @ApiModelProperty(value = "仪器类型名称") private String instrumentTypeName; - /** deviceTypeCode */ + @ApiModelProperty(value = "设备类型编码") private String deviceTypeCode; - /** deviceTypeName */ + @ApiModelProperty(value = "设备类型名称") private String deviceTypeName; - /** manufacturer */ + @ApiModelProperty(value = "厂家") private String manufacturer; - /** flowDesc */ + @ApiModelProperty(value = "设备流量说明") private String flowDesc; - /** minFlow */ + @ApiModelProperty(value = "最小流量") private BigDecimal minFlow; - /** maxFlow */ + @ApiModelProperty(value = "最大流量") private BigDecimal maxFlow; - /** calibrationUnit */ + @ApiModelProperty(value = "校准单位") private String calibrationUnit; - /** calibrationInitValue */ + @ApiModelProperty(value = "校准初始值") private String calibrationInitValue; - /** fieldCalibrationTypeCode */ + @ApiModelProperty(value = "现场校验类型编码") private String fieldCalibrationTypeCode; - /** fieldCalibrationTypeName */ + @ApiModelProperty(value = "现场校验类型名称") private String fieldCalibrationTypeName; - /** dualChannelFlag */ + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; + + @ApiModelProperty(value = "来源设备ID") + private Long sourceEquipmentId; + + @ApiModelProperty(value = "校准报告URL") + private String calibrationReportUrl; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentBatchAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentBatchAddCmd.java index f947c8c4..ae95e6ee 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentBatchAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentBatchAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -10,7 +11,9 @@ import java.util.List; @Data public class QualFilingEquipmentBatchAddCmd { + @ApiModelProperty(value = "备案申请id") private Long filingId; + @ApiModelProperty(value = "来源装备id列表") private List sourceEquipmentIds; } 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 e4943e64..050a113d 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 @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,54 +12,54 @@ import lombok.Data; @Data public class QualFilingEquipmentModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** deviceName */ + @ApiModelProperty(value = "设备名称") private String deviceName; - /** deviceModel */ + @ApiModelProperty(value = "设备型号") private String deviceModel; - /** instrumentTypeCode */ + @ApiModelProperty(value = "仪器类型编码") private String instrumentTypeCode; - /** instrumentTypeName */ + @ApiModelProperty(value = "仪器类型名称") private String instrumentTypeName; - /** deviceTypeCode */ + @ApiModelProperty(value = "设备类型编码") private String deviceTypeCode; - /** deviceTypeName */ + @ApiModelProperty(value = "设备类型名称") private String deviceTypeName; - /** manufacturer */ + @ApiModelProperty(value = "厂家") private String manufacturer; - /** flowDesc */ + @ApiModelProperty(value = "设备流量说明") private String flowDesc; - /** minFlow */ + @ApiModelProperty(value = "最小流量") private BigDecimal minFlow; - /** maxFlow */ + @ApiModelProperty(value = "最大流量") private BigDecimal maxFlow; - /** calibrationUnit */ + @ApiModelProperty(value = "校准单位") private String calibrationUnit; - /** calibrationInitValue */ + @ApiModelProperty(value = "校准初始值") private String calibrationInitValue; - /** fieldCalibrationTypeCode */ + @ApiModelProperty(value = "现场校验类型编码") private String fieldCalibrationTypeCode; - /** fieldCalibrationTypeName */ + @ApiModelProperty(value = "现场校验类型名称") private String fieldCalibrationTypeName; - /** dualChannelFlag */ + @ApiModelProperty(value = "是否双路(1是2否)") private Integer dualChannelFlag; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentPageQuery.java index 17a21625..a0800c75 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingEquipmentPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +13,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingEquipmentPageQuery extends BasePageQuery { - /** 备案ID */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 设备名称 */ + @ApiModelProperty(value = "设备名称") private String deviceName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertAddCmd.java index a2403dc8..93561254 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,21 +11,21 @@ import lombok.Data; @Data public class QualFilingExpertAddCmd { - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** certificate */ + @ApiModelProperty(value = "证书") private String certificate; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertModifyCmd.java index 7d4a2c59..b9ffb282 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,24 +11,24 @@ import lombok.Data; @Data public class QualFilingExpertModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** userName */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** account */ + @ApiModelProperty(value = "账号") private String account; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** certificate */ + @ApiModelProperty(value = "证书") private String certificate; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertPageQuery.java index 5b505975..135313cb 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingExpertPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,15 +13,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingExpertPageQuery extends BasePageQuery { - /** 用户名称/姓名 */ + @ApiModelProperty(value = "用户名称/姓名") private String userName; - /** 账号 */ + @ApiModelProperty(value = "账号") private String account; - /** 性别编码 */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** 身份证号 */ + @ApiModelProperty(value = "身份证号") private String idCardNo; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialAddCmd.java index ee837882..5e04c976 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,18 +11,33 @@ import lombok.Data; @Data public class QualFilingMaterialAddCmd { - /** materialType */ + @ApiModelProperty(value = "材料类型编码(1申请材料目录2申请书3法人证明4三年内无重大违法失信记录查询证明5法定代表人承诺书6固定资产法定证明材料7工作场所及档案室面积证明8安全评价师专业能力证明9相关负责人证明材料10机构内部管理制度)") private Integer materialType; - /** materialContent */ + @ApiModelProperty(value = "材料内容") private String materialContent; - /** materialFormat */ + @ApiModelProperty(value = "材料格式") private String materialFormat; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** materialRemark */ + @ApiModelProperty(value = "注释") private String materialRemark; + + @ApiModelProperty(value = "排序") + private Integer sortOrder; + + @ApiModelProperty(value = "是否必填") + private Integer requiredFlag; + + @ApiModelProperty(value = "上传状态") + private Integer uploadStatusCode; + + @ApiModelProperty(value = "上传状态名称") + private String uploadStatusName; + + @ApiModelProperty(value = "附件描述") + private String attachmentDesc; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialModifyCmd.java index c449954a..fd6fe64f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,24 +11,24 @@ import lombok.Data; @Data public class QualFilingMaterialModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** materialType */ + @ApiModelProperty(value = "材料类型编码(1申请材料目录2申请书3法人证明4三年内无重大违法失信记录查询证明5法定代表人承诺书6固定资产法定证明材料7工作场所及档案室面积证明8安全评价师专业能力证明9相关负责人证明材料10机构内部管理制度)") private Integer materialType; - /** materialContent */ + @ApiModelProperty(value = "材料内容") private String materialContent; - /** materialFormat */ + @ApiModelProperty(value = "材料格式") private String materialFormat; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** materialRemark */ + @ApiModelProperty(value = "注释") private String materialRemark; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialPageQuery.java index 059b8d30..f2a1e175 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingMaterialPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingMaterialPageQuery extends BasePageQuery { - /** 备案ID */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 材料类型 */ + @ApiModelProperty(value = "材料类型编码(1申请材料目录2申请书3法人证明4三年内无重大违法失信记录查询证明5法定代表人承诺书6固定资产法定证明材料7工作场所及档案室面积证明8安全评价师专业能力证明9相关负责人证明材料10机构内部管理制度)") private Integer materialType; - /** 材料内容 */ + @ApiModelProperty(value = "材料内容") private String materialContent; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java index fdbfcf84..fc3c07ae 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import lombok.Data; @@ -11,87 +12,87 @@ import lombok.Data; @Data public class QualFilingModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** filingTerritoryCode */ + @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; - /** filingTerritoryName */ + @ApiModelProperty(value = "备案属地名称") private String filingTerritoryName; - /** filingUnitName */ + @ApiModelProperty(value = "备案单位") private String filingUnitName; - /** filingUnitTypeCode */ + @ApiModelProperty(value = "备案单位类型编码") private String filingUnitTypeCode; - /** filingUnitTypeName */ + @ApiModelProperty(value = "备案单位类型名称") private String filingUnitTypeName; - /** filingNo */ + @ApiModelProperty(value = "备案编号") private String filingNo; - /** businessScope */ + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; - /** registerAddress */ + @ApiModelProperty(value = "注册地址") private String registerAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** creditCode */ + @ApiModelProperty(value = "统一社会信用代码") private String creditCode; - /** qualCertNo */ + @ApiModelProperty(value = "资质证书编号") private String qualCertNo; - /** legalPersonPhone */ + @ApiModelProperty(value = "法人代表及电话") private String legalPersonPhone; - /** contactPhone */ + @ApiModelProperty(value = "联系人及电话") private String contactPhone; - /** infoDisclosureUrl */ + @ApiModelProperty(value = "信息公开网址") private String infoDisclosureUrl; - /** fixedAssetAmount */ + @ApiModelProperty(value = "固定资产总值(单位:分)") private Long fixedAssetAmount; - /** archiveRoomArea */ + @ApiModelProperty(value = "档案室面积(平方米)") private BigDecimal archiveRoomArea; - /** fulltimeEvaluatorCount */ + @ApiModelProperty(value = "专职安全评价师数量") private Integer fulltimeEvaluatorCount; - /** registeredEngineerCount */ + @ApiModelProperty(value = "注册安全工程师数量") private Integer registeredEngineerCount; - /** workplaceArea */ + @ApiModelProperty(value = "工作场所建筑面积(平方米)") private BigDecimal workplaceArea; - /** unitIntro */ + @ApiModelProperty(value = "单位基本情况介绍") private String unitIntro; - /** attachmentUrl */ + @ApiModelProperty(value = "上传附件地址") private String attachmentUrl; - /** 审核id */ + @ApiModelProperty(value = "审核id") private Long filingReviewId; - /** filingStatusCode */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; - /** filingStatusName */ + @ApiModelProperty(value = "备案状态名称") private String filingStatusName; - /** applyTypeCode */ + @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿3已备案资质填报)") private Integer applyTypeCode; - /** applyTypeName */ + @ApiModelProperty(value = "申请类型名称") private String applyTypeName; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java index 361f17ec..d36cdee8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.util.List; import lombok.Data; @@ -14,27 +15,24 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingPageQuery extends BasePageQuery { - /** 机构ID */ + @ApiModelProperty(value = "单位id") private Long orgId; - /** 备案编号 */ + @ApiModelProperty(value = "备案编号") private String filingNo; - /** 备案单位 */ + @ApiModelProperty(value = "备案单位") private String filingUnitName; - /** 备案状态 */ + @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)") private Integer filingStatusCode; - /** 备案状态多选 */ - private List filingStatusCodes; - - /** 申请类型 */ + @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿)") private Integer applyTypeCode; - /** 备案属地编码 */ + @ApiModelProperty(value = "备案属地编码") private String filingTerritoryCode; - /** 分页场景：change=备案变更列表 */ - private String scene; + @ApiModelProperty(value = "是否为监管端查询,true-false") + private Boolean supervision = false; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java index 48949177..d837ba64 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,72 +12,75 @@ import lombok.Data; @Data public class QualFilingPersonnelAddCmd { - /** personName */ + @ApiModelProperty(value = "人员姓名") private String personName; - /** personTypeCode */ + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - /** personTypeName */ + @ApiModelProperty(value = "人员类型名称") private String personTypeName; - /** positionName */ + @ApiModelProperty(value = "职务") private String positionName; - /** titleName */ + @ApiModelProperty(value = "职称") private String titleName; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** birthDate */ + @ApiModelProperty(value = "出生日期") private LocalDate birthDate; - /** 参加工作时间 */ + @ApiModelProperty(value = "参加工作时间") private LocalDate joinWorkDate; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** currentAddress */ + @ApiModelProperty(value = "现住地址") private String currentAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** educationCode */ + @ApiModelProperty(value = "学历编码") private String educationCode; - /** educationName */ + @ApiModelProperty(value = "学历名称") private String educationName; - /** graduateSchool */ + @ApiModelProperty(value = "毕业院校") private String graduateSchool; - /** major */ + @ApiModelProperty(value = "专业") private String major; - /** qualScope */ + @ApiModelProperty(value = "资质范围") private String qualScope; - /** publications */ + @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; - /** professionalLevelCert */ + @ApiModelProperty(value = "职业等级及证书编号") private String professionalLevelCert; - /** registerEngineerFlag */ + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; - /** abilityDeclaration */ + @ApiModelProperty(value = "自我申报的专业能力及认定方式") private String abilityDeclaration; - /** workExperience */ + @ApiModelProperty(value = "主要学习工作经历") private String workExperience; - /** proofMaterialUrl */ + @ApiModelProperty(value = "申报专业能力证明材料地址") private String proofMaterialUrl; + + @ApiModelProperty(value = "来源人员id") + private Long sourcePersonnelId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelBatchAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelBatchAddCmd.java index 822a5e2f..40e4211a 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelBatchAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelBatchAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -10,7 +11,9 @@ import java.util.List; @Data public class QualFilingPersonnelBatchAddCmd { + @ApiModelProperty(value = "备案申请id") private Long filingId; + @ApiModelProperty(value = "来源人员id列表") private List sourcePersonnelIds; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java index e0ca5a65..44717c8f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,42 +12,48 @@ import lombok.Data; @Data public class QualFilingPersonnelCertAddCmd { - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certTypeCode */ + @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - /** certTypeName */ + @ApiModelProperty(value = "证书类型名称") private String certTypeName; - /** certCategoryCode */ + @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; - /** certCategoryName */ + @ApiModelProperty(value = "证书类别名称") private String certCategoryName; - /** operationCategoryCode */ + @ApiModelProperty(value = "证书作业类别编码") private String operationCategoryCode; - /** operationCategoryName */ + @ApiModelProperty(value = "证书作业类别名称") private String operationCategoryName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** reviewDate */ + @ApiModelProperty(value = "复核日期") private LocalDate reviewDate; - /** certAttachmentUrl */ + @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + + @ApiModelProperty(value = "来源证件ID") + private Long sourceCertId; + + @ApiModelProperty(value = "备案人员ID") + private Long filingPersonnelId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java index 08ec986f..f5cf96dc 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,48 +12,48 @@ import lombok.Data; @Data public class QualFilingPersonnelCertModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** certName */ + @ApiModelProperty(value = "证照名称") private String certName; - /** certTypeCode */ + @ApiModelProperty(value = "证书类型编码") private String certTypeCode; - /** certTypeName */ + @ApiModelProperty(value = "证书类型名称") private String certTypeName; - /** certCategoryCode */ + @ApiModelProperty(value = "证书类别编码") private String certCategoryCode; - /** certCategoryName */ + @ApiModelProperty(value = "证书类别名称") private String certCategoryName; - /** operationCategoryCode */ + @ApiModelProperty(value = "证书作业类别编码") private String operationCategoryCode; - /** operationCategoryName */ + @ApiModelProperty(value = "证书作业类别名称") private String operationCategoryName; - /** certNo */ + @ApiModelProperty(value = "证书编号") private String certNo; - /** issueOrg */ + @ApiModelProperty(value = "发证机关") private String issueOrg; - /** validStartDate */ + @ApiModelProperty(value = "证书有效开始日期") private LocalDate validStartDate; - /** validEndDate */ + @ApiModelProperty(value = "证书有效结束日期") private LocalDate validEndDate; - /** reviewDate */ + @ApiModelProperty(value = "复核日期") private LocalDate reviewDate; - /** certAttachmentUrl */ + @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java index 43d72bb3..f726dfde 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingPersonnelCertPageQuery extends BasePageQuery { - /** 备案ID */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 人员ID */ + @ApiModelProperty(value = "备案人员id") private Long filingPersonnelId; - /** 证书名称 */ + @ApiModelProperty(value = "证照名称") private String certName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java index 93c1c426..4ac8bff4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import java.time.LocalDate; import lombok.Data; @@ -11,78 +12,78 @@ import lombok.Data; @Data public class QualFilingPersonnelModifyCmd { - /** 主键ID（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** personName */ + @ApiModelProperty(value = "人员姓名") private String personName; - /** personTypeCode */ + @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - /** personTypeName */ + @ApiModelProperty(value = "人员类型名称") private String personTypeName; - /** positionName */ + @ApiModelProperty(value = "职务") private String positionName; - /** titleName */ + @ApiModelProperty(value = "职称") private String titleName; - /** genderCode */ + @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; - /** genderName */ + @ApiModelProperty(value = "性别名称") private String genderName; - /** birthDate */ + @ApiModelProperty(value = "出生日期") private LocalDate birthDate; - /** 参加工作时间 */ + @ApiModelProperty(value = "参加工作时间") private LocalDate joinWorkDate; - /** idCardNo */ + @ApiModelProperty(value = "身份证号") private String idCardNo; - /** currentAddress */ + @ApiModelProperty(value = "现住地址") private String currentAddress; - /** officeAddress */ + @ApiModelProperty(value = "办公地址") private String officeAddress; - /** educationCode */ + @ApiModelProperty(value = "学历编码") private String educationCode; - /** educationName */ + @ApiModelProperty(value = "学历名称") private String educationName; - /** graduateSchool */ + @ApiModelProperty(value = "毕业院校") private String graduateSchool; - /** major */ + @ApiModelProperty(value = "专业") private String major; - /** qualScope */ + @ApiModelProperty(value = "资质范围") private String qualScope; - /** publications */ + @ApiModelProperty(value = "出版学术专著专利获奖论文等") private String publications; - /** professionalLevelCert */ + @ApiModelProperty(value = "职业等级及证书编号") private String professionalLevelCert; - /** registerEngineerFlag */ + @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; - /** abilityDeclaration */ + @ApiModelProperty(value = "自我申报的专业能力及认定方式") private String abilityDeclaration; - /** workExperience */ + @ApiModelProperty(value = "主要学习工作经历") private String workExperience; - /** proofMaterialUrl */ + @ApiModelProperty(value = "申报专业能力证明材料地址") private String proofMaterialUrl; - /** 租户ID */ + @ApiModelProperty(value = "租户id") private Long tenantId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelPageQuery.java index ed83cbf7..c36a8d0c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,9 +13,9 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingPersonnelPageQuery extends BasePageQuery { - /** 备案ID */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 姓名 */ + @ApiModelProperty(value = "人员姓名") private String personName; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingRejectCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingRejectCmd.java index 3674f982..674387e5 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingRejectCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingRejectCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -8,7 +9,9 @@ import lombok.Data; @Data public class QualFilingRejectCmd { + @ApiModelProperty(value = "主键ID") private Long id; + @ApiModelProperty(value = "打回原因") private String rejectReason; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewAddCmd.java index e4e3dd57..8e7b0215 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewAddCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,21 +11,21 @@ import lombok.Data; @Data public class QualFilingReviewAddCmd { - /** 机构id */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 审核结果 1通过 2待定 3不通过 */ + @ApiModelProperty(value = "审核结果(1通过2待定3不通过)") private String reviewResult; - /** 审核结果文字描述 */ + @ApiModelProperty(value = "审核结果文字描述") private String reviewResultRemark; - /** 专家id */ + @ApiModelProperty(value = "专家id") private Long filingExpertId; - /** 专家名称 */ + @ApiModelProperty(value = "专家名称") private String filingExpertName; - /** 综合审核意见 */ + @ApiModelProperty(value = "综合审核意见") private String reviewOpinion; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewModifyCmd.java index 9c54ac1b..67779769 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewModifyCmd.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,24 +11,24 @@ import lombok.Data; @Data public class QualFilingReviewModifyCmd { - /** 主键（必填） */ + @ApiModelProperty(value = "主键ID") private Long id; - /** 机构id */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 审核结果 1通过 2待定 3不通过 */ + @ApiModelProperty(value = "审核结果(1通过2待定3不通过)") private String reviewResult; - /** 审核结果文字描述 */ + @ApiModelProperty(value = "审核结果文字描述") private String reviewResultRemark; - /** 专家id */ + @ApiModelProperty(value = "专家id") private Long filingExpertId; - /** 专家名称 */ + @ApiModelProperty(value = "专家名称") private String filingExpertName; - /** 综合审核意见 */ + @ApiModelProperty(value = "综合审核意见") private String reviewOpinion; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewPageQuery.java index b7bc34e7..b2e56d93 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingReviewPageQuery.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.client.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,12 +13,12 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class QualFilingReviewPageQuery extends BasePageQuery { - /** 机构id */ + @ApiModelProperty(value = "备案申请id") private Long filingId; - /** 审核结果 1通过 2待定 3不通过 */ + @ApiModelProperty(value = "审核结果(1通过2待定3不通过)") private String reviewResult; - /** 专家id */ + @ApiModelProperty(value = "专家id") private Long filingExpertId; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingCommitmentEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingCommitmentEntity.java index d0f3435d..9f26e550 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingCommitmentEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingCommitmentEntity.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java index 1ed9341d..ecd52411 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingEntity.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; 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 0051acc5..9499bfee 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 @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingMaterialEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingMaterialEntity.java index f8bc37f9..d93e213a 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingMaterialEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingMaterialEntity.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java index 76709cf3..ce83b23e 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java index 2764c0a8..7e6f5ed0 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java @@ -1,5 +1,6 @@ package org.qinan.safetyeval.domain.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingGateway.java index 8cc6eb0f..0e5ec4a9 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/QualFilingGateway.java @@ -1,9 +1,11 @@ package org.qinan.safetyeval.domain.gateway; -import org.qinan.safetyeval.domain.entity.QualFilingEntity; +import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.query.QualFilingQuery; import org.qinan.safetyeval.domain.query.PageResult; +import java.util.List; + /** * 资质备案申请Gateway接口（Domain层定义） * @@ -22,4 +24,9 @@ public interface QualFilingGateway { void delete(Long id); PageResult page(QualFilingQuery query); + + Long aggregationSaveOrEdit(QualFilingEntity entity, QualFilingCommitmentEntity commitmentEntity, List equipmentEntities, List materialEntities, List personnelEntities, List personnelCertEntities); + + void review(Long filingId, String reviewResult, String reviewResultRemark, Long filingExpertId, String filingExpertName, String reviewOpinion); + } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java index 9a742457..eaf43f26 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingQuery.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.domain.query; import java.util.List; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -44,4 +45,7 @@ public class QualFilingQuery { /** 分页场景：change=备案变更列表 */ private String scene; + + /**是否为监管端查询,true-false*/ + private Boolean supervision; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingDomainService.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingDomainService.java index 0595f22f..0c3a78c1 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingDomainService.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/service/QualFilingDomainService.java @@ -1,6 +1,7 @@ package org.qinan.safetyeval.domain.service; -import org.qinan.safetyeval.domain.entity.QualFilingEntity; +import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; +import org.qinan.safetyeval.domain.entity.*; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.QualFilingGateway; @@ -10,6 +11,9 @@ import org.qinan.safetyeval.domain.query.PageResult; import javax.annotation.Resource; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.List; + /** * 资质备案申请领域服务 * @@ -48,4 +52,17 @@ public class QualFilingDomainService { public PageResult page(QualFilingQuery query) { return qualFilingGateway.page(query); } + + public Long aggregationSaveOrEdit(QualFilingEntity entity, QualFilingCommitmentEntity commitmentEntity, List equipmentEntities, List materialEntities, List personnelEntities, List personnelCertEntities) { + return qualFilingGateway.aggregationSaveOrEdit(entity, commitmentEntity, equipmentEntities, materialEntities, personnelEntities, personnelCertEntities); + } + + public void review(Long filingId, String reviewResult, String reviewResultRemark, Long filingExpertId, String filingExpertName, String reviewOpinion) { + QualFilingEntity filing = qualFilingGateway.get(filingId); + if (filing == null || filing.getFilingStatusCode() == null + || filing.getFilingStatusCode() != QualFilingStatusEnum.REVIEWING.getCode()) { + throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID); + } + qualFilingGateway.review(filingId, reviewResult, reviewResultRemark, filingExpertId, filingExpertName, reviewOpinion); + } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index db7481b8..dac677e9 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -3,21 +3,26 @@ package org.qinan.safetyeval.infrastructure.gatewayimpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.qinan.safetyeval.domain.entity.QualFilingEntity; +import org.qinan.safetyeval.domain.constant.QualFilingStatusEnum; +import org.qinan.safetyeval.domain.entity.*; +import org.qinan.safetyeval.domain.exception.BizException; +import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.QualFilingGateway; import org.qinan.safetyeval.domain.query.QualFilingQuery; import org.qinan.safetyeval.domain.query.PageResult; -import org.qinan.safetyeval.infrastructure.dataobject.QualFilingDO; -import org.qinan.safetyeval.infrastructure.mapper.QualFilingMapper; +import org.qinan.safetyeval.infrastructure.dataobject.*; +import org.qinan.safetyeval.infrastructure.mapper.*; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.time.LocalDateTime; +import java.util.*; import java.util.stream.Collectors; /** @@ -37,6 +42,20 @@ public class QualFilingGatewayImpl implements QualFilingGateway { @Resource private QualFilingMapper qualFilingMapper; + @Resource + private QualFilingCommitmentMapper qualFilingCommitmentMapper; + @Resource + private QualFilingEquipmentMapper qualFilingEquipmentMapper; + @Resource + private QualFilingMaterialMapper qualFilingMaterialMapper; + @Resource + private QualFilingPersonnelMapper qualFilingPersonnelMapper; + @Resource + private QualFilingPersonnelCertMapper qualFilingPersonnelCertMapper; + @Resource + private OrgPersonnelCertMapper orgPersonnelCertMapper; + @Autowired + private QualFilingReviewMapper qualFilingReviewMapper; @Override public QualFilingEntity save(QualFilingEntity entity) { @@ -73,6 +92,7 @@ public class QualFilingGatewayImpl implements QualFilingGateway { @Override public void delete(Long id) { qualFilingMapper.deleteById(id); + // todo 后续考虑是否删除对应子表信息 } @Override @@ -91,23 +111,26 @@ public class QualFilingGatewayImpl implements QualFilingGateway { if (StringUtils.hasText(query.getFilingTerritoryCode())) { wrapper.eq(QualFilingDO::getFilingTerritoryCode, query.getFilingTerritoryCode()); } - if (SCENE_CHANGE.equals(query.getScene())) { - applyChangeListFilter(wrapper, query); - } - else { - if (query.getFilingStatusCodes() != null && !query.getFilingStatusCodes().isEmpty()) { - wrapper.in(QualFilingDO::getFilingStatusCode, query.getFilingStatusCodes()); - } - else if (query.getFilingStatusCode() != null) { - wrapper.eq(QualFilingDO::getFilingStatusCode, query.getFilingStatusCode()); - } - if (query.getApplyTypeCode() != null) { - wrapper.eq(QualFilingDO::getApplyTypeCode, query.getApplyTypeCode()); - if (query.getApplyTypeCode() == APPLY_TYPE_FILED_MANAGE) { - wrapper.isNull(QualFilingDO::getOriginFilingId); - } - } + if (query.getSupervision()) { + wrapper.ne(QualFilingDO::getFilingStatusCode, 5); } +// if (SCENE_CHANGE.equals(query.getScene())) { +// applyChangeListFilter(wrapper, query); +// } +// else { +// if (query.getFilingStatusCodes() != null && !query.getFilingStatusCodes().isEmpty()) { +// wrapper.in(QualFilingDO::getFilingStatusCode, query.getFilingStatusCodes()); +// } +// else if (query.getFilingStatusCode() != null) { +// wrapper.eq(QualFilingDO::getFilingStatusCode, query.getFilingStatusCode()); +// } +// if (query.getApplyTypeCode() != null) { +// wrapper.eq(QualFilingDO::getApplyTypeCode, query.getApplyTypeCode()); +// if (query.getApplyTypeCode() == APPLY_TYPE_FILED_MANAGE) { +// wrapper.isNull(QualFilingDO::getOriginFilingId); +// } +// } +// } wrapper.orderByDesc(QualFilingDO::getCreateTime); Page page = new Page<>(query.getPageNum(), query.getPageSize()); @@ -120,6 +143,136 @@ public class QualFilingGatewayImpl implements QualFilingGateway { return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); } + /** + * 聚合保存 + * @param entity 基础信息 + * @param commitmentEntity 备案承诺书 + * @param equipmentEntities 备件 + * @param materialEntities 备案材料 + * @param personnelEntities 备案人员 + * @param personnelCertEntities 备案人员证书 + */ + + @Override + @Transactional(rollbackFor = Exception.class) + public Long aggregationSaveOrEdit(QualFilingEntity entity, QualFilingCommitmentEntity commitmentEntity, List equipmentEntities, List materialEntities, List personnelEntities, List personnelCertEntities) { + //保存基础信息 + QualFilingDO dataObject = new QualFilingDO(); + BeanUtils.copyProperties(entity, dataObject); + if (Objects.nonNull(dataObject.getId())) { + // 编辑 + InsertFieldDefaults.applyForUpdate(dataObject); + qualFilingMapper.updateById(dataObject); + } else { + InsertFieldDefaults.apply(dataObject); + qualFilingMapper.insert(dataObject); + } + if (Objects.isNull(dataObject.getId())) { + throw new BizException(ErrorCode.QUAL_FILING_STATUS_INVALID); + } + // 先删除对应数据,在新增 + qualFilingCommitmentMapper.delete(new LambdaQueryWrapper().eq(QualFilingCommitmentDO::getFilingId, dataObject.getId())); + qualFilingEquipmentMapper.delete(new LambdaQueryWrapper().eq(QualFilingEquipmentDO::getFilingId, dataObject.getId())); + qualFilingMaterialMapper.delete(new LambdaQueryWrapper().eq(QualFilingMaterialDO::getFilingId, dataObject.getId())); + qualFilingPersonnelMapper.delete(new LambdaQueryWrapper().eq(QualFilingPersonnelDO::getFilingId, dataObject.getId())); + qualFilingPersonnelCertMapper.delete(new LambdaQueryWrapper().eq(QualFilingPersonnelCertDO::getFilingId, dataObject.getId())); + + //备案承诺书 + QualFilingCommitmentDO commitmentDataObject = new QualFilingCommitmentDO(); + BeanUtils.copyProperties(commitmentEntity, commitmentDataObject); + InsertFieldDefaults.apply(commitmentDataObject); + commitmentDataObject.setFilingId(dataObject.getId()); + qualFilingCommitmentMapper.insert(commitmentDataObject); + //备案装备 + equipmentEntities.stream().map(item -> { + QualFilingEquipmentDO equipmentDataObject = new QualFilingEquipmentDO(); + BeanUtils.copyProperties(item, equipmentDataObject); + InsertFieldDefaults.apply(equipmentDataObject); + equipmentDataObject.setFilingId(dataObject.getId()); + return equipmentDataObject; + }).collect(Collectors.toList()).forEach(equipmentDataObject -> qualFilingEquipmentMapper.insert(equipmentDataObject)); + //备案材料 + materialEntities.stream().map(item -> { + QualFilingMaterialDO materialDataObject = new QualFilingMaterialDO(); + BeanUtils.copyProperties(item, materialDataObject); + InsertFieldDefaults.apply(materialDataObject); + materialDataObject.setFilingId(dataObject.getId()); + return materialDataObject; + }).collect(Collectors.toList()).forEach(materialDataObject -> qualFilingMaterialMapper.insert(materialDataObject)); + //备案人员 + personnelEntities.stream().map(item -> { + QualFilingPersonnelDO personnelDataObject = new QualFilingPersonnelDO(); + BeanUtils.copyProperties(item, personnelDataObject); + InsertFieldDefaults.apply(personnelDataObject); + personnelDataObject.setFilingId(dataObject.getId()); + return personnelDataObject; + }).collect(Collectors.toList()).forEach(personnelDataObject -> qualFilingPersonnelMapper.insert(personnelDataObject)); + //备案人员证书 + if (CollectionUtils.isEmpty(personnelCertEntities)) { + List sourcePersonnelIds = personnelEntities.stream().map(QualFilingPersonnelEntity::getSourcePersonnelId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(sourcePersonnelIds)) { + List orgPersonnelCertDOS = orgPersonnelCertMapper.selectList(new LambdaQueryWrapper() + .eq(OrgPersonnelCertDO::getPersonnelId, sourcePersonnelIds)); + if (!CollectionUtils.isEmpty(orgPersonnelCertDOS)) { + for (OrgPersonnelCertDO orgPersonnelCertDO : orgPersonnelCertDOS) { + QualFilingPersonnelCertDO qualFilingPersonnelCertDO = new QualFilingPersonnelCertDO(); + BeanUtils.copyProperties(orgPersonnelCertDO, qualFilingPersonnelCertDO, "id"); + InsertFieldDefaults.apply(qualFilingPersonnelCertDO); + qualFilingPersonnelCertDO.setId(null); + qualFilingPersonnelCertDO.setFilingId(dataObject.getId()); + qualFilingPersonnelCertDO.setFilingPersonnelId(orgPersonnelCertDO.getPersonnelId()); + qualFilingPersonnelCertDO.setSourceCertId(orgPersonnelCertDO.getId()); + qualFilingPersonnelCertMapper.insert(qualFilingPersonnelCertDO); + } + } + } + } else { + personnelCertEntities.stream().map(item -> { + QualFilingPersonnelCertDO personnelCertDataObject = new QualFilingPersonnelCertDO(); + BeanUtils.copyProperties(item, personnelCertDataObject, "id"); + InsertFieldDefaults.apply(personnelCertDataObject); + personnelCertDataObject.setFilingId(dataObject.getId()); + return personnelCertDataObject; + }).collect(Collectors.toList()).forEach(personnelCertDataObject -> qualFilingPersonnelCertMapper.insert(personnelCertDataObject)); + } + return dataObject.getId(); + } + + /** + * 备案审核 + * @param filingId 机构id + * @param reviewResult 审核结果(1通过2待定3不通过) + * @param reviewResultRemark 审核结果文字描述 + * @param filingExpertId 专家id + * @param filingExpertName 专家名称 + * @param reviewOpinion 审核意见 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void review(Long filingId, String reviewResult, String reviewResultRemark, Long filingExpertId, String filingExpertName, String reviewOpinion) { + // 保存审核记录 + QualFilingReviewDO qualFilingReviewDO = new QualFilingReviewDO(); + qualFilingReviewDO.setFilingId(filingId); + qualFilingReviewDO.setReviewResult(reviewResult); + qualFilingReviewDO.setReviewResultRemark(reviewResultRemark); + qualFilingReviewDO.setFilingExpertId(filingExpertId); + qualFilingReviewDO.setFilingExpertName(filingExpertName); + qualFilingReviewDO.setReviewOpinion(reviewOpinion); + InsertFieldDefaults.apply(qualFilingReviewDO); + qualFilingReviewMapper.insert(qualFilingReviewDO); + // 更新备案状态 + QualFilingDO filing = new QualFilingDO(); + QualFilingStatusEnum qualFilingStatusEnum = QualFilingStatusEnum.ofCode(Integer.valueOf(reviewResult)); + filing.setFilingStatusCode(qualFilingStatusEnum.getCode()); + filing.setFilingStatusName(qualFilingStatusEnum.getName()); + filing.setApproveTime(LocalDateTime.now()); + filing.setId(filingId); + filing.setFilingReviewId(qualFilingReviewDO.getId()); + InsertFieldDefaults.applyForUpdate(filing); + qualFilingMapper.updateById(filing); + //todo 审核通过是否需要新增资质变更记录 + } + /** * 备案变更列表：优先展示已备案主记录(applyType=3)； * 若仅有资质备案申请(applyType=1)为已备案、尚无主记录时，回退展示申请单。