大屏-查询接口

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

@@ -73,8 +73,12 @@ public class ZhcxProjectDeviceIndicatorServiceImpl extends ServiceImpl<ZhcxProje
                     ZhcxProjectDeviceIndicatorDto children = new ZhcxProjectDeviceIndicatorDto();
                     children.setIndicatorname(split[0]);
                     children.setDisplayboard(item.getDisplayboard());
-                    children.setCompleted(Integer.parseInt(split[1].split("/")[0]));
-                    children.setTotal(Integer.parseInt(split[1].split("/")[1]));
+                    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);
                 }

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

@@ -560,7 +560,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     if (deptDataVos.size() > 0) {
                         sb.append(list3.get(0).getFirstdeptname() + ",");
                         Integer i = deptDataVos.get(0).getTbcCount() + deptDataVos.get(0).getClosedCount();
-                        sb.append(i+"/"+deptDataVos.get(0).getTotalCount() + ",");
+                        //sb.append(i+"/"+deptDataVos.get(0).getTotalCount() + ",");
+                        sb.append(deptDataVos.get(0).getUnfinishedCount());
                         Float f = i.floatValue() / deptDataVos.get(0).getTotalCount().floatValue() * 100;
                         sb.append(new BigDecimal(String.format("%.2f", f)));
                         if (count.incrementAndGet() < totalSize) {

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

@@ -23,6 +23,8 @@ public class ZhcxProjectDeviceIndicatorDto {
 
     private Integer completed;
 
+    private Integer unfinished;
+
     private BigDecimal completionrate;
 
     private Integer total;