4/23 工单修改

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

@@ -133,7 +133,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
                 LambdaQueryWrapper<Monitor> monitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 monitorLambdaQueryWrapper.in(Monitor::getProductId, ids)
                         .eq(Monitor::getCreateId, personnelVO.getUuid())
-                        .eq(Monitor::getIfDelete,false);
+                        .eq(Monitor::getIfDelete, false);
                 monitors = monitorService.list(monitorLambdaQueryWrapper);
             }
         }
@@ -173,7 +173,11 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> {
             if (assoPersonProducts.size() != 0) {
                 AssoPersonProduct assoPersonProduct = assoPersonProducts.stream().filter(item -> item.getProductId().equals(productVO.getId())).findFirst().orElse(null);
                 if (assoPersonProduct != null) {
-                    productVO.setConcernType(assoPersonProduct.getConcernType());
+                    if (assoPersonProduct.getConcernType() == null) {
+                        productVO.setConcernType(-1);
+                    } else {
+                        productVO.setConcernType(assoPersonProduct.getConcernType());
+                    }
                 }
             }
 

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

@@ -2,6 +2,7 @@ package com.example.xiaoshiweixinback.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.business.utils.StringUtils;
 import com.example.xiaoshiweixinback.domain.TicketFillIn;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketFillInAddDTO;
 import com.example.xiaoshiweixinback.entity.vo.TicketFillInVO;
@@ -10,6 +11,8 @@ 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;
 
 /**
@@ -45,6 +48,12 @@ public class TicketFillInService extends ServiceImpl<TicketFillInMapper, TicketF
         TicketFillIn ticketFillIn = this.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);
+            }
         }
         return  ticketFillInVO;
     }

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

@@ -1,13 +1,17 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.business.common.base.SystemFile;
 import com.example.xiaoshiweixinback.domain.TicketRightsProtection;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketRightsProtectionAddDTO;
 import com.example.xiaoshiweixinback.entity.vo.TicketRightsProtectionVO;
 import com.example.xiaoshiweixinback.mapper.TicketRightsProtectionMapper;
+import com.example.xiaoshiweixinback.service.common.FileManagerService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -23,7 +27,8 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor
 public class TicketRightsProtectionService extends ServiceImpl<TicketRightsProtectionMapper, TicketRightsProtection> {
-
+    @Autowired
+    private FileManagerService fileManagerService;
     /**
      * 知识产权维权工单
      *
@@ -48,6 +53,22 @@ public class TicketRightsProtectionService extends ServiceImpl<TicketRightsProte
         rightsProtectionWrapper.eq(TicketRightsProtection::getTicketId, ticketId);
         TicketRightsProtection ticketRightsProtection = this.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);
         }
         return  rightsProtectionVO;