4/9 ticket

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

@@ -19,16 +19,6 @@ public class Ticket extends BaseEntity<Ticket> {
     private Integer id;
 
     /**
-     *
-     */
-    private String name;
-
-    /**
-     *
-     */
-    private String contentText;
-
-    /**
      * 工单类型
      */
     private Integer ticketType;

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

@@ -27,11 +27,21 @@ public class TicketLitigationResponding extends BaseEntity<TicketLitigationRespo
     private String complainAdin;
 
     /**
+     * 投诉方站点
+     */
+    private String complainAdinSite;
+
+    /**
      * 被投诉方ADIN号
      */
     private String complainedAdin;
 
     /**
+     * 被投诉方站点
+     */
+    private String complainedAdinSite;
+
+    /**
      * 商品是否原创
      */
     private Boolean ifOriginal;

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

@@ -28,6 +28,11 @@ public class TicketRightsProtection extends BaseEntity<TicketRightsProtection> {
     private String tortStoreAdin;
 
     /**
+     * 侵权店铺站点
+     */
+    private String tortStoreAdinSite;
+
+    /**
      * 侵权类型
      */
     private String tortType;

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

@@ -13,125 +13,47 @@ public class TicketDTO {
     private Integer id;
 
     /**
-     *
-     */
-    private String name;
-
-    /**
-     *
-     */
-    private String contentText;
-
-    /**
      * 工单类型  1.填写工单  2.知识产权维权  3.知识产权应诉  4.我要申请专利
      */
     private Integer ticketType;
 
-
-    private String num;
-
-    /**
-     * 创建人
-     */
-    private String createId;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 专利无法导出？
-     */
-    private Boolean patentExport;
-
-    /**
-     * 侵权店铺ADIN号
-     */
-    private String tortStoreAdin;
-
-    /**
-     * 侵权类型
-     */
-    private String tortType;
-
-    /**
-     * 侵权分类
-     */
-    private String tortClassify;
-
-    /**
-     * 是否拥有专利
-     */
-    private Boolean ifHavePatent;
-
     /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 描述问题
-     */
-    private String problemDescription;
-
-    /**
-     * 侵权店铺链接
-     */
-    private String tortStoreLink;
-
-    /**
-     * 投诉方ADIN号
-     */
-    private String complainAdin;
-
-    /**
-     * 被投诉方ADIN号
-     */
-    private String complainedAdin;
-
-    /**
-     * 商品是否原创
+     * 联系人
      */
-    private Boolean ifOriginal;
+    private String contactPerson;
 
     /**
-     * 被投诉类型
+     * 联系电话
      */
-    private String complainedType;
+    private String contactPhone;
 
     /**
-     * 是否协商过
+     * 联系邮箱
      */
-    private Boolean ifTalked;
+    private String contactMail;
 
     /**
-     * 描述
+     * 附图
      */
-    private String description;
+    private List<String> fileGuids;
 
     /**
-     * 联系人
+     * 填写工单DTO
      */
-    private String contactPerson;
+    private TicketFillInAddDTO ticketFillInAddDTO;
 
     /**
-     * 联系电话
+     * 知识产权应诉DTO
      */
-    private String contactPhone;
+    private TicketLitigationRespondingAddDTO respondingAddDTO;
 
     /**
-     * 联系邮箱
+     * 知识产权维护DTO
      */
-    private String contactMail;
+    private TicketRightsProtectionAddDTO protectionAddDTO;
 
     /**
-     * 附图
+     * 申请专利DTO
      */
-    private List<String> fileGuids;
+    private TicketPatentApplyAddDTO ticketPatentApplyAddDTO;
 }

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

@@ -20,11 +20,21 @@ public class TicketLitigationRespondingAddDTO {
     private String complainAdin;
 
     /**
+     * 投诉方站点
+     */
+    private String complainAdinSite;
+
+    /**
      * 被投诉方ADIN号
      */
     private String complainedAdin;
 
     /**
+     * 被投诉方站点
+     */
+    private String complainedAdinSite;
+
+    /**
      * 商品是否原创
      */
     private Boolean ifOriginal;

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

@@ -6,9 +6,9 @@ import java.util.Date;
 
 @Data
 public class TicketQueryDTO {
-    private String name;
     private String num;
     private Integer ticketType;
+    private Integer process;
     private Integer id;
     private Integer current;
     private Integer size;

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

@@ -20,6 +20,11 @@ public class TicketRightsProtectionAddDTO {
     private String tortStoreAdin;
 
     /**
+     * 侵权店铺站点
+     */
+    private String tortStoreAdinSite;
+
+    /**
      * 侵权类型
      */
     private String tortType;

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

@@ -27,11 +27,21 @@ public class TicketLitigationRespondingVO {
     private String complainAdin;
 
     /**
+     * 投诉方站点
+     */
+    private String complainAdinSite;
+
+    /**
      * 被投诉方ADIN号
      */
     private String complainedAdin;
 
     /**
+     * 被投诉方站点
+     */
+    private String complainedAdinSite;
+
+    /**
      * 商品是否原创
      */
     private Boolean ifOriginal;

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

@@ -27,6 +27,11 @@ public class TicketRightsProtectionVO {
     private String tortStoreAdin;
 
     /**
+     * 侵权店铺站点
+     */
+    private String tortStoreAdinSite;
+
+    /**
      * 侵权类型
      */
     private String tortType;

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

@@ -13,16 +13,6 @@ public class TicketVO {
     private Integer id;
 
     /**
-     *
-     */
-    private String name;
-
-    /**
-     *
-     */
-    private String contentText;
-
-    /**
      * 工单类型
      */
     private Integer ticketType;
@@ -52,11 +42,6 @@ public class TicketVO {
      */
     private Double price;
 
-    /**
-     *
-     */
-    private String description;
-
     private TicketFillInVO ticketFillInVO;
     private TicketPatentApplyVO ticketPatentApplyVO;
     private TicketLitigationRespondingVO ticketLitigationRespondingVO;

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

@@ -53,7 +53,6 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
 //            PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
 //            ticket.setCreateId(personnelVO.getUuid());
             ticket.setCreateId("123");
-            ticket.setTicketProgress(0);
             String num = BatchNoUtil.getBatchNo();
             ticket.setNum(num);
             ticket.insert();
@@ -64,29 +63,25 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
             switch (ticketType) {
                 case 1:
                     //填写工单
-                    TicketFillInAddDTO ticketFillInAddDTO = new TicketFillInAddDTO();
-                    BeanUtils.copyProperties(ticketDTO, ticketFillInAddDTO);
+                    TicketFillInAddDTO ticketFillInAddDTO = ticketDTO.getTicketFillInAddDTO();
                     ticketFillInAddDTO.setTicketId(ticketId);
                     reId = ticketFillInService.add(ticketFillInAddDTO);
                     break;
                 case 2:
                     //知识产权维权工单
-                    TicketRightsProtectionAddDTO ticketRightsProtectionAddDTO = new TicketRightsProtectionAddDTO();
-                    BeanUtils.copyProperties(ticketDTO, ticketRightsProtectionAddDTO);
-                    ticketRightsProtectionAddDTO.setTicketId(ticketId);
-                    reId = ticketRightsProtectionService.add(ticketRightsProtectionAddDTO);
+                    TicketRightsProtectionAddDTO protectionAddDTO = ticketDTO.getProtectionAddDTO();
+                    protectionAddDTO.setTicketId(ticketId);
+                    reId = ticketRightsProtectionService.add(protectionAddDTO);
                     break;
                 case 3:
                     //知识产权应诉工单
-                    TicketLitigationRespondingAddDTO ticketLitigationRespondingAddDTO = new TicketLitigationRespondingAddDTO();
-                    BeanUtils.copyProperties(ticketDTO, ticketLitigationRespondingAddDTO);
-                    ticketLitigationRespondingAddDTO.setTicketId(ticketId);
-                    reId = ticketLitigationRespondingService.add(ticketLitigationRespondingAddDTO);
+                    TicketLitigationRespondingAddDTO respondingAddDTO = ticketDTO.getRespondingAddDTO();
+                    respondingAddDTO.setTicketId(ticketId);
+                    reId = ticketLitigationRespondingService.add(respondingAddDTO);
                     break;
                 case 4:
                     //我要申请专利工单
-                    TicketPatentApplyAddDTO ticketPatentApplyAddDTO = new TicketPatentApplyAddDTO();
-                    BeanUtils.copyProperties(ticketDTO, ticketPatentApplyAddDTO);
+                    TicketPatentApplyAddDTO ticketPatentApplyAddDTO = ticketDTO.getTicketPatentApplyAddDTO();
                     ticketPatentApplyAddDTO.setTicketId(ticketId);
                     reId = ticketPatentApplyService.add(ticketPatentApplyAddDTO);
                     break;
@@ -112,8 +107,6 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
 
         } else {
             ticket = this.getById(ticket.getId());
-            ticket.setName(ticketDTO.getName());
-            ticket.setContentText(ticketDTO.getContentText());
             ticket.updateById();
         }
         return reId;
@@ -121,23 +114,26 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
 
     @Transactional(rollbackFor = Exception.class)
     public Records queryTickets(TicketQueryDTO ticketQueryDTO) {
-        String name = ticketQueryDTO.getName();
         String num = ticketQueryDTO.getNum();
         Integer ticketType = ticketQueryDTO.getTicketType();
+        Integer process = ticketQueryDTO.getProcess();
+
         Boolean isAdmin = ticketQueryDTO.getIsAdmin();
+
         Integer pageNum = ticketQueryDTO.getCurrent();
         Integer pageSize = ticketQueryDTO.getSize();
+
         Page<Ticket> page = new Page<>(pageNum, pageSize);
         QueryWrapper<Ticket> queryWrapper = new QueryWrapper<>();
-        if (name != null && !name.equals("")) {
-            queryWrapper.lambda().like(Ticket::getName, name);
-        }
         if (ticketType != null) {
             queryWrapper.lambda().eq(Ticket::getTicketType, ticketType);
         }
         if (num != null) {
             queryWrapper.lambda().eq(Ticket::getNum, num);
         }
+        if (process != null) {
+            queryWrapper.lambda().eq(Ticket::getTicketProgress, process);
+        }
         if (!isAdmin.equals(true)) {
             PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
             Integer personType = personnelVO.getPersonType();
@@ -149,6 +145,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         IPage<Ticket> ticketPage = this.page(page, queryWrapper);
         List<Ticket> tickets = ticketPage.getRecords();
         List<TicketVO> ticketVOS = this.loadTicketVO(tickets);
+        
         Records records = new Records();
         records.setData(ticketVOS);
         records.setCurrent((long) pageNum);