Merge branch 'dev-hujianchun-bug' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/mobileInfo/modular/qcqualityinspection/service/impl/BusinessQcQualityInspectionServiceImpl.java

@@ -198,26 +198,46 @@ public class BusinessQcQualityInspectionServiceImpl extends ServiceImpl<Business
 
             if (StringUtils.isNotEmpty(pageParam.getCityName())) {
                 //进行条件查询
+<<<<<<< HEAD
+                //收集合格总数
+                ReserveQualityCityPageVO passVo = businessQcQualityInspectionMapper.selectCityPassByCityName(pageParam.getCityName());
+                //不收集
+                ReserveQualityCityPageVO noPassVo = businessQcQualityInspectionMapper.selectCityNoPassByCityName(pageParam.getCityName());
+
+                if (StringUtils.isEmpty(passVo.getCityId())) {
+                    noPassVo.setPassNum(passVo.getPassNum());
+                    list.add(noPassVo);
+                } else {
+                    passVo.setNoPassNum(noPassVo.getNoPassNum());
+                    list.add(passVo);
+                }
+=======
                 List<ReserveQualityCityPageVO> voList = businessQcQualityInspectionMapper.selectCitys(pageParam.getCityName());
                 list.addAll(voList);
+>>>>>>> dev
 
             } else {
                 //非条件查询
                 List<String> cityIdList = reserveQualityCityPageVOList.stream().map(ReserveQualityCityPageVO::getCityId).collect(Collectors.toList());
-                for (String cityId : cityIdList) {
-
-                    com.unis.basic.info.modular.unitInfo.entity.BasicEnum basicEnum = enumMapper.selectById(cityId);
-                    //收集合格总数
-                    ReserveQualityCityPageVO passVo = businessQcQualityInspectionMapper.selectCityPass(cityId);
-                    //不收集
-                    ReserveQualityCityPageVO noPassVo = businessQcQualityInspectionMapper.selectCityNoPass(cityId);
-
-                    noPassVo.setPassNum(passVo.getPassNum());
-                    noPassVo.setCityId(cityId);
-                    noPassVo.setCityName(basicEnum.getDictLabel());
-                    list.add(noPassVo);
+                if (CollectionUtil.isNotEmpty(cityIdList)) {
+                    for (String cityId : cityIdList) {
+
+                        com.unis.basic.info.modular.unitInfo.entity.BasicEnum basicEnum = enumMapper.selectById(cityId);
+                        //收集合格总数
+                        ReserveQualityCityPageVO passVo = businessQcQualityInspectionMapper.selectCityPass(cityId);
+                        //不收集
+                        ReserveQualityCityPageVO noPassVo = businessQcQualityInspectionMapper.selectCityNoPass(cityId);
+
+                        noPassVo.setPassNum(passVo.getPassNum());
+                        noPassVo.setCityId(cityId);
+                        if (ObjectUtil.isNotEmpty(basicEnum)) {
+                            noPassVo.setCityName(basicEnum.getDictLabel());
+                        }
+                        list.add(noPassVo);
+                    }
                 }
 
+
             }
         }
         page.setTotal(list.size());