文创上海创新创业报名通道2.0

src/main/java/com/xdf/creative/base/params/creative/InnovationApplyQueryParam.java

@@ -6,12 +6,13 @@ package com.xdf.creative.base.params.creative;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xdf.creative.base.params.QueryParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -26,83 +27,70 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "InnovationApplyQueryParam对象", description = "创新创业大赛查询参数")
 public class InnovationApplyQueryParam extends QueryParam {
-
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "国家城市")
-    private String countryCity;
-
     @ApiModelProperty(value = "参赛组别")
     private String contestGroup;
 
-    @ApiModelProperty(value = "项目名称")
-    private String projectInfoName;
-
-    @ApiModelProperty(value = "项目概述")
-    private String projectInfoSummary;
-
-    @ApiModelProperty(value = "项目产品和服务特点")
-    private String projectInfoCharacteristic;
-
-    @ApiModelProperty(value = "项目投资价值")
-    private String projectInfoInvestment;
-
-    @ApiModelProperty(value = "文件资料")
-    private String fileAttachment;
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
 
-    @ApiModelProperty(value = "补充资料")
-    private String supplementAttachment;
+    @ApiModelProperty(value = "公司注册时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date companyRegisterDate;
 
-    @ApiModelProperty(value = "项目联系人姓名")
-    private String projectContactName;
+    @ApiModelProperty(value = "注册资本")
+    private String companyRegisterCapital;
 
-    @ApiModelProperty(value = "项目联系人公司")
-    private String projectContactCompany;
+    @ApiModelProperty(value = "法人代表")
+    private String companyLegalPerson;
 
-    @ApiModelProperty(value = "项目联系人地址")
-    private String projectContactAddress;
+    @ApiModelProperty(value = "注册地")
+    private String companyRegisterAddress;
 
-    @ApiModelProperty(value = "项目联系人职位")
-    private String projectContactPosition;
+    @ApiModelProperty(value = "办公地址")
+    private String companyWorkAddress;
 
-    @ApiModelProperty(value = "项目联系人手机")
-    private String projectContactPhone;
+    @ApiModelProperty(value = "项目联系人")
+    private String contactsName;
 
-    @ApiModelProperty(value = "项目联系人邮箱")
-    private String projectContactEmail;
+    @ApiModelProperty(value = "职务")
+    private String contactsPosition;
 
-    @ApiModelProperty(value = "项目联系人微信")
-    private String projectContactWechat;
+    @ApiModelProperty(value = "手机号码")
+    private String contactsPhone;
 
-    @ApiModelProperty(value = "公司信息中文全称")
-    private String companyInfoName;
+    @ApiModelProperty(value = "微信号")
+    private String contactsWechat;
 
-    @ApiModelProperty(value = "公司信息成立时间")
-    private Date companyInfoCreatime;
+    @ApiModelProperty(value = "电子邮箱")
+    private String contactsEamil;
 
-    @ApiModelProperty(value = "公司信息注册地址")
-    private String companyInfoAddress;
+    @ApiModelProperty(value = "公司及项目介绍")
+    private String projectIntroduce;
 
-    @ApiModelProperty(value = "公司信息股东结构(Excel文件)")
-    private String companyInfoShareholder;
+    @ApiModelProperty(value = "公司融资情况")
+    private String pojectInvestment;
 
-    @ApiModelProperty(value = "申报人姓名")
-    private String declareName;
+    @ApiModelProperty(value = "公司专利技术及荣誉")
+    private String pojectHonor;
 
-    @ApiModelProperty(value = "申报人一寸免冠头像")
-    private String declareImage;
+    @ApiModelProperty(value = "2019年财务数据")
+    private String financialDataOne;
 
-    @ApiModelProperty(value = "申报人身份信息")
-    private String declareCard;
+    @ApiModelProperty(value = "2020年财务数据")
+    private String financialDataTwo;
 
-    @ApiModelProperty(value = "申报人出生日期")
-    private Date declareBirth;
+    @ApiModelProperty(value = "2021年财务数据")
+    private String financialDataThree;
 
-    @ApiModelProperty(value = "申报人所在城市")
-    private String declareCity;
+    @ApiModelProperty(value = "附件json")
+    private String attachment;
 
     @ApiModelProperty(value = "逻辑删除，0：未删除，1：已删除")
     private Integer deleted;

src/main/java/com/xdf/creative/module/controller/InnovationApplyController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -27,10 +28,10 @@ public class InnovationApplyController {
     InnovationApplyService innovationApplyService;
 
     /**
-     * 添加报名通道表
+     * 查询报名通道表
      */
     @PostMapping("/getInfoInnovationApplyPageList")
-    @ApiOperation(value = "查询innovationApply对象", notes = "查询报名通道表", response = ApiResult.class)
+    @ApiOperation(value = "查询innovationApply对象集合", notes = "查询报名通道表", response = ApiResult.class)
     public ApiResult<Boolean> getInfoInnovationApplyPageList(@RequestBody InnovationApplyQueryParam innovationApplyQueryParam) {
         PageTool<InnovationApply> innovationApplyPageList = innovationApplyService.getInfoInnovationApplyPageList(innovationApplyQueryParam);
         return ApiResult.ok(innovationApplyPageList);
@@ -41,8 +42,17 @@ public class InnovationApplyController {
      */
     @PostMapping("/add")
     @ApiOperation(value = "添加innovationApply对象", notes = "添加报名通道表", response = ApiResult.class)
-    public ApiResult<Boolean> addInnovationApply(@RequestBody InnovationApply innovationApply) {
+    public ApiResult<Boolean> addInnovationApply(@Valid @RequestBody InnovationApply innovationApply) {
         boolean flag = innovationApplyService.save(innovationApply);
         return ApiResult.result(flag);
     }
+
+    /**
+     * 添加报名通道表
+     */
+    @GetMapping("/getInfoInnovationApplyById")
+    @ApiOperation(value = "查询innovationApply对象ByID", notes = "查询报名通道表", response = ApiResult.class)
+    public ApiResult<Boolean> getInfoInnovationApplyById(@RequestParam Integer id) {
+        return ApiResult.ok(innovationApplyService.getById(id));
+    }
 }

src/main/java/com/xdf/creative/module/entity/InnovationApply.java

@@ -8,23 +8,21 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * <p>
- * 文创上海创新创业报名通道表
- * </p>
  *
  * @author KanXianggui
- * @since 2022-09-16
+ * @since 2022-10-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("web_innovation_apply")
-@ApiModel(value = "InnovationApply对象", description = "文创上海创新创业报名通道表")
+@ApiModel(value = "InnovationApply对象", description = "")
 public class InnovationApply implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,84 +31,81 @@ public class InnovationApply implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "国家城市")
-    private String countryCity;
-
     @ApiModelProperty(value = "参赛组别")
     private String contestGroup;
 
-    @ApiModelProperty(value = "项目名称")
-    private String projectInfoName;
-
-    @ApiModelProperty(value = "项目概述")
-    private String projectInfoSummary;
-
-    @ApiModelProperty(value = "项目产品和服务特点")
-    private String projectInfoCharacteristic;
-
-    @ApiModelProperty(value = "项目投资价值")
-    private String projectInfoInvestment;
-
-    @ApiModelProperty(value = "商业计划书")
-    private String businessPlanAttachment;
-
-    @ApiModelProperty(value = "营业执照")
-    private String businessLicenseAttachment;
+    @ApiModelProperty(value = "公司名称")
+    @Length(message = "公司名称不能超过个 {max} 字符", max = 100)
+    private String companyName;
 
-    @ApiModelProperty(value = "补充资料")
-    private String supplementAttachment;
+    @ApiModelProperty(value = "公司注册时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date companyRegisterDate;
 
-    @ApiModelProperty(value = "项目联系人姓名")
-    private String projectContactName;
+    @ApiModelProperty(value = "注册资本")
+    @Length(message = "注册资本不能超过个 {max} 字符", max = 255)
+    private String companyRegisterCapital;
 
-    @ApiModelProperty(value = "项目联系人公司")
-    private String projectContactCompany;
+    @ApiModelProperty(value = "法人代表")
+    @Length(message = "法人代表不能超过个 {max} 字符", max = 100)
+    private String companyLegalPerson;
 
-    @ApiModelProperty(value = "项目联系人地址")
-    private String projectContactAddress;
+    @ApiModelProperty(value = "注册地")
+    @Length(message = "注册地不能超过个 {max} 字符", max = 500)
+    private String companyRegisterAddress;
 
-    @ApiModelProperty(value = "项目联系人职位")
-    private String projectContactPosition;
+    @ApiModelProperty(value = "办公地址")
+    @Length(message = "办公地址不能超过个 {max} 字符", max = 500)
+    private String companyWorkAddress;
 
-    @ApiModelProperty(value = "项目联系人手机")
-    private String projectContactPhone;
+    @ApiModelProperty(value = "项目联系人")
+    @Length(message = "项目联系人不能超过个 {max} 字符", max = 50)
+    private String contactsName;
 
-    @ApiModelProperty(value = "项目联系人邮箱")
-    private String projectContactEmail;
+    @ApiModelProperty(value = "职务")
+    @Length(message = "职务不能超过个 {max} 字符", max = 50)
+    private String contactsPosition;
 
-    @ApiModelProperty(value = "项目联系人微信")
-    private String projectContactWechat;
+    @ApiModelProperty(value = "手机号码")
+    @Length(message = "手机号码不能超过个 {max} 字符", max = 50)
+    private String contactsPhone;
 
-    @ApiModelProperty(value = "公司信息中文全称")
-    private String companyInfoName;
+    @ApiModelProperty(value = "微信号")
+    @Length(message = "微信号不能超过个 {max} 字符", max = 100)
+    private String contactsWechat;
 
-    @ApiModelProperty(value = "公司信息成立时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date companyInfoCreatime;
+    @ApiModelProperty(value = "电子邮箱")
+    @Length(message = "电子邮箱不能超过个 {max} 字符", max = 100)
+    private String contactsEamil;
 
-    @ApiModelProperty(value = "公司信息注册地址")
-    private String companyInfoAddress;
+    @ApiModelProperty(value = "公司及项目介绍")
+    @Length(message = "公司及项目介绍不能超过个 {max} 字符", max = 2000)
+    private String projectIntroduce;
 
-    @ApiModelProperty(value = "公司信息股东结构(Excel文件)")
-    private String companyInfoShareholder;
+    @ApiModelProperty(value = "公司融资情况")
+    @Length(message = "公司融资情况不能超过个 {max} 字符", max = 2000)
+    private String pojectInvestment;
 
-    @ApiModelProperty(value = "申报人姓名")
-    private String declareName;
+    @ApiModelProperty(value = "公司专利技术及荣誉")
+    @Length(message = "公司专利技术及荣誉不能超过个 {max} 字符", max = 2000)
+    private String pojectHonor;
 
-    @ApiModelProperty(value = "申报人一寸免冠头像")
-    private String declareImage;
+    @ApiModelProperty(value = "2019年财务数据")
+    @Length(message = "2019年财务数据不能超过个 {max} 字符", max = 1000)
+    private String financialDataOne;
 
-    @ApiModelProperty(value = "申报人身份信息")
-    private String declareCard;
+    @ApiModelProperty(value = "2020年财务数据")
+    @Length(message = "2020年财务数据不能超过个 {max} 字符", max = 1000)
+    private String financialDataTwo;
 
-    @ApiModelProperty(value = "申报人出生日期")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date declareBirth;
+    @ApiModelProperty(value = "2021年财务数据")
+    @Length(message = "2021年财务数据不能超过个 {max} 字符", max = 1000)
+    private String financialDataThree;
 
-    @ApiModelProperty(value = "申报人所在城市")
-    private String declareCity;
+    @ApiModelProperty(value = "附件json")
+    @Length(message = "附件json不能超过个 {max} 字符", max = 5000)
+    private String attachment;
 
     @ApiModelProperty(value = "逻辑删除，0：未删除，1：已删除")
     private Integer deleted;

src/main/java/com/xdf/creative/module/service/impl/InnovationApplyServiceImpl.java

@@ -1,7 +1,6 @@
 package com.xdf.creative.module.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xdf.creative.base.params.creative.InnovationApplyQueryParam;
@@ -32,12 +31,12 @@ public class InnovationApplyServiceImpl extends BaseServiceImpl<InnovationApplyM
             lambdaQueryWrapper.eq(InnovationApply::getContestGroup, innovationApplyQueryParam.getContestGroup());
         }
         //公司中文全称
-        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getCompanyInfoName())) {
-            lambdaQueryWrapper.like(InnovationApply::getCompanyInfoName, innovationApplyQueryParam.getCompanyInfoName());
+        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getCompanyName())) {
+            lambdaQueryWrapper.like(InnovationApply::getCompanyName, innovationApplyQueryParam.getCompanyName());
         }
         //联系人姓名
-        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getProjectContactName())) {
-            lambdaQueryWrapper.like(InnovationApply::getProjectContactName, innovationApplyQueryParam.getProjectContactName());
+        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getContactsName())) {
+            lambdaQueryWrapper.like(InnovationApply::getContactsName, innovationApplyQueryParam.getContactsName());
         }
         return new PageTool<>(this.page(page, lambdaQueryWrapper));
     }