4/9 ticket

src/main/java/com/example/xiaoshiweixinback/controller/TicketController.java

@@ -35,7 +35,6 @@ public class TicketController {
         } else {
             return Response.error("发生错误");
         }
-
     }
 
 

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

@@ -28,6 +28,21 @@ public class TicketVO {
     private Integer ticketProgress;
 
     /**
+     * 联系人
+     */
+    private String contactPerson;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 联系邮箱
+     */
+    private String contactMail;
+
+    /**
      * 创建人
      */
     private String createId;

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

@@ -52,9 +52,9 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
             BeanUtils.copyProperties(ticketDTO, ticket);
 //            PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
 //            ticket.setCreateId(personnelVO.getUuid());
-            ticket.setCreateId("123");
             String num = BatchNoUtil.getBatchNo();
             ticket.setNum(num);
+            ticket.setTicketProgress(1);
             ticket.insert();
 
             Integer ticketId = ticket.getId();
@@ -92,7 +92,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
 
             //处理工单的附件
             List<String> fileGuids = ticketDTO.getFileGuids();
-            if (!fileGuids.isEmpty()) {
+            if (fileGuids != null && !fileGuids.isEmpty()) {
                 List<AssoTicketFile> assoTicketFiles = new ArrayList<>();
                 for (String fileGuid : fileGuids) {
                     AssoTicketFile assoTicketFile = new AssoTicketFile();
@@ -134,7 +134,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         if (process != null) {
             queryWrapper.lambda().eq(Ticket::getTicketProgress, process);
         }
-        if (!isAdmin.equals(true)) {
+        if (isAdmin != null && !isAdmin.equals(true)) {
             PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
             Integer personType = personnelVO.getPersonType();
             if (personType != null && personType.equals(0)) {