Merge branch 'master' of http://8.130.72.63:18081/single-window/yqyc-system

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/entity/QyRecord.java

@@ -80,146 +80,152 @@ public class QyRecord {
     @ExcelProperty(index = 7,value = "联系人")
     private String companyLinkMan;
 
+    /** 联系人 */
+    @Schema(description = "联系人")
+    @ColumnWidth(12)
+    @ExcelProperty(index = 8,value = "联系人")
+    private String companyLinkPhone;
+
     /** 企业类型 */
     @Schema(description = "企业类型")
     @ColumnWidth(12)
-    @ExcelProperty(index = 8,value = "企业类型")
+    @ExcelProperty(index = 9,value = "企业类型")
     private String companyType;
 
     /** 注册资本 */
     @Schema(description = "注册资本")
     @ColumnWidth(12)
-    @ExcelProperty(index = 9,value = "注册资本")
+    @ExcelProperty(index = 10,value = "注册资本")
     private String companyRegisteredCapital;
 
     /** 成立日期 */
     @Schema(description = "成立日期")
     @ColumnWidth(12)
-    @ExcelProperty(index = 10,value = "成立日期")
+    @ExcelProperty(index = 11,value = "成立日期")
     private Date companyRegisterDate;
 
     /** 企业地址 */
     @Schema(description = "企业地址")
     @ColumnWidth(12)
-    @ExcelProperty(index = 11,value = "企业地址")
+    @ExcelProperty(index = 12,value = "企业地址")
     private String companyAddress;
 
     /** 营业期限 */
     @Schema(description = "营业期限")
     @ColumnWidth(12)
-    @ExcelProperty(index = 12,value = "营业期限")
+    @ExcelProperty(index = 13,value = "营业期限")
     private String companyDeadline;
 
     /** 登记机关 */
     @Schema(description = "登记机关")
     @ColumnWidth(12)
-    @ExcelProperty(index = 13,value = "登记机关")
+    @ExcelProperty(index = 14,value = "登记机关")
     private String companyRegistration;
 
     /** 申报企业编号 */
     @Schema(description = "申报企业编号")
     @ColumnWidth(12)
-    @ExcelProperty(index = 14,value = "申报企业编号")
+    @ExcelProperty(index = 15,value = "申报企业编号")
     private String companyApplyCode;
 
     /** 监管场所 */
     @Schema(description = "监管场所")
     @ColumnWidth(12)
-    @ExcelProperty(index = 15,value = "监管场所")
+    @ExcelProperty(index = 16,value = "监管场所")
     private String companySupervisionPlaceType;
 
     /** 主管海关 */
     @Schema(description = "主管海关")
     @ColumnWidth(12)
-    @ExcelProperty(index = 16,value = "主管海关")
+    @ExcelProperty(index = 17,value = "主管海关")
     private String companyMainHgType;
 
     /** 经营范围 */
     @Schema(description = "经营范围")
     @ColumnWidth(12)
-    @ExcelProperty(index = 17,value = "经营范围")
+    @ExcelProperty(index = 18,value = "经营范围")
     private String companyJyFw;
 
     /** 申报类型 */
     @Schema(description = "申报类型")
     @ColumnWidth(12)
-    @ExcelProperty(index = 18,value = "申报类型")
+    @ExcelProperty(index = 19,value = "申报类型")
     private String applyType;
 
     /** 申报时间 */
     @Schema(description = "申报时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 19,value = "申报时间")
+    @ExcelProperty(index = 20,value = "申报时间")
     private Date applyTime;
 
     /** 申报人 */
     @Schema(description = "申报人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 20,value = "申报人")
+    @ExcelProperty(index = 21,value = "申报人")
     private String applyMan;
 
     /** 享惠类型 */
     @Schema(description = "享惠类型")
     @ColumnWidth(12)
-    @ExcelProperty(index = 21,value = "享惠类型")
+    @ExcelProperty(index = 22,value = "享惠类型")
     private String applyXhType;
 
     /** 上传附件 */
     @Schema(description = "上传附件")
     @ColumnWidth(12)
-    @ExcelProperty(index = 22,value = "上传附件")
+    @ExcelProperty(index = 23,value = "上传附件")
     private String applyUrl;
 
     /** 鼓励类产品目录 */
     @Schema(description = "鼓励类产品目录")
     @ColumnWidth(12)
-    @ExcelProperty(index = 23,value = "鼓励类产品目录")
+    @ExcelProperty(index = 24,value = "鼓励类产品目录")
     private String applyCatalogue;
 
     /** 备注内容 */
     @Schema(description = "备注内容")
     @ColumnWidth(12)
-    @ExcelProperty(index = 24,value = "备注内容")
+    @ExcelProperty(index = 25,value = "备注内容")
     private String applyRemark;
 
     /** 单据状态 */
     @Schema(description = "单据状态")
     @ColumnWidth(12)
-    @ExcelProperty(index = 25,value = "单据状态")
+    @ExcelProperty(index = 26,value = "单据状态")
     private String status;
 
     /** 创建人 */
     @Schema(description = "创建人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 26,value = "创建人")
+    @ExcelProperty(index = 27,value = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
     /** 录入时间 */
     @Schema(description = "录入时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 27,value = "录入时间")
+    @ExcelProperty(index = 28,value = "录入时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /** 更新人 */
     @Schema(description = "更新人")
     @ColumnWidth(12)
-    @ExcelProperty(index = 28,value = "更新人")
+    @ExcelProperty(index = 29,value = "更新人")
     @TableField(fill = FieldFill.UPDATE)
     private String updateUser;
 
     /** 更新时间 */
     @Schema(description = "更新时间")
     @ColumnWidth(12)
-    @ExcelProperty(index = 29,value = "更新时间")
+    @ExcelProperty(index = 30,value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 删除状态 */
     @Schema(description = "删除状态")
     @ColumnWidth(12)
-    @ExcelProperty(index = 30,value = "删除状态")
+    @ExcelProperty(index = 31,value = "删除状态")
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
     private String deleteFlag;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/param/QyRecordAddParam.java

@@ -66,6 +66,11 @@ public class QyRecordAddParam {
     @NotBlank(message = "companyLinkMan不能为空")
     private String companyLinkMan;
 
+    /** 联系人 */
+    @Schema(description = "联系人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "companyLinkPhone不能为空")
+    private String companyLinkPhone;
+
     /** 企业类型 */
     @Schema(description = "企业类型", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "companyType不能为空")

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qyrecord/param/QyRecordEditParam.java

@@ -71,6 +71,11 @@ public class QyRecordEditParam {
     @NotBlank(message = "companyLinkMan不能为空")
     private String companyLinkMan;
 
+    /** 联系人 */
+    @Schema(description = "联系人电话", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "companyLinkPhone不能为空")
+    private String companyLinkPhone;
+
     /** 企业类型 */
     @Schema(description = "企业类型", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "companyType不能为空")