代码合并

RMS/pom.xml

@@ -178,6 +178,10 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
 
     </dependencies>
 

RMS/src/main/java/cn/cslg/report/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        return new ServerEndpointExporter();
+//    }
 }

RMS/src/main/java/cn/cslg/report/common/utils/SecurityUtils/LoginUtils.java

@@ -16,7 +16,6 @@ import java.util.Objects;
 public class LoginUtils {
     @Resource
     private RedisUtil redisUtil;
-
     public static String getToken() {
         RequestAttributes ra = RequestContextHolder.getRequestAttributes();
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;

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

@@ -159,7 +159,7 @@ public class ReportController {
     @GetMapping(value = "/reReportDetail")
     @Operation(summary = "返回报告详情")
     @Transactional(rollbackFor = Exception.class)
-    public String addConclusions(Integer reportId) throws IOException {
+    public String reReportDetail(Integer reportId) throws IOException {
         ReportDeVO reportDeDTO = reportService.reReportDetail(reportId);
         if (reportDeDTO == null) {
             return Response.error("报告不存在");

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

@@ -0,0 +1,24 @@
+package cn.cslg.report.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 后续事项
+ *
+ * @Author xiexiang
+ * @Date 2023/3/31
+ */
+@Accessors(chain = true)
+@Data
+public class ValueObject {
+
+
+    private List<String> prosecutor;
+    private List<String> respondent;
+    private List<String> institution;
+    private List<String> court;
+}

RMS/src/main/java/cn/cslg/report/service/business/InvalidReReport/InvalidReasonService.java

@@ -141,7 +141,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
             invalidReason.setCreateId(personnelVO.getId());
             //说明书公开不充分入表
             invalidReason.insert();
-        } else if (invalidName.equals(0)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
+        } else if (invalidName.equals(0)||invalidName.equals(5)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
                 if (invalidReasonDTO.getInvalidName() == 1) {
                     invalidReasonDTO.setContent(-1);
                 }
@@ -282,7 +282,7 @@ public class InvalidReasonService extends ServiceImpl<InvalidReasonMapper, Inval
             //说明书公开不充分入表
             invalidReason.setContent(-1);
             invalidReason.updateById();
-        } else if (invalidName.equals(0)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
+        } else if (invalidName.equals(0)||invalidName.equals(5)) {//若类型为0，则为“权利要求不清楚”，需要选择涉及内容（content）并输入相关证据（proofStr）
             if (invalidReasonDTO.getProofStr() != null && invalidReasonDTO.getProofStr() != "") {
                 if (invalidReasonDTO.getInvalidName() == 1) {
                     invalidReasonDTO.setContent(-1);

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

@@ -833,8 +833,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         reports.add(report);
         try {
             //调用this.reportData装载报告
-            List<Report> reports1 = this.reportData(reports);
-            Report report1 = reports1.get(0);
+//            List<Report> reports1 = this.reportData(reports);
+            Report report1 = reports.get(0);
             //若报告为无效应对报告则从无效应对报告表中获得无效对应报告拓展信息
             if (report1.getType().equals(7)) {
                 LambdaQueryWrapper<InvalidReReport> queryWrapper = new LambdaQueryWrapper<>();
@@ -850,7 +850,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 BeanUtils.copyProperties(report1, reportDeVO);
             }
             reportDeVO.setId(report.getId());
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return reportDeVO;

RMS/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prodNetIn
   jackson:
     default-property-inclusion: non_null
     serialization: