控制台

src/main/java/com/diagbot/aggregate/ResultStatisticsAggregate.java

@@ -1,7 +1,6 @@
 package com.diagbot.aggregate;
 
 import com.diagbot.dto.NumDTO;
-import com.diagbot.dto.ResultDetailDTO;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.QcCasesFacade;
 import com.diagbot.facade.QcresultInfoFacade;
@@ -44,15 +43,15 @@ public class ResultStatisticsAggregate {
     @DataProvider("setAllResult")
     public Map<String, Object> setAllResult(
             @InvokeParameter("filterVO") FilterVO filterVO,
-            @DataConsumer("getResultDept") List<ResultDetailDTO> results,
+            @DataConsumer("entryByDept") List<NumDTO> deptList,
             @DataConsumer("entryCountGroupByEntry") List<NumDTO> entryList,
             @DataConsumer("entryCountGroupByCase") List<NumDTO> caseList) {
         Map<String, Object> retMap = new LinkedHashMap<>();
         retMap.put("各科室缺陷占比", Lists.newLinkedList());
         retMap.put("各模块缺陷占比排行", Lists.newLinkedList());
         retMap.put("条目缺陷占比", Lists.newLinkedList());
-        if (ListUtil.isNotEmpty(results)) {
-            retMap.put("各科室缺陷占比", results);
+        if (ListUtil.isNotEmpty(deptList)) {
+            retMap.put("各科室缺陷占比", deptList);
         }
         if (ListUtil.isNotEmpty(caseList)) {
             retMap.put("各模块缺陷占比排行", caseList);
@@ -198,49 +197,49 @@ public class ResultStatisticsAggregate {
      * @return
      */
     @DataProvider("getResultDept")
-    public List<ResultDetailDTO> getResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
-        List<ResultDetailDTO> results2 = behospitalInfoFacade.resultStatisticsByDept2(filterVO);
-        if (ListUtil.isNotEmpty(results2)) {
-            int totle = results2
+    public List<NumDTO> getResultDept(@InvokeParameter("filterVO") FilterVO filterVO) {
+        List<NumDTO> numDTOList = behospitalInfoFacade.resultStatisticsByDept2(filterVO);
+        if (ListUtil.isNotEmpty(numDTOList)) {
+            int totle = numDTOList
                     .stream()
-                    .map(ResultDetailDTO::getNum)
+                    .map(NumDTO::getNum)
                     .reduce(0, Integer::sum);
-            results2.forEach(result -> {
+            numDTOList.forEach(result -> {
                 Double percent = BigDecimal.valueOf(result.getNum())
                         .divide(BigDecimal.valueOf(totle), 4, RoundingMode.HALF_UP)
                         .doubleValue();
                 result.setPercent(percent);
             });
-            List<ResultDetailDTO> retResults = Lists.newLinkedList();
-            if (results2.size() <= 10) {
-                retResults = BeanUtil.listCopyTo(results2, ResultDetailDTO.class);
+            List<NumDTO> retList = Lists.newLinkedList();
+            if (numDTOList.size() <= 10) {
+                retList = BeanUtil.listCopyTo(numDTOList, NumDTO.class);
             } else {
 
                 Double rate = 0d;
                 Integer num = 0;
-                for (ResultDetailDTO result : results2) {
-                    if (retResults.size() < 9) {
+                for (NumDTO numDTO : numDTOList) {
+                    if (retList.size() < 9) {
                         rate = BigDecimal.valueOf(rate)
-                                .add(BigDecimal.valueOf(Double.valueOf(result.getPercent())))
+                                .add(BigDecimal.valueOf(Double.valueOf(numDTO.getPercent())))
                                 .doubleValue();
-                        retResults.add(result);
+                        retList.add(numDTO);
                     } else {
-                        num += result.getNum();
+                        num += numDTO.getNum();
                     }
                 }
-                ResultDetailDTO retResult = new ResultDetailDTO();
-                retResult.setName("其他");
-                retResult.setNum(num);
-                retResult.setPercent(BigDecimal.valueOf(1).subtract(BigDecimal.valueOf(rate)).doubleValue());
-                retResults.add(retResult);
+                NumDTO otherNumDTO = new NumDTO();
+                otherNumDTO.setName("其他");
+                otherNumDTO.setNum(num);
+                otherNumDTO.setPercent(BigDecimal.valueOf(1).subtract(BigDecimal.valueOf(rate)).doubleValue());
+                retList.add(otherNumDTO);
             }
-            retResults.forEach(result -> {
+            retList.forEach(result -> {
                 DecimalFormat df = new DecimalFormat("#0.00");
                 String percentStr
                         = df.format(BigDecimal.valueOf(result.getPercent()).multiply(BigDecimal.valueOf(100))) + "%";
                 result.setPercentStr(percentStr);
             });
-            return retResults;
+            return retList;
         }
         return null;
     }

src/main/java/com/diagbot/dto/ResultDetailDTO.java

@@ -1,30 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 16:26
- */
-@Getter
-@Setter
-public class ResultDetailDTO {
-    /**
-     * 缺陷名称/科室名称
-     */
-    private String name;
-    /**
-     * 数量
-     */
-    private Integer num;
-    /**
-     * 占比
-     */
-    private Double percent;
-    /**
-     * 百分比
-     */
-    private String percentStr;
-}

src/main/java/com/diagbot/dto/ResultStatisticsDTO.java

@@ -1,17 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/4/15 15:59
- */
-@Getter
-@Setter
-public class ResultStatisticsDTO {
-    List<ResultDetailDTO> details;
-}

src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.BehospitalInfoDTO;
 import com.diagbot.dto.MsgDTO;
-import com.diagbot.dto.ResultDetailDTO;
+import com.diagbot.dto.NumDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
@@ -33,7 +33,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatistics(FilterVO filterVO);
+    public List<NumDTO> resultStatistics(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比
@@ -41,7 +41,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatisticsByDept(FilterVO filterVO);
+    public List<NumDTO> resultStatisticsByDept(FilterVO filterVO);
 
     /**
      * 缺陷排行列表统计-百分比未计算
@@ -49,7 +49,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatistics2(FilterVO filterVO);
+    public List<NumDTO> resultStatistics2(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比-百分比未计算
@@ -57,7 +57,7 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatisticsByDept2(FilterVO filterVO);
+    public List<NumDTO> resultStatisticsByDept2(FilterVO filterVO);
 
     /**
      * 缺陷总数

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.BehospitalInfoDTO;
 import com.diagbot.dto.MsgDTO;
-import com.diagbot.dto.ResultDetailDTO;
+import com.diagbot.dto.NumDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
@@ -33,7 +33,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatistics(FilterVO filterVO);
+    public List<NumDTO> resultStatistics(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比
@@ -41,7 +41,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatisticsByDept(FilterVO filterVO);
+    public List<NumDTO> resultStatisticsByDept(FilterVO filterVO);
 
     /**
      * 缺陷排行列表统计-百分比未计算
@@ -49,7 +49,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatistics2(FilterVO filterVO);
+    public List<NumDTO> resultStatistics2(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比-百分比未计算
@@ -57,7 +57,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @param filterVO
      * @return
      */
-    public List<ResultDetailDTO> resultStatisticsByDept2(FilterVO filterVO);
+    public List<NumDTO> resultStatisticsByDept2(FilterVO filterVO);
 
     /**
      * 缺陷总数

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.BehospitalInfoDTO;
 import com.diagbot.dto.MsgDTO;
-import com.diagbot.dto.QcResultPercentDTO;
-import com.diagbot.dto.ResultDetailDTO;
+import com.diagbot.dto.NumDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.mapper.BehospitalInfoMapper;
 import com.diagbot.service.BehospitalInfoService;
@@ -13,7 +12,6 @@ import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
 import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.HomePageFilterVO;
-import com.diagbot.vo.QcresultFilterVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -46,7 +44,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public List<ResultDetailDTO> resultStatistics(FilterVO filterVO) {
+    public List<NumDTO> resultStatistics(FilterVO filterVO) {
         return baseMapper.resultStatistics(filterVO);
     }
 
@@ -57,7 +55,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public List<ResultDetailDTO> resultStatisticsByDept(FilterVO filterVO) {
+    public List<NumDTO> resultStatisticsByDept(FilterVO filterVO) {
         return baseMapper.resultStatisticsByDept(filterVO);
     }
 
@@ -68,7 +66,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public List<ResultDetailDTO> resultStatistics2(FilterVO filterVO) {
+    public List<NumDTO> resultStatistics2(FilterVO filterVO) {
         return baseMapper.resultStatistics2(filterVO);
     }
 
@@ -79,7 +77,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
      * @return
      */
     @Override
-    public List<ResultDetailDTO> resultStatisticsByDept2(FilterVO filterVO) {
+    public List<NumDTO> resultStatisticsByDept2(FilterVO filterVO) {
         return baseMapper.resultStatisticsByDept2(filterVO);
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -102,7 +102,7 @@
 
 
     <!-- 缺陷排行列表 -->
-    <select id="resultStatistics"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.ResultDetailDTO">
+    <select id="resultStatistics"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         t1.msg AS name,
         t1.num AS num,
@@ -165,7 +165,7 @@
     </select>
 
     <!-- 各科室缺陷占比 -->
-    <select id="resultStatisticsByDept"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.ResultDetailDTO">
+    <select id="resultStatisticsByDept"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         t1.beh_dept_name AS name,
         t1.num AS num,
@@ -227,7 +227,7 @@
     </select>
 
     <!-- 缺陷排行列表 -->
-    <select id="resultStatistics2"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.ResultDetailDTO">
+    <select id="resultStatistics2"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         c.msg as name,
         count(*) AS num
@@ -259,7 +259,7 @@
     </select>
 
     <!-- 各科室缺陷占比 -->
-    <select id="resultStatisticsByDept2"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.ResultDetailDTO">
+    <select id="resultStatisticsByDept2"  parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         a.beh_dept_id,
         a.beh_dept_name as name,