Merge remote-tracking branch 'origin/demo_' into demo_

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-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -283,10 +283,10 @@ public class RepairApplicationFormController {
         RepairBaseStrategy strategy = RepairStrategyFactory.getStrategy(applicationFormDTO.getCategory());
         switch (applicationFormDTO.getReportHandleType()){
             case 3:
+            case 2:
                 strategy.stopRepairByPerson(applicationFormDTO);
                 break;
             case 1:
-            case 2:
                 strategy.reportLeaderHandle(applicationFormDTO);
                 break;
         }

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -449,6 +449,7 @@ public class SysUserController {
     }
 
     /**
+     *
      * 根据部门查询当前部门指定父级  再查询指定父级下的指定部门人员
      *
      * @param nature     :

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -301,6 +301,9 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
             if(StringUtils.isBlank(data.getRepairEndTime()) && form.getRepairEndTime() != null){
                 data.setRepairEndTime(DateUtils.dateToString(form.getRepairEndTime(),DateUtils.PATTERN_YMD_HMS));
             }
+            if(StringUtils.isBlank(data.getDispatcher())){
+                data.setDispatcher(sysUserMapper.selectByPrimaryKey(form.getDispatchUserId()).getRealName());
+            }
         }
         return data;
     }

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;
     }
 

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -734,7 +734,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         SysUser user = sysUserMapper.selectByPrimaryKey(model.getDispatchUserId());
         RepairApplicationForm form = repairApplicationFormMapper.selectByPrimaryKey(model.getId());
         // 转派人为工程师时
-        if(model.getRoleType() == 2){
+        if(model.getRoleType() == 3){
             model.setDispatchUserId(form.getDispatchUserId());
             // 添加维修转派记录
             //addRepairDispatchRecord(model,user);