合并1024

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -47,9 +47,6 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private  TaSysUserRoleMapper taSysUserRoleMapper;
 
-    @Autowired
-    private TpTransactionMapper tpTransactionMapper;
-
     @Autowired
     private TpTicketRecordMapper tpTicketRecordMapper;
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -1,10 +1,7 @@
 package com.community.huiju.service.impl;
 
-import com.community.commom.constant.enums.TicketStatusEnum;
-import com.community.commom.constant.enums.TicketTypeEnum;
-import com.community.commom.constant.enums.TicketUserTypeEnum;
+
 import com.community.commom.mode.ResponseBean;
-import com.community.commom.utils.EnumUtils;
 import com.community.huiju.dao.TpTicketMapper;
 import com.community.huiju.dao.TpTicketRecordCommentMapper;
 import com.community.huiju.dao.TpTicketRecordMapper;
@@ -12,9 +9,7 @@ import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.service.ITicketService;
-import com.community.huiju.vo.RecordCommentVO;
-import com.community.huiju.vo.TpTicketRecordCommentVO;
-import com.community.huiju.vo.TpTicketRecordVO;
+
 import com.community.huiju.vo.TpTicketVO;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
@@ -26,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 工单业务 实现
@@ -161,14 +155,16 @@ public class TicketServiceImpl implements ITicketService {
     public TpTicket getTicketSchedule(String communityId, Integer ticketId) {
         //查看工单详情
         TpTicket ticket = tpTicketMapper.selectByTicketId(communityId,ticketId);
-        //工单进度
-        List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId,ticketId);
-        //工单回复
-        ticketRecordList.stream().forEach(TpTicketRecord -> {
-            List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
-            TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
-         });
-        ticket.setTicketRecordList(ticketRecordList);
+        if (null != ticket){
+            //工单进度
+            List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId,ticketId);
+            //工单回复
+            ticketRecordList.stream().forEach(TpTicketRecord -> {
+                List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
+                TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
+            });
+            ticket.setTicketRecordList(ticketRecordList);
+        }
         return ticket;
     }
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/EnumUtils.java

@@ -1,8 +1,5 @@
 package com.community.commom.utils;
 
-import com.community.commom.constant.enums.CodeEnum;
-import com.community.commom.constant.enums.TicketRepairTypeEnum;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -121,24 +118,4 @@ public class EnumUtils {
         return enumConstants;
     }
 
-
-    /**
-     * 获取枚举类型
-     *
-     * @param code
-     * @param enumClass
-     * @param <T>
-     * @return
-     */
-    public static <T extends CodeEnum> T getByCode(Integer code,Class<T> enumClass){
-        for (T each:enumClass.getEnumConstants()){
-            if (code.equals(each.getCode())){
-                return each;
-            }
-        }
-
-        return null;
-    }
-
-
 }