增删 2022/11/22

RMS/src/main/java/cn/cslg/report/controller/InvalidRecordController.java

@@ -2,6 +2,7 @@ package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.LitigationHistory;
 import cn.cslg.report.service.business.InvalidRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,7 +36,12 @@ public class InvalidRecordController {
     public String deleInvalidRecord(int id)throws IOException{
         return invalidRecordService.deleteInvalidRecord(id);
     }
-
+    @PostMapping(value = "/queryInvalidRecord")
+    @Operation(summary = "查询无效记录")
+    @Transactional(rollbackFor = Exception.class)
+    public String queryInvalidRecord(@RequestBody InvalidRecord invalidRecord)throws IOException{
+        return invalidRecordService.queryInvalidRecord(invalidRecord);
+    }
 
 
 }

RMS/src/main/java/cn/cslg/report/controller/ReviewHistoryController.java

@@ -0,0 +1,48 @@
+package cn.cslg.report.controller;
+
+import cn.cslg.report.common.core.base.Constants;
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.ReviewHistory;
+import cn.cslg.report.service.business.InvalidRecordService;
+import cn.cslg.report.service.business.ReviewHistoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+
+@Tag(name = "无效记录")
+@RestController
+@RequestMapping(Constants.REPORT_API + "/reviewHistory")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ReviewHistoryController {
+    public final ReviewHistoryService reviewHistoryService;
+    @RequestMapping(value = "/addReviewHistory", method = RequestMethod.POST)
+    @Operation(summary = "增加审查历史")
+    public  String addInvalidRecord(ReviewHistory reviewHistory) throws IOException{
+        return reviewHistoryService.addReviewHistory(reviewHistory);
+    }
+    @RequestMapping(value = "/updateReviewHistory", method = RequestMethod.POST)
+    @Operation(summary = "修改审查历史")
+    @Transactional(rollbackFor = Exception.class)
+    public String updateInvalidRecord(ReviewHistory reviewHistory)throws IOException{
+        return reviewHistoryService.updateReviewHistory(reviewHistory);
+
+    }
+    @GetMapping(value = "/deleReviewHistory")
+    @Operation(summary = "删除审查历史")
+    public String deleInvalidRecord(int id)throws IOException{
+        return reviewHistoryService.deleteReviewHistory(id);
+    }
+    @PostMapping(value = "/queryReviewHistory")
+    @Operation(summary = "查询审查历史")
+    @Transactional(rollbackFor = Exception.class)
+    public String queryInvalidRecord(@RequestBody ReviewHistory reviewHistory)throws IOException{
+        return reviewHistoryService.queryReviewHistory(reviewHistory);
+    }
+
+
+}

RMS/src/main/java/cn/cslg/report/entity/InvalidRecord.java

@@ -19,10 +19,12 @@ import lombok.experimental.Accessors;
 public class InvalidRecord extends BaseEntity<InvalidRecord> {
     /**
      * 专利号
+     */
+     @TableField(value = "PATENT_NO")
+     private String patentNo;
+
 
 
-    @TableField(value = "PATENT_NO")
-    private String patentNo;
 
     /**
      * 无效申请人

RMS/src/main/java/cn/cslg/report/entity/References.java

@@ -0,0 +1,79 @@
+package cn.cslg.report.entity;
+
+import cn.cslg.report.common.model.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 无效记录表
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "REFERENCES")
+public class References extends BaseEntity<References> {
+    /**
+     * 专利号
+     */
+     @TableField(value = "PATENT_NO")
+     private String patentNo;
+
+
+
+
+    /**
+     * 无效申请人
+     */
+    @Schema(description = "无效申请人")
+    @TableField(value = "REFERENCES_NAME")
+    private String referencesName;
+
+    /**
+     * 无效申请人ID
+     */
+    @Schema(description = "无效申请人ID")
+    @TableField(value = "PERSON_ID")
+    private String personId;
+
+    /**
+     * 无效时间
+     */
+    @Schema(description = "无效时间")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @TableField(value = "无效时间")
+    private String invalidTime;
+
+    /**
+     * 判决时间
+     */
+    @Schema(description = "判决时间")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @TableField(value = "JUDGMENT_TIME")
+    private String judgmentTime;
+
+    /**
+     * 结果
+     */
+    @Schema(description = "结果")
+    @TableField(value = "RESULT")
+    private String resultS;
+
+    /**
+     * 文件ID
+     */
+    @Schema(description = "文件ID")
+    @TableField(value = "FILE_ID")
+    private String fileId;
+
+    /**
+     * 所属报告ID
+     */
+    @Schema(description = "所属报告ID")
+    @TableField(value = "REPORT_ID")
+    private String reportId;
+}

RMS/src/main/java/cn/cslg/report/entity/ReviewHistory.java

@@ -44,4 +44,10 @@ public class ReviewHistory extends BaseEntity<ReviewHistory> {
      */
     @TableField(value = "REPORT_ID")
     private String reportId;
+    /**
+     * 专利号
+     */
+    @TableField(value = "PATENT_NO")
+    private String patentNo;
+
 }

RMS/src/main/java/cn/cslg/report/entity/Task.java

@@ -131,4 +131,11 @@ public class Task extends BaseEntity<Task> {
     @Schema(description = "结果")
     @TableField(value = "RESULT")
     private Integer result;
+
+    /**
+     * 标的专利/产品号
+     */
+    @Schema(description="标的专利号",required = true)
+    @TableField(value = "SIGN_PATENT_NO")
+    private String signPatentNo;
 }

RMS/src/main/java/cn/cslg/report/mapper/ReviewHistoryMapper.java

@@ -0,0 +1,13 @@
+package cn.cslg.report.mapper;
+
+import cn.cslg.report.entity.Features;
+import cn.cslg.report.entity.ReviewHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ReviewHistoryMapper extends BaseMapper<ReviewHistory> {
+}

RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java

@@ -5,6 +5,7 @@ import cn.cslg.report.entity.ImportTask;
 import cn.cslg.report.entity.InvalidRecord;
 import cn.cslg.report.mapper.ImportTaskMapper;
 import cn.cslg.report.mapper.InvalidRecordMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,7 +17,7 @@ import java.io.IOException;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
-public class InvalidRecordService  extends ServiceImpl<ImportTaskMapper, ImportTask> {
+public class InvalidRecordService  extends ServiceImpl<InvalidRecordMapper,InvalidRecord> {
     public final InvalidRecordMapper invalidRecordMapper;
 
     public String deleteInvalidRecord(int id) throws IOException {
@@ -33,4 +34,12 @@ public class InvalidRecordService  extends ServiceImpl<ImportTaskMapper, ImportT
         invalidRecord.insert();
         return Response.success();
     }
+
+    public String queryInvalidRecord(InvalidRecord invalidRecord){
+        LambdaQueryWrapper<InvalidRecord> wrapper =new LambdaQueryWrapper<>();
+        wrapper.eq(InvalidRecord::getPatentNo,invalidRecord.getPatentNo());
+       return Response.success(this.list(wrapper));
+    }
+
+
 }

RMS/src/main/java/cn/cslg/report/service/business/ReviewHistoryService.java

@@ -0,0 +1,44 @@
+package cn.cslg.report.service.business;
+
+import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.entity.InvalidRecord;
+import cn.cslg.report.entity.ReviewHistory;
+import cn.cslg.report.mapper.InvalidRecordMapper;
+import cn.cslg.report.mapper.ReviewHistoryMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, ReviewHistory> {
+
+    public String deleteReviewHistory(int id) throws IOException {
+        this.removeById(id);
+        return Response.success();
+    }
+
+    public String updateReviewHistory(ReviewHistory reviewHistory)  {
+        reviewHistory.updateById();
+        return Response.success();
+    }
+
+    public String addReviewHistory(ReviewHistory reviewHistory) throws IOException {
+        reviewHistory.insert();
+        return Response.success();
+    }
+
+    public String queryReviewHistory(ReviewHistory reviewHistory){
+        LambdaQueryWrapper<ReviewHistory> wrapper =new LambdaQueryWrapper<>();
+        wrapper.eq(ReviewHistory::getPatentNo,reviewHistory.getPatentNo());
+       return Response.success(this.list(wrapper));
+    }
+
+
+}

RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -177,7 +177,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     //添加分配任务
     @Transactional(rollbackFor = Exception.class)
     public String addAssTask(AssignTaskVO assignTaskVO) throws ParseException, IOException {
-
+         LambdaQueryWrapper<Report> wrapper1 =new LambdaQueryWrapper<>();
+         wrapper1.select(Report::getSignPatentNo);
+         wrapper1.eq(Report::getId,assignTaskVO.getReportId());
+        String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
 
 
         //遍历assignTaskVO的分配人员信息assigns，在任务表里插入分配任务
@@ -232,7 +235,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
             task.setHandlePersonName(personnel.getPersonnelName());
             task.setCreateID(personnelVO.getId());
             task.setCreateName(personnelVO.getName());
-            //task.setCreateID();
+            task.setSignPatentNo(signPatentNO);
             task.insert();
             //根据数量从分配的专利号列表中截取该数量的专利号，加上分配信息的专利号进行装配
             List<String> partNos = patentNos.subList(flag, flag+personPatents.get(i).getAssignCount()-1);