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

src/main/filter/dev_filter.properties

@@ -1,8 +1,8 @@
 log_level=debug
 #db1\u6570\u636E\u5E93
-jdbc_url=jdbc:mysql://127.0.0.1:3306/dfzx_wch?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+jdbc_url=jdbc:mysql://192.168.18.148:3306/dfzx_wch?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
 jdbc_username=root
-jdbc_password=123456
+jdbc_password=hhr2016
 
 
 #redis
@@ -20,11 +20,11 @@ upload_basePath_tmp=D:/xdf_image/xdf/dfzx_tmp/
 wx_basePath=wx/
 
 
-server-url-prefix: http://server.sso.com:8080/cas  #CAS砐醴華硊
-server-login-url: http://server.sso.com:8080/cas/login #CAS腎翹華硊
-client-host-url: http://app.tyrz.com:8993/  #掛砐醴華硊
+server-url-prefix: http://server.sso.com:8080/cas  #CAS嚙踝蕭醴嚙踝蕭硊
+server-login-url: http://server.sso.com:8080/cas/login #CAS嚙踝蕭翹嚙踝蕭硊
+client-host-url: http://app.tyrz.com:8993/  #嚙踝蕭嚙踝蕭醴嚙踝蕭硊
 
-#ゴ傷砐醴豖堤華硊
+#ゴ嚙踝蕭嚙踝蕭醴嚙誼喉蕭嚙踝蕭硊
 client-host-home-url: http://192.168.1.176:8000
 client-host-logout-url: http://192.168.1.176:8002
 client-host-logout-back-url: http://192.168.1.176:8005

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

@@ -32,17 +32,23 @@ public class InnovationApplyQueryParam extends QueryParam {
     @ApiModelProperty(value = "ID")
     private Integer id;
 
-    @ApiModelProperty(value = "报名选组")
-    private String enrollGroup;
+    @ApiModelProperty(value = "国家城市")
+    private String countryCity;
 
     @ApiModelProperty(value = "参赛组别")
     private String contestGroup;
 
-    @ApiModelProperty(value = "国家城市")
-    private String countryCity;
+    @ApiModelProperty(value = "项目名称")
+    private String projectInfoName;
+
+    @ApiModelProperty(value = "项目概述")
+    private String projectInfoSummary;
 
-    @ApiModelProperty(value = "项目基本信息")
-    private String projectInfo;
+    @ApiModelProperty(value = "项目产品和服务特点")
+    private String projectInfoCharacteristic;
+
+    @ApiModelProperty(value = "项目投资价值")
+    private String projectInfoInvestment;
 
     @ApiModelProperty(value = "文件资料")
     private String fileAttachment;
@@ -50,14 +56,53 @@ public class InnovationApplyQueryParam extends QueryParam {
     @ApiModelProperty(value = "补充资料")
     private String supplementAttachment;
 
-    @ApiModelProperty(value = "联系人")
-    private String liaisonMan;
+    @ApiModelProperty(value = "项目联系人姓名")
+    private String projectContactName;
+
+    @ApiModelProperty(value = "项目联系人公司")
+    private String projectContactCompany;
+
+    @ApiModelProperty(value = "项目联系人地址")
+    private String projectContactAddress;
+
+    @ApiModelProperty(value = "项目联系人职位")
+    private String projectContactPosition;
+
+    @ApiModelProperty(value = "项目联系人手机")
+    private String projectContactPhone;
+
+    @ApiModelProperty(value = "项目联系人邮箱")
+    private String projectContactEmail;
+
+    @ApiModelProperty(value = "项目联系人微信")
+    private String projectContactWechat;
+
+    @ApiModelProperty(value = "公司信息中文全称")
+    private String companyInfoName;
+
+    @ApiModelProperty(value = "公司信息成立时间")
+    private Date companyInfoCreatime;
+
+    @ApiModelProperty(value = "公司信息注册地址")
+    private String companyInfoAddress;
+
+    @ApiModelProperty(value = "公司信息股东结构(Excel文件)")
+    private String companyInfoShareholder;
+
+    @ApiModelProperty(value = "申报人姓名")
+    private String declareName;
+
+    @ApiModelProperty(value = "申报人一寸免冠头像")
+    private String declareImage;
+
+    @ApiModelProperty(value = "申报人身份信息")
+    private String declareCard;
 
-    @ApiModelProperty(value = "公司信息")
-    private String companyInfo;
+    @ApiModelProperty(value = "申报人出生日期")
+    private Date declareBirth;
 
-    @ApiModelProperty(value = "申报人")
-    private String declareMan;
+    @ApiModelProperty(value = "申报人所在城市")
+    private String declareCity;
 
     @ApiModelProperty(value = "逻辑删除，0：未删除，1：已删除")
     private Integer deleted;

src/main/java/com/xdf/creative/enums/ServiceFileDirEnum.java

@@ -17,6 +17,8 @@ public enum ServiceFileDirEnum {
     SERVICE_FILE_DIR_PUBLIC_ACTIVITY(109, "activity"),
     SERVICE_FILE_DIR_PUBLIC_QR(110, "wxqr"),
     SERVICE_FILE_DIR_PUBLIC_APPLY(113, "apply"),
+    //创新创页大赛
+    SERVICE_FILE_DIR_PUBLIC_INNOVATION(114, "innovationApply"),
     //其他
     SERVICE_FILE_DIR_OTHER(999, "other");
 

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

@@ -29,8 +29,8 @@ public class InnovationApplyController {
     /**
      * 添加报名通道表
      */
-    @GetMapping("/getInfoInnovationApplyPageList")
-    @ApiOperation(value = "添加innovationApply对象", notes = "添加报名通道表", response = ApiResult.class)
+    @PostMapping("/getInfoInnovationApplyPageList")
+    @ApiOperation(value = "查询innovationApply对象", notes = "查询报名通道表", response = ApiResult.class)
     public ApiResult<Boolean> getInfoInnovationApplyPageList(@RequestBody InnovationApplyQueryParam innovationApplyQueryParam) {
         PageTool<InnovationApply> innovationApplyPageList = innovationApplyService.getInfoInnovationApplyPageList(innovationApplyQueryParam);
         return ApiResult.ok(innovationApplyPageList);

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

@@ -1,19 +1,17 @@
 package com.xdf.creative.module.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-
-import com.xdf.creative.base.params.QueryParam;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -35,32 +33,84 @@ public class InnovationApply implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty(value = "报名选组")
-    private String enrollGroup;
+    @ApiModelProperty(value = "国家城市")
+    private String countryCity;
 
     @ApiModelProperty(value = "参赛组别")
     private String contestGroup;
 
-    @ApiModelProperty(value = "国家城市")
-    private String countryCity;
+    @ApiModelProperty(value = "项目名称")
+    private String projectInfoName;
+
+    @ApiModelProperty(value = "项目概述")
+    private String projectInfoSummary;
 
-    @ApiModelProperty(value = "项目基本信息")
-    private String projectInfo;
+    @ApiModelProperty(value = "项目产品和服务特点")
+    private String projectInfoCharacteristic;
 
-    @ApiModelProperty(value = "文件资料")
-    private String fileAttachment;
+    @ApiModelProperty(value = "项目投资价值")
+    private String projectInfoInvestment;
+
+    @ApiModelProperty(value = "商业计划书")
+    private String businessPlanAttachment;
+
+    @ApiModelProperty(value = "营业执照")
+    private String businessLicenseAttachment;
 
     @ApiModelProperty(value = "补充资料")
     private String supplementAttachment;
 
-    @ApiModelProperty(value = "联系人")
-    private String liaisonMan;
+    @ApiModelProperty(value = "项目联系人姓名")
+    private String projectContactName;
+
+    @ApiModelProperty(value = "项目联系人公司")
+    private String projectContactCompany;
+
+    @ApiModelProperty(value = "项目联系人地址")
+    private String projectContactAddress;
+
+    @ApiModelProperty(value = "项目联系人职位")
+    private String projectContactPosition;
+
+    @ApiModelProperty(value = "项目联系人手机")
+    private String projectContactPhone;
+
+    @ApiModelProperty(value = "项目联系人邮箱")
+    private String projectContactEmail;
+
+    @ApiModelProperty(value = "项目联系人微信")
+    private String projectContactWechat;
+
+    @ApiModelProperty(value = "公司信息中文全称")
+    private String companyInfoName;
+
+    @ApiModelProperty(value = "公司信息成立时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date companyInfoCreatime;
+
+    @ApiModelProperty(value = "公司信息注册地址")
+    private String companyInfoAddress;
+
+    @ApiModelProperty(value = "公司信息股东结构(Excel文件)")
+    private String companyInfoShareholder;
+
+    @ApiModelProperty(value = "申报人姓名")
+    private String declareName;
+
+    @ApiModelProperty(value = "申报人一寸免冠头像")
+    private String declareImage;
+
+    @ApiModelProperty(value = "申报人身份信息")
+    private String declareCard;
 
-    @ApiModelProperty(value = "公司信息")
-    private String companyInfo;
+    @ApiModelProperty(value = "申报人出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date declareBirth;
 
-    @ApiModelProperty(value = "申报人")
-    private String declareMan;
+    @ApiModelProperty(value = "申报人所在城市")
+    private String declareCity;
 
     @ApiModelProperty(value = "逻辑删除，0：未删除，1：已删除")
     private Integer deleted;

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

@@ -1,5 +1,8 @@
 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;
 import com.xdf.creative.base.service.impl.BaseServiceImpl;
@@ -23,6 +26,19 @@ public class InnovationApplyServiceImpl extends BaseServiceImpl<InnovationApplyM
     @Override
     public PageTool<InnovationApply> getInfoInnovationApplyPageList(InnovationApplyQueryParam innovationApplyQueryParam) {
         Page page = setPageParam(innovationApplyQueryParam);
-        return new PageTool<>(this.page(page, null));
+        LambdaQueryWrapper<InnovationApply> lambdaQueryWrapper = new LambdaQueryWrapper();
+        //参赛组别
+        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getContestGroup())) {
+            lambdaQueryWrapper.eq(InnovationApply::getContestGroup, innovationApplyQueryParam.getContestGroup());
+        }
+        //公司中文全称
+        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getCompanyInfoName())) {
+            lambdaQueryWrapper.like(InnovationApply::getCompanyInfoName, innovationApplyQueryParam.getCompanyInfoName());
+        }
+        //联系人姓名
+        if (ObjectUtils.isNotEmpty(innovationApplyQueryParam.getProjectContactName())) {
+            lambdaQueryWrapper.like(InnovationApply::getProjectContactName, innovationApplyQueryParam.getProjectContactName());
+        }
+        return new PageTool<>(this.page(page, lambdaQueryWrapper));
     }
 }

src/main/java/com/xdf/creative/util/file/ServerUploadDirUtil.java

@@ -32,6 +32,9 @@ public class ServerUploadDirUtil {
             case 110:
                 uploadDir =ServiceFileDirEnum.SERVICE_FILE_DIR_PUBLIC_QR.getName();
                 break;
+            case 114:
+                uploadDir = ServiceFileDirEnum.SERVICE_FILE_DIR_PUBLIC_INNOVATION.getName();
+                break;
             case 999:
                 uploadDir = ServiceFileDirEnum.SERVICE_FILE_DIR_OTHER.getName();
                 break;