feat: 资质申请聚合新增/编辑

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<AccountCO> get(@RequestParam Long id) {
+    public SingleResponse<AccountCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return accountApi.get(id);
     }
 
@@ -52,7 +53,7 @@ public class AccountController {
 
     @ApiOperation("删除用户")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return accountApi.delete(id);
     }
 

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<OrgDepartmentCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgDepartmentCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgDepartmentApi.get(id);
     }
 
@@ -51,7 +52,7 @@ public class OrgDepartmentController {
 
     @ApiOperation("删除部门")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgDepartmentApi.delete(id);
     }
 

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<OrgEquipmentCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgEquipmentCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgEquipmentApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgEquipmentController {
 
     @ApiOperation("删除装备信息")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgEquipmentApi.delete(id);
     }
 

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<OrgInfoCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgInfoCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgInfoApi.get(id);
     }
 
@@ -54,7 +55,7 @@ public class OrgInfoController {
 
     @ApiOperation("删除机构信息")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgInfoApi.delete(id);
     }
 
@@ -66,7 +67,7 @@ public class OrgInfoController {
 
     @ApiOperation("重置机构密码")
     @PostMapping("/reset-password")
-    public SingleResponse<Void> resetPassword(@RequestParam Long id) {
+    public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestParam Long id) {
         return orgInfoApi.resetPassword(id);
     }
 

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<OrgPersonnelCertCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgPersonnelCertCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelCertApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgPersonnelCertController {
 
     @ApiOperation("删除人员证书")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelCertApi.delete(id);
     }
 

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<OrgPersonnelChangeCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgPersonnelChangeCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelChangeApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgPersonnelChangeController {
 
     @ApiOperation("删除人员变更记录")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelChangeApi.delete(id);
     }
 

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<OrgPersonnelCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgPersonnelCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgPersonnelController {
 
     @ApiOperation("删除人员信息")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelApi.delete(id);
     }
 
@@ -59,7 +60,7 @@ public class OrgPersonnelController {
 
     @ApiOperation("重置人员密码")
     @PostMapping("/reset-password")
-    public SingleResponse<Void> resetPassword(@RequestParam Long id) {
+    public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPersonnelApi.resetPassword(id);
     }
 }

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<OrgPositionCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgPositionCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPositionApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgPositionController {
 
     @ApiOperation("删除岗位")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgPositionApi.delete(id);
     }
 

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<OrgQualificationCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgQualificationCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgQualificationApi.get(id);
     }
 
@@ -50,7 +50,7 @@ public class OrgQualificationController {
 
     @ApiOperation("删除机构资质证书")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgQualificationApi.delete(id);
     }
 

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<OrgResignApplyCO> get(@RequestParam Long id) {
+    public SingleResponse<OrgResignApplyCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return orgResignApplyApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class OrgResignApplyController {
 
     @ApiOperation("删除人员离职申请")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return orgResignApplyApi.delete(id);
     }
 

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<QualFilingChangeCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingChangeCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingChangeApi.get(id);
     }
 
@@ -43,7 +44,7 @@ public class QualFilingChangeController {
 
     @ApiOperation("删除备案变更")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingChangeApi.delete(id);
     }
 
