diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisionAttController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisionAttController.java index 9a3741d8..244c91df 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisionAttController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSupervisionAttController.java @@ -1,11 +1,14 @@ package com.kms.build.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.build.domain.vo.SupervisionVO; import com.kms.common.utils.BaseEntityUtils; @@ -45,6 +48,84 @@ public class BsSgcJsjdBuiSupervisionAttController extends BaseController @Autowired private BsSgcJsjdBuiSupervisionAttService bsSgcJsjdBuiSupervisionAttService; + + @PostMapping("listReport") + public AjaxResult listReport(@RequestBody SearchParam sp) { + BsSgcJsjdBuiSupervisionAtt supervisionAtt = sp.getData(); + String id = supervisionAtt.getSupervisionId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("supervision_id", id); + + List list = bsSgcJsjdBuiSupervisionAttService.list(queryWrapper); + + long zero = list.stream().filter(item -> item.getReportType().equals("0")).count(); + + long one = list.stream() + .filter(item -> item.getReportType().equals("1")).count(); + + long two = list.stream() + .filter(item -> item.getReportType().equals("2")).count(); + long zeroFalse = list.stream().filter(item -> item.getReportType().equals("0") && item.getIsOk().equals("0")).count(); + + long oneFalse = list.stream().filter(item -> item.getReportType().equals("1") && item.getIsOk().equals("0")) + .count(); + long twoFalse = list.stream() + .filter(item -> item.getReportType().equals("2") && item.getIsOk().equals("0")).count(); + + + SupervisionVO zeroVo = new SupervisionVO(); + SupervisionVO oneVo = new SupervisionVO(); + SupervisionVO twoVo = new SupervisionVO(); + + + if (zero != 0) { + zeroVo.setRate(zero-zeroFalse/(zero*1.00)*100); + zeroVo.setType("0"); + zeroVo.setTotal(zero); + zeroVo.setIsFalse(zeroFalse); + }else { + zeroVo.setType("0"); + zeroVo.setTotal(zero); + zeroVo.setIsFalse(zeroFalse); + zeroVo.setRate(0); + } + + if (one != 0) { + oneVo.setRate(one-oneFalse/(one*1.00)*100); + oneVo.setType("1"); + oneVo.setTotal(one); + oneVo.setIsFalse(oneFalse); + }else { + oneVo.setType("1"); + oneVo.setTotal(one); + oneVo.setIsFalse(oneFalse); + oneVo.setRate(0); + } + + + if (two != 0) { + twoVo.setRate(two-twoFalse/(two*1.00)*100); + twoVo.setType("2"); + twoVo.setTotal(two); + twoVo.setIsFalse(twoFalse); + }else { + twoVo.setType("2"); + twoVo.setTotal(two); + twoVo.setIsFalse(twoFalse); + twoVo.setRate(0); + } + + List voList = new ArrayList<>(); + + voList.add(zeroVo); + voList.add(oneVo); + voList.add(twoVo); + return AjaxResult.success(voList); + + } + + + /** * 查询工程质量报告列表 */ diff --git a/jwtech-system/src/main/java/com/kms/build/domain/vo/SupervisionVO.java b/jwtech-system/src/main/java/com/kms/build/domain/vo/SupervisionVO.java new file mode 100644 index 00000000..9bb028af --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/vo/SupervisionVO.java @@ -0,0 +1,19 @@ +package com.kms.build.domain.vo; + +import lombok.Data; + +@Data +public class SupervisionVO { + + + private double total; + + private double isFalse; + + private double rate; + + private String type; + + + +}