5/15 ticket

src/main/java/com/example/xiaoshiweixinback/domain/TicketFillIn.java

@@ -32,4 +32,6 @@ public class TicketFillIn extends BaseEntity<TicketFillIn> {
     private Boolean patentExport;
 
     private String description;
+
+    private String patentNo;
 }

src/main/java/com/example/xiaoshiweixinback/domain/TicketRightsProtection.java

@@ -43,12 +43,17 @@ public class TicketRightsProtection extends BaseEntity<TicketRightsProtection> {
     private String tortClassify;
 
     /**
-     * 是否拥有专利
+     * 是否拥有权利证明
      */
-    private Boolean ifHavePatent;
+    private Boolean ifHaveRightProof;
 
     /**
-     * 专利号
+     * 权利证明文件
+     */
+    private String rightProof;
+
+    /**
+     * 权利证明号码
      */
     private String patentNo;
 

src/main/java/com/example/xiaoshiweixinback/entity/dto/ticket/TicketFillInAddDTO.java

@@ -2,6 +2,8 @@ package com.example.xiaoshiweixinback.entity.dto.ticket;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 填写工单DTO
  * @Author xiexiang
@@ -25,4 +27,6 @@ public class TicketFillInAddDTO {
     private Boolean patentExport;
 
     private String description;
+
+    private List<String> patentNos;
 }

src/main/java/com/example/xiaoshiweixinback/entity/dto/ticket/TicketRightsProtectionAddDTO.java

@@ -2,6 +2,8 @@ package com.example.xiaoshiweixinback.entity.dto.ticket;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 知识产权维权DTO
  * @Author xiexiang
@@ -35,16 +37,21 @@ public class TicketRightsProtectionAddDTO {
     private String tortClassify;
 
     /**
-     * 是否拥有专利
+     * 是否拥有权利证明
      */
-    private Boolean ifHavePatent;
+    private Boolean ifHaveRightProof;
 
     /**
-     * 专利号
+     * 权利证明号码
      */
     private String patentNo;
 
     /**
+     * 权利证明文件
+     */
+    private List<String> proofGuids;
+
+    /**
      * 描述问题
      */
     private String problemDescription;

src/main/java/com/example/xiaoshiweixinback/entity/vo/TicketFillInVO.java

@@ -2,6 +2,8 @@ package com.example.xiaoshiweixinback.entity.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 填写表单VO
  * @Author xiexiang
@@ -30,4 +32,6 @@ public class TicketFillInVO {
     private Boolean patentExport;
 
     private String description;
+
+    private List<String> patentNos;
 }

src/main/java/com/example/xiaoshiweixinback/entity/vo/TicketRightsProtectionVO.java

@@ -1,9 +1,13 @@
 package com.example.xiaoshiweixinback.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.example.xiaoshiweixinback.business.common.base.SystemFile;
 import com.example.xiaoshiweixinback.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 知识产权维权工单
  * @Author xiexiang
@@ -42,9 +46,14 @@ public class TicketRightsProtectionVO {
     private String tortClassify;
 
     /**
-     * 是否拥有专利
+     * 是否拥有权利证明
+     */
+    private Boolean ifHaveRightProof;
+
+    /**
+     * 权利证明
      */
-    private Boolean ifHavePatent;
+    private String rightProof;
 
     /**
      * 专利号
@@ -52,6 +61,14 @@ public class TicketRightsProtectionVO {
     private String patentNo;
 
     /**
+     * 图片集合
+     */
+    private List<String> proofGuids;
+
+    @Schema(description = "文件信息")
+    private List<SystemFile> proofFileList;
+
+    /**
      * 描述问题
      */
     private String problemDescription;

src/main/java/com/example/xiaoshiweixinback/service/TicketFillInService.java

@@ -10,6 +10,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 填写工单Service
  * @Author xiexiang
@@ -27,6 +29,11 @@ public class TicketFillInService extends ServiceImpl<TicketFillInMapper, TicketF
     public Integer add(TicketFillInAddDTO ticketFillInAddDTO){
         TicketFillIn ticketFillIn = new TicketFillIn();
         BeanUtils.copyProperties(ticketFillInAddDTO, ticketFillIn);
+        List<String> patentNos = ticketFillInAddDTO.getPatentNos();
+        if (patentNos != null && !patentNos.isEmpty()) {
+            String patentNo = String.join(",", patentNos);
+            ticketFillIn.setPatentNo(patentNo);
+        }
         ticketFillIn.insert();
         return ticketFillIn.getTicketId();
     }

src/main/java/com/example/xiaoshiweixinback/service/TicketRightsProtectionService.java

@@ -10,6 +10,10 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 知识产权维权工单Service
  *
@@ -29,6 +33,11 @@ public class TicketRightsProtectionService extends ServiceImpl<TicketRightsProte
     public Integer add(TicketRightsProtectionAddDTO ticketRightsProtectionAddDTO) {
         TicketRightsProtection ticketRightsProtection = new TicketRightsProtection();
         BeanUtils.copyProperties(ticketRightsProtectionAddDTO, ticketRightsProtection);
+        List<String> proofGuids = ticketRightsProtectionAddDTO.getProofGuids();
+        if (!proofGuids.isEmpty()) {
+            String rightProof = String.join(",", proofGuids);
+            ticketRightsProtection.setRightProof(rightProof);
+        }
         ticketRightsProtection.insert();
         return ticketRightsProtection.getTicketId();
     }

src/main/java/com/example/xiaoshiweixinback/service/TicketService.java

@@ -1,5 +1,6 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@ import com.example.xiaoshiweixinback.business.exception.BusinessException;
 import com.example.xiaoshiweixinback.business.utils.BatchNoUtil;
 import com.example.xiaoshiweixinback.business.utils.CacheUtil;
 import com.example.xiaoshiweixinback.business.utils.LoginUtils;
+import com.example.xiaoshiweixinback.business.utils.StringUtils;
 import com.example.xiaoshiweixinback.domain.*;
 import com.example.xiaoshiweixinback.entity.dto.ticket.*;
 import com.example.xiaoshiweixinback.entity.vo.*;
@@ -26,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -208,6 +211,12 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
                         TicketFillIn ticketFillIn = ticketFillInService.getOne(fillInWrapper, false);
                         if (ticketFillIn != null) {
                             BeanUtils.copyProperties(ticketFillIn, ticketFillInVO);
+                            String patentNoArray = ticketFillIn.getPatentNo();
+                            if (patentNoArray != null && StringUtils.isNotEmpty(patentNoArray)) {
+                                String[] stringArray = patentNoArray.split(",");
+                                List<String> patentNos = new ArrayList<>(Arrays.asList(stringArray));
+                                ticketFillInVO.setPatentNos(patentNos);
+                            }
                         }
                         ticketVO.setTicketFillInVO(ticketFillInVO);
                         break;
@@ -217,6 +226,22 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
                         rightsProtectionWrapper.eq(TicketRightsProtection::getTicketId, ticketId);
                         TicketRightsProtection ticketRightsProtection = ticketRightsProtectionService.getOne(rightsProtectionWrapper, false);
                         if (ticketRightsProtection != null) {
+                            String rightProof = ticketRightsProtection.getRightProof();
+                            String[] stringArray = rightProof.split(",");
+                            List<String> proofGuids = new ArrayList<>(Arrays.asList(stringArray));
+                            List<SystemFile> systemFiles = new ArrayList<>();
+                            if (proofGuids.size() != 0) {
+                                try {
+                                    String res = fileManagerService.getSystemFileFromFMS(proofGuids);
+                                    systemFiles = JSONObject.parseArray(res, SystemFile.class);
+                                    if (systemFiles == null) {
+                                        systemFiles = new ArrayList<>();
+                                    }
+                                } catch (Exception e) {
+                                }
+                            }
+                            rightsProtectionVO.setProofGuids(proofGuids);
+                            rightsProtectionVO.setProofFileList(systemFiles);
                             BeanUtils.copyProperties(ticketRightsProtection, rightsProtectionVO);
                         }
                         ticketVO.setTicketRightsProtectionVO(rightsProtectionVO);