报修和巡检优化

platform-dao/src/main/java/com/platform/dao/dto/fill/FillGatherTaskDTO.java

@@ -150,4 +150,9 @@ public class FillGatherTaskDTO extends BaseDTO implements Serializable {
 
     private String remark;
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
+
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -422,4 +422,8 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 机电仪位号
      */
     private String parentSbNo;
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairTicketTemplateData.java

@@ -40,4 +40,8 @@ public class RepairTicketTemplateData implements Serializable {
     private String sbPositionName; // 设备所属车间
 
     private Double requireHours; // 要求时间
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -109,6 +109,11 @@ public class FillGatherTask implements Serializable {
      */
     private Integer period;
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
+
     /**
      * 数据权限
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -308,4 +308,8 @@ public class RepairApplicationForm implements Serializable {
      */
     private String parentSbNo;
 
+    private Integer repairProfessor; // 检维修单位
+
+    private Integer repairType; // 工作类型
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillGatherTaskVO.java

@@ -111,5 +111,9 @@ public class FillGatherTaskVO extends BaseVO implements Serializable {
     private String checkerName; // 巡检人名称
     private String leaderName; // 巡检主管名称
 
+    /**
+     * 任务等级 A级  B级 C级
+     */
+    private String taskLevel;
 
 }

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

@@ -402,4 +402,8 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
     private String selfParentNo; // 父位号
 
     private String sbPositionName; // 车间名称
+
+    private Integer repairProfessor; // 维修专业
+
+    private Integer repairType; // 维修类型
 }

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -425,7 +425,7 @@ public class SbInfoController {
     public R importExcelByUpdate(@RequestParam("type") Integer type, @RequestParam("file") MultipartFile file) throws Exception {
         String result = "";
         if(type == 1){
-            result = sbInfoService.importListByAdd( file);
+            result = sbInfoService.importListByAdd(file);
         }else if(type == 2){
             result = sbInfoService.importListByUpdateALl(file);
         }else if(type == 3){// 废弃

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

@@ -266,6 +266,8 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
             if(StringUtils.isNotBlank(repairApplicationForm.getDispatchUserId())){
                 data.setDispatcher(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getDispatchUserId()).getRealName());
             }
+            data.setRepairProfessor(repairApplicationForm.getRepairProfessor());
+            data.setRepairType(repairApplicationForm.getRepairType());
             data.setRequireHours(repairApplicationForm.getLimitHours());
             data.setRepairMan(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getRepairUserId()).getRealName());
             data.setRepairNo(repairApplicationForm.getNo());