工单问题 工单小程序接口调整

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/InspectionFileCheckRecord.java

@@ -90,4 +90,25 @@ public class InspectionFileCheckRecord {
      */
     private Integer mark;
 
+    /**
+     * 处理人ID
+     */
+    private String handlerUser;
+
+    /**
+     * 处理后图片(多个图片逗号“,”分隔)
+     */
+    private String handlerImage;
+
+    /**
+     * 处理结果
+     */
+    private String handlerResult;
+
+    /**
+     * 处理完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date handlerTime;
+
 }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/entity/InspectionFileCheckRecord.java

@@ -90,5 +90,26 @@ public class InspectionFileCheckRecord {
      */
     private Integer mark;
 
+    /**
+     * 处理人ID
+     */
+    private String handlerUser;
+
+    /**
+     * 处理后图片(多个图片逗号“,”分隔)
+     */
+    private String handlerImage;
+
+    /**
+     * 处理结果
+     */
+    private String handlerResult;
+
+    /**
+     * 处理完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date handlerTime;
+
 }
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileHandleServiceImpl.java

@@ -16,12 +16,15 @@ import com.tuoheng.miniprogram.enums.InspectionFileHandleEnum;
 import com.tuoheng.miniprogram.enums.MarkEnum;
 import com.tuoheng.miniprogram.enums.ServiceExceptionEnum;
 import com.tuoheng.miniprogram.enums.WorkOrderStatusEnum;
+import com.tuoheng.miniprogram.service.IInspectionFileCheckRecordsService;
 import com.tuoheng.miniprogram.service.IInspectionFileHandleService;
 import com.tuoheng.miniprogram.utils.CurrentUserUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -47,6 +50,10 @@ public class InspectionFileHandleServiceImpl implements IInspectionFileHandleSer
 
     @Autowired
     private WorkOrderFileMapper workOrderFileMapper;
+
+    @Resource
+    private IInspectionFileCheckRecordsService inspectionFileCheckRecordsService;
+
     /**
      * 上传结果
      * @param dto

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -156,14 +156,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }
         //登录用户信息
-//        User user = CurrentUserUtil.getUserInfo();
-        User user = new User();
-        user.setId("0d695f6ff9441e0ba21cdd86d5cafcbd")
-            .setDataPermission(1)
-            .setTenantId("f9c3de911d228b6e51eafb510aeaea7d")
-            .setDeptId("e2efb06b239beed004ef9672fed72934");
-
-
+        User user = CurrentUserUtil.getUserInfo();
         if (ObjectUtil.isNull(user)) {
             return JsonResult.error(WorkOrderEnum.USER_IS_NOT_EXIST.getCode(), WorkOrderEnum.USER_IS_NOT_EXIST.getMsg());
         }
@@ -437,19 +430,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         //获取工单对应的审核结果和历史审核记录
         List<InspectionFileHandle> inspectionFileHandles =
                 inspectionFileHandleMapper.selectList(new LambdaQueryWrapper<InspectionFileHandle>().in(InspectionFileHandle::getInspectionFileId, inspectionFiledIds));
-        //子表信息处理
-        Map<String, InspectionFileHandle> detailMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(inspectionFileHandles)){
-
-        }
         List<InspectionFileCheckRecord> inspectionFileCheckRecords =
                 inspectionFileCheckRecordMapper.selectList(new LambdaQueryWrapper<InspectionFileCheckRecord>().in(InspectionFileCheckRecord::getInspectionFileId, inspectionFiledIds)
                                 .orderByDesc(InspectionFileCheckRecord::getCreateTime));
-        //历史审核记录
-        Map<String, List<InspectionFileCheckRecord>> checkRecordMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(inspectionFileCheckRecords)){
-
-        }
 
         List<WorkOrderHandleVo> list = inspectionFilePageData.getRecords().stream().map(t -> {
             WorkOrderHandleVo vo = new WorkOrderHandleVo();