维修优化

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -435,4 +435,5 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      * 计划结束时间
      */
     private LocalDateTime planEndTime;
+
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -19,11 +19,13 @@ import com.platform.dao.bean.MyVOPage;
 import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
+import com.platform.dao.dto.repair.RepairTicketTemplateData;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.StoreCheckJobDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.repair.RepairReason;
 import com.platform.dao.entity.sb.SbInfo;
@@ -31,6 +33,7 @@ import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
 import com.platform.dao.mapper.check.CheckJobMapper;
+import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.repair.*;
 import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
@@ -88,7 +91,7 @@ import java.util.stream.Collectors;
 @Service("repairApplicationFormService")
 public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairApplicationFormMapper, RepairApplicationForm, RepairApplicationFormDTO> implements RepairApplicationFormService {
 
-    private final RepairFormService repairFormService;
+    private final CustomFieldTemplateDataMapper customFieldTemplateDataMapper;
     private RepairFormMapper repairFormMapper;
     private RepairReasonMapper repairReasonMapper;
     private RepairCheckMapper repairCheckMapper;
@@ -774,6 +777,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         if(StringUtils.isNotBlank(sbInfo.getParentId())){
             vo.setSelfParentNo(sbInfoService.getModelById(sbInfo.getParentId()).getPositionNo());
         }
+        // 获取装置位置和计划时间
+        CustomFieldTemplateData queryData = new CustomFieldTemplateData();
+        queryData.setObjId(model.getId());
+        queryData.setRemark(CommonConstants.REPAIR_TICKET_RECORD);
+        CustomFieldTemplateData info = customFieldTemplateDataMapper.selectOne(queryData);
+        RepairTicketTemplateData data = JsonUtils.jsonToModel(info.getData(),RepairTicketTemplateData.class);
+        vo.setSbPosition(data.getSbPositionName());
+        vo.setPlanStartTime(DateUtils.strToLocalDateTime(data.getPlanStartTime(),DateUtils.PATTERN_YMD_HMS));
+        vo.setPlanEndTime(DateUtils.strToLocalDateTime(data.getPlanEndTime(),DateUtils.PATTERN_YMD_HMS));
         return vo;
     }