大屏-查询接口

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectDeviceIndicatorServiceImpl.java

@@ -66,23 +66,27 @@ public class ZhcxProjectDeviceIndicatorServiceImpl extends ServiceImpl<ZhcxProje
             dto.setType(item.getType());
             dto.setCompletionrate(item.getCompletionrate());
             if(StringUtils.isNotBlank(item.getRoption())){
-                String[] data = item.getRoption().split("-;-");
-                List<ZhcxProjectDeviceIndicatorDto> childrenList = new ArrayList<>();
-                for (int i = 0; i < data.length; i++) {
-                    String[] split = data[i].split(",");
-                    ZhcxProjectDeviceIndicatorDto children = new ZhcxProjectDeviceIndicatorDto();
-                    children.setIndicatorname(split[0]);
-                    children.setDisplayboard(item.getDisplayboard());
-                    if ("rectify_complete".equals(item.getType())) {
-                        children.setUnfinished(Integer.parseInt(split[1]));
-                    }else{
-                        children.setCompleted(Integer.parseInt(split[1].split("/")[0]));
-                        children.setTotal(Integer.parseInt(split[1].split("/")[1]));
+                if ("check_test".equals(item.getType())) {
+                    dto.setFinishTime(item.getRoption());
+                }else{
+                    String[] data = item.getRoption().split("-;-");
+                    List<ZhcxProjectDeviceIndicatorDto> childrenList = new ArrayList<>();
+                    for (int i = 0; i < data.length; i++) {
+                        String[] split = data[i].split(",");
+                        ZhcxProjectDeviceIndicatorDto children = new ZhcxProjectDeviceIndicatorDto();
+                        children.setIndicatorname(split[0]);
+                        children.setDisplayboard(item.getDisplayboard());
+                        if ("rectify_complete".equals(item.getType())) {
+                            children.setUnfinished(Integer.parseInt(split[1]));
+                        }else{
+                            children.setCompleted(Integer.parseInt(split[1].split("/")[0]));
+                            children.setTotal(Integer.parseInt(split[1].split("/")[1]));
+                        }
+                        children.setCompletionrate(new BigDecimal(split[2]));
+                        childrenList.add(children);
                     }
-                    children.setCompletionrate(new BigDecimal(split[2]));
-                    childrenList.add(children);
+                    dto.setChildren(childrenList);
                 }
-                dto.setChildren(childrenList);
             }
             dtoList.add(dto);
         });

business-entity/src/main/java/com/rongwei/bsentity/dto/ZhcxProjectDeviceIndicatorDto.java

@@ -34,4 +34,6 @@ public class ZhcxProjectDeviceIndicatorDto {
     private String type;
 
     private List<ZhcxProjectDeviceIndicatorDto> children;
+
+    private String finishTime;
 }