init

docs/db/phase2/init-phase2.sql

@@ -810,8 +810,8 @@ CREATE TABLE IF NOT EXISTS `qual_on_site_review` (
 CREATE TABLE IF NOT EXISTS `qual_on_site_review_file` (
                                             `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
                                             `qual_on_site_review_id` bigint NOT NULL COMMENT '资质现场核查id',
-                                            `file_name` varchar(128) NOT NULL COMMENT '文件名称',
+                                            `name` varchar(128) NOT NULL COMMENT '文件名称',
-                                            `file_url` varchar(1024) NOT NULL COMMENT '文件url',
+                                            `url` varchar(1024) NOT NULL COMMENT '文件url',
                                             `delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '删除标识true false',
                                             `remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注',
                                             `create_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人姓名',

safety-eval-app/src/main/java/org/qinan/safetyeval/app/review/executor/command/QualOnSiteReviewUpdateCmdExe.java

@@ -122,13 +122,13 @@ public class QualOnSiteReviewUpdateCmdExe {
     }
 
 
-    private void saveFileList(Long reviewId, List<QualOnSiteReviewFileAddCmd> fileList) {
+    private void saveFileList(Long qualOnSiteReviewId, List<QualOnSiteReviewFileAddCmd> fileList) {
         if (CollectionUtils.isEmpty(fileList)) {
             return;
         }
         for (QualOnSiteReviewFileAddCmd fileCmd : fileList) {
             QualOnSiteReviewFileE fileE = qualOnSiteReviewFileCmdConvertor.convertCmdToE(fileCmd);
-            fileE.setQualOnSiteReviewId(reviewId);
+            fileE.setQualOnSiteReviewId(qualOnSiteReviewId);
             boolean res = fileE.add();
             if (!res) {
                 throw new BizException("审查结果文件保存失败");

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/QualOnSiteReviewFileAddCmd.java

@@ -20,22 +20,15 @@ public class QualOnSiteReviewFileAddCmd implements Serializable {
 
 
     @ApiModelProperty(value = "资质现场核查id", required = true)
-    @NotNull(message = "资质现场核查id不能为空")
     private Long qualOnSiteReviewId;
 
     @ApiModelProperty(value = "文件名称", required = true)
     @NotBlank(message = "文件名称不能为空")
     @Size(max = 128, message ="文件名称不能超过128个字符")
-    private String fileName;
+    private String name;
 
     @ApiModelProperty(value = "文件url", required = true)
     @NotBlank(message = "文件url不能为空")
     @Size(max = 1024, message = "文件url不能超过1024个字符")
-    private String fileUrl;
+    private String url;
-
-    /**
-     * 审查意见
-     */
-    @ApiModelProperty(value = "审查意见")
-    private String reviewOpinion;
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/QualOnSiteReviewFilePageQry.java

@@ -26,5 +26,5 @@ public class QualOnSiteReviewFilePageQry extends PageQuery {
      * 文件名称
      */
     @ApiModelProperty(value = "文件名称")
-    private String fileName;
+    private String name;
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/QualOnSiteReviewFileUpdateCmd.java

@@ -30,12 +30,12 @@ public class QualOnSiteReviewFileUpdateCmd implements Serializable {
     @ApiModelProperty(value = "文件名称", required = true)
     @NotBlank(message = "文件名称不能为空")
     @Size(max = 128, message ="文件名称不能超过128个字符")
-    private String fileName;
+    private String name;
 
     @ApiModelProperty(value = "文件url", required = true)
     @NotBlank(message = "文件url不能为空")
     @Size(max = 1024, message = "文件url不能超过1024个字符")
-    private String fileUrl;
+    private String url;
 
     /**
      * 审查意见

safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/QualOnSiteReviewFileCo.java

@@ -25,12 +25,12 @@ public class QualOnSiteReviewFileCo extends ClientObject {
      * 文件名称
      */
     @ApiModelProperty(value = "文件名称")
-    private String fileName;
+    private String name;
     /**
      * 文件url
      */
     @ApiModelProperty(value = "文件url")
-    private String fileUrl;
+    private String url;
     /**
      * 审查意见
      */

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/QualOnSiteReviewFileE.java

@@ -27,11 +27,11 @@ public class QualOnSiteReviewFileE extends BaseE {
     /**
      * 文件名称
      */
-    private String fileName;
+    private String name;
     /**
      * 文件url
      */
-    private String fileUrl;
+    private String url;
     /**
      * 审查意见
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualOnSiteReviewFileDO.java

@@ -24,11 +24,11 @@ public class QualOnSiteReviewFileDO extends BaseDO {
     /**
      * 文件名称
      */
-    private String fileName;
+    private String name;
     /**
      * 文件url
      */
-    private String fileUrl;
+    private String url;
     /**
      * 审查意见
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualOnSiteReviewFileRepositoryImpl.java

@@ -37,8 +37,8 @@ public class QualOnSiteReviewFileRepositoryImpl extends BaseRepositoryImpl<QualO
         if (ObjectUtil.isNotEmpty(qualOnSiteReviewFilePageQry.getQualOnSiteReviewId())) {
             qualOnSiteReviewFileDoQueryWrapper.eq("qual_on_site_review_id", qualOnSiteReviewFilePageQry.getQualOnSiteReviewId());
         }
-        if (ObjectUtil.isNotEmpty(qualOnSiteReviewFilePageQry.getFileName())) {
+        if (ObjectUtil.isNotEmpty(qualOnSiteReviewFilePageQry.getName())) {
-            qualOnSiteReviewFileDoQueryWrapper.like("file_name", qualOnSiteReviewFilePageQry.getFileName());
+            qualOnSiteReviewFileDoQueryWrapper.like("name", qualOnSiteReviewFilePageQry.getName());
         }
 
         qualOnSiteReviewFileDoQueryWrapper.eq("delete_enum", BooleanEnum.FALSE.getValue());

safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewFileMapper.xml

@@ -25,8 +25,8 @@
     <sql id="selectQualOnSiteReviewFile">
         select id,
                qual_on_site_review_id,
-               file_name,
+               name,
-               file_url,
+               url,
                delete_enum,
                remarks,
                create_name,