xiexiang 1 năm trước cách đây
mục cha
commit
e078005265

+ 23 - 3
src/main/java/cn/cslg/pas/domain/business/PatentDigProject.java

@@ -18,16 +18,22 @@ import lombok.Data;
 @TableName("patent_dig_project")
 public class PatentDigProject extends BaseEntity<PatentDigProject> {
     /**
+     * 名称
+     */
+    @TableField(value = "name")
+    private String name;
+
+    /**
      * 项目id
      */
     @TableField(value = "project_id")
-    private String project_id;
+    private Integer project_id;
 
     /**
      * 研发项目id
      */
     @TableField(value = "rd_project_id")
-    private  Integer rdProjectId;
+    private Integer rdProjectId;
 
     /**
      * 产出
@@ -65,7 +71,21 @@ public class PatentDigProject extends BaseEntity<PatentDigProject> {
     @TableField(value = "technicalKeyword")
     private String technicalKeyword;
 
+    /**
+     *
+     */
+    @TableField(value = "process")
+    private String process;
 
+    /**
+     *
+     */
+    @TableField(value = "state")
+    private Integer state;
 
-
+    /**
+     * 租户
+     */
+    @TableField(value = "tenant_id")
+    private Integer tenantId;
 }

+ 15 - 9
src/main/java/cn/cslg/pas/domain/business/PatentDigProjectFiles.java

@@ -5,7 +5,8 @@ import cn.cslg.pas.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import org.joda.time.DateTime;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -20,10 +21,11 @@ import org.joda.time.DateTime;
 public class PatentDigProjectFiles extends BaseEntity<PatentDigProjectFiles> {
 
     /**
-     * 名称
+     * 文件名称
      */
     @TableField(value = "name")
     private String name;
+
     /**
      * 项目id
      */
@@ -54,30 +56,34 @@ public class PatentDigProjectFiles extends BaseEntity<PatentDigProjectFiles> {
     @TableField(value = "if_final")
     private Boolean ifFinal;
 
-
     /**
      * 发生时间
      */
     @TableField(value = "eventDate")
-    private DateTime event_date;
+    private Date event_date;
 
     /**
-     * 类型
+     * 文件类型
      */
     @TableField(value = "type")
     private Integer type;
+
     /**
      * 描述
      */
     @TableField(value = "description")
     private String description;
 
-
+    /**
+     * 创建人
+     */
     @TableField(value = "create_id")
-    private Integer createId;
-
+    private String createId;
 
+    /**
+     * 创建时间
+     */
     @TableField(value = "create_time")
-    private DateTime createTime;
+    private Date createTime;
 
 }

+ 11 - 4
src/main/java/cn/cslg/pas/domain/business/RdProject.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 /**
  * <p>
  * 研发项目
@@ -28,19 +30,24 @@ public class RdProject extends BaseEntity<RdProject> {
      * 租户id
      */
     @TableField(value = "tenant_id")
-    private String tenantId;
+    private Integer tenantId;
 
     /**
      * 编号
      */
     @TableField(value = "number")
-    private  String number;
+    private String number;
 
+    /**
+     * 创建人
+     */
     @TableField(value = "create_id")
     private String createId;
 
-
+    /**
+     * 创建时间
+     */
     @TableField(value = "create_time")
-    private DateTime createTime;
+    private Date createTime;
 
 }

+ 55 - 0
src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -0,0 +1,55 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.common.model.request.GroupRequest;
+import cn.cslg.pas.common.model.request.QueryRequest;
+import cn.cslg.pas.domain.business.PatentDigProjectFiles;
+import cn.cslg.pas.factorys.businessFactory.Business;
+import cn.cslg.pas.mapper.PatentDigProjectFilesMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/11/8
+ */
+@Service
+public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFilesMapper, PatentDigProjectFiles> implements Business {
+    @Override
+    public Object queryMessage(QueryRequest queryRequest) throws Exception {
+        return null;
+    }
+
+    @Override
+    public Object addMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
+
+    @Override
+    public Object deleteMessage(List<Integer> ids) throws IOException {
+        return null;
+    }
+
+    @Override
+    public Object updateMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
+
+    @Override
+    public Object getGroup(GroupRequest groupRequest, String tableName) throws Exception {
+        return null;
+    }
+
+    @Override
+    public Object addMessage(Object object) {
+        return null;
+    }
+
+    @Override
+    public Object updateMessage(Object object) {
+        return null;
+    }
+}

+ 2 - 0
src/main/java/cn/cslg/pas/service/business/PatentDigProjectService.java

@@ -7,11 +7,13 @@ import cn.cslg.pas.factorys.businessFactory.Business;
 
 import cn.cslg.pas.mapper.PatentDigProjectMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
 
+@Service
 public class PatentDigProjectService  extends ServiceImpl<PatentDigProjectMapper, PatentDigProject> implements Business {
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {

+ 14 - 0
src/main/java/cn/cslg/pas/service/business/RdProjectService.java

@@ -0,0 +1,14 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.domain.business.RdProject;
+import cn.cslg.pas.mapper.RdProjectMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author xiexiang
+ * @Date 2023/11/8
+ */
+@Service
+public class RdProjectService extends ServiceImpl<RdProjectMapper, RdProject> {
+}