|
@@ -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());
|