Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFilePageListRequest.java

@@ -3,6 +3,7 @@ package com.tuoheng.admin.request.inspectionfile;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tuoheng.common.core.common.BaseQuery;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -41,12 +42,14 @@ public class QueryInspectionFilePageListRequest extends BaseQuery {
      * 核实开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginTime;
 
     /**
      * 核实结束时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     /**

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/handle/QueryInspectionFileHandleByInspectionFileIdService.java

@@ -94,17 +94,24 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
      * 处理字段
      */
     private InspectionFileHandleVo buildInspectionFileHandleVo(InspectionFile inspectionFile, InspectionFileHandle inspectionFileHandle) {
-        InspectionFileHandleVo inspectionFileHandleVo = InspectionFileHandleConverMapper.INSTANCE.fromInspectionFileHandleToInspectionFileHandleVo(inspectionFileHandle);
+        InspectionFileHandleVo inspectionFileHandleVo;
         List<String> handlerImageList = null;
-        if (!StringUtils.isEmpty(inspectionFileHandle.getHandlerImage())) {
-            handlerImageList = new ArrayList<>();
-            String[] arr = inspectionFileHandle.getHandlerImage().split(",");
-            List<String> list = Arrays.stream(arr).map(String::toString).collect(Collectors.toList());
-            for (String str : list) {
-                handlerImageList.add(CommonConfig.imageURL + str);
-            }
+        if (null != inspectionFileHandle) {
+            inspectionFileHandleVo = InspectionFileHandleConverMapper.INSTANCE.fromInspectionFileHandleToInspectionFileHandleVo(inspectionFileHandle);
+
+            if (!StringUtils.isEmpty(inspectionFileHandle.getHandlerImage())) {
+                handlerImageList = new ArrayList<>();
+                String[] arr = inspectionFileHandle.getHandlerImage().split(",");
+                List<String> list = Arrays.stream(arr).map(String::toString).collect(Collectors.toList());
+                for (String str : list) {
+                    handlerImageList.add(CommonConfig.imageURL + str);
+                }
 
+            }
+        } else {
+            inspectionFileHandleVo = new InspectionFileHandleVo();
         }
+
         QuestionType questionType = questionTypeMapper.selectOne(new LambdaQueryWrapper<QuestionType>()
                                         .eq(QuestionType::getId, inspectionFile.getQuestionId())
                                         .eq(QuestionType::getMark, 1));

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListService.java

@@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -112,7 +113,7 @@ public class QueryInspectionFilePageListService {
      * @return
      */
     private List<String> getDeptIdList(String userId, String deptId) {
-        List<String> deptIdList = null;
+        List<String> deptIdList = new ArrayList<>();
         if (!StringUtils.isEmpty(deptId)) {
             deptIdList.add(deptId);
             return deptIdList;