修改bug

huanghongfa

2021-05-20 50e1eb020efe8da670b718d865fa4c1eaa61ee7d

修改bug

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java

@@ -68,9 +68,9 @@
            "<if test='vaccinesByAdminDTO.communityId != null'>" +
            " and cmver.community_id = #{vaccinesByAdminDTO.communityId} "+
            " </if> " +
            "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" +
            "<if test='vaccinesByAdminDTO.ids != null and vaccinesByAdminDTO.ids.size > 0'>" +
            " and cmvir.id in " +
            "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
            "<foreach item=\"item\" collection=\"vaccinesByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
            "#{item}" +
            "</foreach>" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java

@@ -175,7 +175,8 @@
        }
        Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
        List<String> errorInfo = new ArrayList<>();
        list.forEach(comCvtServeExcelVO -> {
        int index = 2;
        for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
            /**
             * 便民服务分类存在 并且 便民服务商家 匹配上
             */
@@ -198,7 +199,7 @@
                    errorInfo.add(comCvtServeExcelVO.getBusinessName() +"导入失败: 便民服务商家不存在");
                }
            }
        });
        }
        boolean saveBatched = this.saveBatch(comCvtServeDOS);
        if(saveBatched) {
            if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {