运管开发

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzAqrwService.java

@@ -207,79 +207,40 @@ public class BsSgcSzAqrwService extends BaseService<BsSgcSzAqrwMapper, BsSgcSzAq
 
         Integer layer = byId.getLayer();
 
-
-        List<NumDto> one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId);
-        List<NumDto> two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId);
-        List<NumDto> three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId);
-        List<NumDto> threeNum = bsSgcSzAqrwMapper.getThreeNum(sysXzqhService.getSubString(adcd), layer,taskId);
-
-
-        List<NumDto> Num = bsSgcSzAqrwMapper.getNum(sysXzqhService.getSubString(adcd), layer,taskId);
-
-        List<NumDto> zeroNum = bsSgcSzAqrwMapper.getZeroNum(sysXzqhService.getSubString(adcd), layer,taskId);
-        List<NumDto> oneNum = bsSgcSzAqrwMapper.getOneNum(sysXzqhService.getSubString(adcd), layer,taskId);
-        List<NumDto> twoNum = bsSgcSzAqrwMapper.getTwoNum(sysXzqhService.getSubString(adcd), layer,taskId);
-
+        List<AqrwDto> dtoList = this.getList(taskId);
 
 
 
-        Num.addAll(one);
-        Num.addAll(two);
-        Num.addAll(three);
-        Num.addAll(threeNum);
 
-        List<AqrwDto> list = new ArrayList<>();
-
-        for (NumDto numDto : Num) {
-            AqrwDto aqrwDto = new AqrwDto();
-            aqrwDto.setAdcdName(numDto.getName());
-            for (NumDto dto : one) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setZeroNum(dto.getNum());
-                }
-            }
+        List<NumDto> one = bsSgcSzAqrwMapper.getOne(sysXzqhService.getSubString(adcd), layer,taskId);
+        List<NumDto> two = bsSgcSzAqrwMapper.getTwo(sysXzqhService.getSubString(adcd), layer,taskId);
+        List<NumDto> three = bsSgcSzAqrwMapper.getThree(sysXzqhService.getSubString(adcd), layer,taskId);
 
-            for (NumDto dto : two) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setOneNum(dto.getNum());
-                }
-            }
+        for (AqrwDto aqrwDto : dtoList) {
 
-            for (NumDto dto : three) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setTwoNum(dto.getNum());
-                }
-            }
+            for (NumDto numDto : one) {
+                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                    aqrwDto.setOne(numDto.getNum());
 
-            for (NumDto dto : threeNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setThreeNum(dto.getNum());
                 }
             }
 
-            for (NumDto dto : zeroNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setZeroNum(dto.getNum());
-                }
-            }
+            for (NumDto numDto : two) {
+                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                    aqrwDto.setTwo(numDto.getNum());
 
-            for (NumDto dto : oneNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setOneNum(dto.getNum());
                 }
             }
+            for (NumDto numDto : three) {
+                if (numDto.getName().equals(aqrwDto.getAdcdName())) {
+                    aqrwDto.setThree(numDto.getNum());
 
-            for (NumDto dto : twoNum) {
-                if (ObjectUtil.isNotNull(dto) &&dto.getName().equals(numDto.getName())) {
-                    aqrwDto.setTwoNum(dto.getNum());
                 }
             }
-            aqrwDto.setTotal();
-            aqrwDto.setRate();
-            list.add(aqrwDto);
         }
 
-        return list;
+
+        return dtoList;
 
     }
 }