修改bug

huanghongfa

2021-05-20 a222db0c636712ad1f2ee872164e9408053c1433

修改bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java

@@ -5,6 +5,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
@ApiModel("疫苗分类列表请求参数")
@@ -36,4 +37,7 @@

    @ApiModelProperty("疫苗名称")
    private String vaccines;

    @ApiModelProperty("导出id集合")
    private List<Long> ids;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesInoculationByAdminDTO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("疫苗接种记录请求参数")
public class VaccinesInoculationByAdminDTO {
@@ -34,4 +36,7 @@

    @ApiModelProperty("接种剂次")
    private String dosage;

    @ApiModelProperty("导出id集合")
    private List<Long> ids;
}

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

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

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

@@ -75,6 +75,12 @@
            "<if test='inoculationByAdminDTO.communityId != null'>" +
            " and cmvir.community_id = #{inoculationByAdminDTO.communityId} "+
            " </if> " +
            "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" +
            " and cmvir.id in " +
            "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
            "#{item}" +
            "</foreach>" +
            " </if> " +
            "<if test='inoculationByAdminDTO.name != null and inoculationByAdminDTO.name != &quot;&quot;'>" +
            " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') "+
            " </if> " +

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

@@ -207,6 +207,8 @@
            if(comCvtServeDOS.size()==0  && errorInfo != null && errorInfo.size() > 0){
                return R.fail("导入失败：" + errorInfo.toString());
            }
        }else {
            return R.fail("导入失败：" + errorInfo.toString());
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }