guarantee-lsq 2 жил өмнө
parent
commit
2d65e67a39

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

@@ -3,6 +3,7 @@ package com.platform.dao.dto.repair;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 维修票证数据
@@ -43,5 +44,5 @@ public class RepairTicketTemplateData implements Serializable {
 
     private Integer repairProfessor; // 维修专业
 
-    private Integer repairType; // 维修类型
+    private List<Integer> repairType; // 维修类型
 }

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

@@ -34,7 +34,10 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description 自定义报表 service 实现类
@@ -267,7 +270,12 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
                 data.setDispatcher(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getDispatchUserId()).getRealName());
             }
             data.setRepairProfessor(repairApplicationForm.getRepairProfessor());
-            //data.setRepairType(repairApplicationForm.getRepairType());
+            String[] arr = repairApplicationForm.getRepairType().split(",");
+            List<Integer> arrays = ListUtils.newArrayList();
+            for(String s : arr){
+                arrays.add(Integer.parseInt(s));
+            }
+            data.setRepairType(arrays);
             data.setRequireHours(repairApplicationForm.getLimitHours());
             data.setRepairMan(sysUserMapper.selectByPrimaryKey(repairApplicationForm.getRepairUserId()).getRealName());
             data.setRepairNo(repairApplicationForm.getNo());