@@ -55,7 +56,7 @@ public class QualFilingChangeController {
 
     @ApiOperation("发起备案变更（克隆草稿）")
     @PostMapping("/start")
-    public SingleResponse<Long> start(@RequestParam Long originFilingId) {
+    public SingleResponse<Long> start(@ApiParam("原备案申请id") @RequestParam Long originFilingId) {
         return qualFilingChangeApi.start(originFilingId);
     }
 
@@ -68,13 +69,13 @@ public class QualFilingChangeController {
     @ApiOperation("备案变更历史")
     @GetMapping("/history")
     public SingleResponse<org.qinan.safetyeval.client.co.QualFilingChangeHistoryCO> history(
-            @RequestParam Long originFilingId) {
+            @ApiParam("原备案申请id") @RequestParam Long originFilingId) {
         return qualFilingChangeApi.history(originFilingId);
     }
 
     @ApiOperation("变更审核通过")
     @PostMapping("/approve")
-    public SingleResponse<Void> approve(@RequestParam Long changeId) {
+    public SingleResponse<Void> approve(@ApiParam("备案变更id") @RequestParam Long changeId) {
         return qualFilingChangeApi.approve(changeId);
     }
 

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<QualFilingChangeDetailCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingChangeDetailCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingChangeDetailApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingChangeDetailController {
 
     @ApiOperation("删除备案变更明细")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingChangeDetailApi.delete(id);
     }
 

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<QualFilingCommitmentCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingCommitmentCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingCommitmentApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingCommitmentController {
 
     @ApiOperation("删除法定代表人承诺书")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingCommitmentApi.delete(id);
     }
 

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.*;
-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.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<QualFilingCO> draft(
-            @RequestParam(defaultValue = "1") Integer applyTypeCode) {
-        return qualFilingApi.draft(applyTypeCode);
-    }
-
-    @ApiOperation("暂存备案信息")
-    @PostMapping("/save-draft")
-    public SingleResponse<QualFilingCO> saveDraft(@Validated @RequestBody QualFilingModifyCmd cmd) {
-        return qualFilingApi.saveDraft(cmd);
-    }
-
-    @ApiOperation("提交备案审核")
-    @PostMapping("/submit")
-    public SingleResponse<QualFilingCO> submit(@RequestParam Long id) {
-        return qualFilingApi.submit(id);
-    }
-
-    @ApiOperation("审核通过")
-    @PostMapping("/approve")
-    public SingleResponse<QualFilingCO> approve(@RequestParam Long id) {
-        return qualFilingApi.approve(id);
-    }
-
-    @ApiOperation("审核打回")
-    @PostMapping("/reject")
-    public SingleResponse<QualFilingCO> reject(@Validated @RequestBody QualFilingRejectCmd cmd) {
-        return qualFilingApi.reject(cmd);
-    }
-
-    @ApiOperation("备案详情（5步聚合）")
-    @GetMapping("/detail")
-    public SingleResponse<QualFilingDetailCO> detail(@RequestParam Long id) {
-        return qualFilingApi.detail(id);
-    }
-
-    @ApiOperation("上传主表附件")
-    @PostMapping("/upload-attachment")
-    public SingleResponse<QualFilingCO> uploadAttachment(@Validated @RequestBody QualFilingAttachmentUploadCmd cmd) {
-        return qualFilingApi.uploadAttachment(cmd);
-    }
-
-    @ApiOperation("已备案资质填报-创建草稿")
-    @PostMapping("/filed/draft")
-    public SingleResponse<QualFilingCO> filedDraft() {
-        return qualFilingApi.filedDraft();
-    }
-
-    @ApiOperation("已备案资质管理-分页")
-    @GetMapping("/filed/page")
-    public PageResponse<QualFilingCO> 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<QualFilingCO> 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<Integer> defaults) {
-        if (query.getFilingStatusCode() == null
-                && (query.getFilingStatusCodes() == null || query.getFilingStatusCodes().isEmpty())) {
-            query.setFilingStatusCodes(defaults);
-        }
-    }
-
     @ApiOperation("查询资质备案申请详情")
     @GetMapping("/get")
-    public SingleResponse<QualFilingCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingApi.get(id);
     }
 
@@ -127,21 +46,42 @@ public class QualFilingController {
         return qualFilingApi.modify(cmd);
     }
 
-    @ApiOperation("删除资质备案申请")
+/////////////////////////////////////聚合接口
-    @PostMapping("/delete")
+    @ApiOperation("聚合新增or编辑资质备案申请")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    @PostMapping("/aggregationSaveOrEdit")
-        return qualFilingApi.delete(id);
+    public SingleResponse<QualFilingCO> aggregationSaveOrEdit(@RequestBody AggregationSaveOrEditQualFilingCmd cmd) {
+        return qualFilingApi.aggregationSaveOrEdit(cmd);
     }
 
-    @ApiOperation("分页查询资质备案申请")
+    @ApiOperation("分页查询资质备案,已备案资质管理列表")
     @GetMapping("/page")
     public PageResponse<QualFilingCO> page(@Validated QualFilingPageQuery query) {
         return qualFilingApi.page(query);
     }
 
+    @ApiOperation("审核")
+    @PostMapping("/review")
+    public SingleResponse<Void> review(@Validated @RequestBody QualFilingReviewAddCmd cmd) {
+        qualFilingApi.review(cmd);
+        return SingleResponse.success();
+    }
+
+    @ApiOperation("删除资质备案申请")
+    @PostMapping("/delete")
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
+        return qualFilingApi.delete(id);
+    }
+
     @ApiOperation("合规检查")
     @GetMapping("/compliance-check")
-    public SingleResponse<List<QualFilingComplianceCheckResultCO>> complianceCheck(@RequestParam Long id) {
+    public SingleResponse<List<QualFilingComplianceCheckResultCO>> complianceCheck(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingApi.complianceCheck(id);
     }
+
+    @ApiOperation("备案详情（5步聚合）")
+    @GetMapping("/detail")
+    public SingleResponse<QualFilingDetailCO> detail(@ApiParam("主键ID") @RequestParam Long id) {
+        return qualFilingApi.detail(id);
+    }
+
 }

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<QualFilingEquipmentCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingEquipmentCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingEquipmentApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingEquipmentController {
 
     @ApiOperation("删除备案申请装备")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingEquipmentApi.delete(id);
     }
 

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<QualFilingExpertCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingExpertCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingExpertApi.get(id);
     }
 
@@ -52,7 +53,7 @@ public class QualFilingExpertController {
 
     @ApiOperation("删除审核专家")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingExpertApi.delete(id);
     }
 

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<QualFilingMaterialCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingMaterialCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingMaterialApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingMaterialController {
 
     @ApiOperation("删除备案申请材料")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingMaterialApi.delete(id);
     }
 
@@ -59,7 +60,7 @@ public class QualFilingMaterialController {
 
     @ApiOperation("初始化材料模板")
     @PostMapping("/init-template")
-    public SingleResponse<Void> initTemplate(@RequestParam Long filingId) {
+    public SingleResponse<Void> initTemplate(@ApiParam("备案申请id") @RequestParam Long filingId) {
         return qualFilingMaterialApi.initTemplate(filingId);
     }
 

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<QualFilingPersonnelCertCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingPersonnelCertCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingPersonnelCertApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingPersonnelCertController {
 
     @ApiOperation("删除备案申请人员证书")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingPersonnelCertApi.delete(id);
     }
 

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<QualFilingPersonnelCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingPersonnelCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingPersonnelApi.get(id);
     }
 
@@ -47,7 +48,7 @@ public class QualFilingPersonnelController {
 
     @ApiOperation("删除备案申请人员")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingPersonnelApi.delete(id);
     }
 

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<QualFilingReviewCO> get(@RequestParam Long id) {
+    public SingleResponse<QualFilingReviewCO> get(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingReviewApi.get(id);
     }
 
@@ -52,7 +53,7 @@ public class QualFilingReviewController {
 
     @ApiOperation("删除资质审核记录")
     @PostMapping("/delete")
-    public SingleResponse<Void> delete(@RequestParam Long id) {
+    public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
         return qualFilingReviewApi.delete(id);
     }
 

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.*;
-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.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<QualFilingCO> 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<QualFilingEquipmentEntity> equipmentEntities = cmd.getQualFilingEquipmentAddCmds().stream().map(item -> {
+            QualFilingEquipmentEntity equipmentEntity = new QualFilingEquipmentEntity();
+            BeanUtils.copyProperties(equipmentEntity, equipmentEntity);
+            return equipmentEntity;
+        }).collect(Collectors.toList());
+        //备案材料清单
+        List<QualFilingMaterialEntity> materialEntities = cmd.getQualFilingMaterialAddCmds().stream().map(item -> {
+            QualFilingMaterialEntity materialEntity = new QualFilingMaterialEntity();
+            BeanUtils.copyProperties(materialEntity, item);
+            return materialEntity;
+        }).collect(Collectors.toList());
+        //备案人员
+        List<QualFilingPersonnelEntity> personnelEntities = cmd.getQualFilingPersonnelAddCmds().stream().map(item -> {
+            QualFilingPersonnelEntity personnelEntity = new QualFilingPersonnelEntity();
+            BeanUtils.copyProperties(personnelEntity, item);
+            return personnelEntity;
+        }).collect(Collectors.toList());
+        //备案人员证书列表
+        List<QualFilingPersonnelCertEntity> 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;

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<QualFilingEntity> pageResult = qualFilingGateway.page(domainQuery);
         List<QualFilingCO> records = pageResult.getRecords().stream()
                 .map(entity -> {

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.*;
-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 java.util.List;
 
@@ -45,4 +39,8 @@ public interface QualFilingApi {
     SingleResponse<QualFilingCO> uploadAttachment(QualFilingAttachmentUploadCmd cmd);
 
     SingleResponse<List<QualFilingComplianceCheckResultCO>> complianceCheck(Long id);
+
+    SingleResponse<QualFilingCO> aggregationSaveOrEdit(AggregationSaveOrEditQualFilingCmd cmd);
+
+    void review(QualFilingReviewAddCmd cmd);
 }

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")

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")

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 = "备案记录状态名称")

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 = "发表著作")

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 = "备注")

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 = "审核状态名称")

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 = "申请类型名称")

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 = "备案状态名称")

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 = "校准报告附件地址")

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 = "性别名称")

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 = "上传状态名称")

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 = "能力声明")

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 = "审核结果文字描述")

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;
 }

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;
 }

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;
 }

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<QualFilingEquipmentAddCmd> qualFilingEquipmentAddCmds;
+
+    @ApiModelProperty(value = "备案材料清单")
+    private List<QualFilingMaterialAddCmd> qualFilingMaterialAddCmds;
+
+    @ApiModelProperty(value = "备案人员")
+    private List<QualFilingPersonnelAddCmd> qualFilingPersonnelAddCmds;
+
+    @ApiModelProperty(value = "备案人员证书列表")
+    private List<QualFilingPersonnelCertAddCmd> qualFilingPersonnelCertAddCmds;
+
+
+
+
+}

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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 = "状态值无效")

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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<Long> sourceEquipmentIds;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 
-    /** 备案状态多选 */
+    @ApiModelProperty(value = "申请类型编码(1资质备案申请2变更备案草稿)")
-    private List<Integer> filingStatusCodes;
-
-    /** 申请类型 */
     private Integer applyTypeCode;
 
-    /** 备案属地编码 */
+    @ApiModelProperty(value = "备案属地编码")
     private String filingTerritoryCode;
 
-    /** 分页场景：change=备案变更列表 */
+    @ApiModelProperty(value = "是否为监管端查询,true-false")
-    private String scene;
+    private Boolean supervision = false;
 }

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;
 }

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<Long> sourcePersonnelIds;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }