Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/controller/VaccineInfoController.java

@@ -0,0 +1,104 @@
+package com.boman.web.core.controller;
+
+import java.util.List;
+
+import com.boman.common.core.utils.poi.ExcelUtil;
+import com.boman.common.core.web.controller.BaseController;
+import com.boman.common.core.web.page.TableDataInfo;
+import com.boman.common.log.annotation.Log;
+import com.boman.common.log.enums.BusinessType;
+import com.boman.common.security.annotation.PreAuthorize;
+import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.service.vaccineInfo.IVaccineInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.boman.web.core.domain.VaccineInfo;
+
+/**
+ * 疫苗信息Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+@RestController
+@RequestMapping("/core/info")
+public class VaccineInfoController extends BaseController {
+    @Autowired
+    private IVaccineInfoService vaccineInfoService;
+
+    /**
+     * 查询疫苗信息列表
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(VaccineInfo vaccineInfo)
+    {
+        startPage();
+        List<VaccineInfo> list = vaccineInfoService.selectVaccineInfoList(vaccineInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出疫苗信息列表
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:export')")
+    @Log(title = "疫苗信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(VaccineInfo vaccineInfo)
+    {
+        List<VaccineInfo> list = vaccineInfoService.selectVaccineInfoList(vaccineInfo);
+        ExcelUtil<VaccineInfo> util = new ExcelUtil<VaccineInfo>(VaccineInfo.class);
+//        return util.exportExcel(list, "info");
+        return null;
+    }
+
+    /**
+     * 获取疫苗信息详细信息
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(vaccineInfoService.selectVaccineInfoById(id));
+    }
+
+    /**
+     * 新增疫苗信息
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:add')")
+    @Log(title = "疫苗信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody VaccineInfo vaccineInfo)
+    {
+        return toAjax(vaccineInfoService.insertVaccineInfo(vaccineInfo));
+    }
+
+    /**
+     * 修改疫苗信息
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:edit')")
+    @Log(title = "疫苗信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody VaccineInfo vaccineInfo)
+    {
+        return toAjax(vaccineInfoService.updateVaccineInfo(vaccineInfo));
+    }
+
+    /**
+     * 删除疫苗信息
+     */
+    @PreAuthorize(hasPermi ="@ss.hasPermi('core:info:remove')")
+    @Log(title = "疫苗信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(vaccineInfoService.deleteVaccineInfoByIds(ids));
+    }
+}

boman-web-core/src/main/java/com/boman/web/core/domain/VaccineInfo.java

@@ -0,0 +1,425 @@
+package com.boman.web.core.domain;
+
+import java.util.Date;
+
+import com.boman.domain.BaseEntity;
+import com.boman.domain.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+
+/**
+ * 疫苗信息对象 vaccine_info
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+public class VaccineInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 乡镇 */
+    @Excel(name = "乡镇")
+    private String villageTowns;
+
+    /** 村居 */
+    @Excel(name = "村居")
+    private String village;
+
+    /** 村民组（社区） */
+    @Excel(name = "村民组", readConverterExp = "社=区")
+    private String villagerGroup;
+
+    /** 户别 */
+    @Excel(name = "户别")
+    private String houseType;
+
+    /** 户籍地 */
+    @Excel(name = "户籍地")
+    private String domicile;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String province;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String city;
+
+    /** 区 */
+    @Excel(name = "区")
+    private String 
+area;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private String gender;
+
+    /** 身份证号码 */
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /** 联系号码 */
+    @Excel(name = "联系号码")
+    private String phoneNum;
+
+    /** 重点行业 */
+    @Excel(name = "重点行业")
+    private String keyIndustries;
+
+    /** 接种情况（是/否） */
+    @Excel(name = "接种情况", readConverterExp = "是=/否")
+    private String isVaccination;
+
+    /** 疫苗名称 */
+    @Excel(name = "疫苗名称")
+    private String vaccineName;
+
+    /** 剂次（1/2/3/加强针） */
+    @Excel(name = "剂次", readConverterExp = "1=/2/3/加强针")
+    private String jici;
+
+    /** 接种时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "接种时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date vaccinationTime;
+
+    /** 接种地点 */
+    @Excel(name = "接种地点")
+    private String vaccinationPlace;
+
+    /** 禁忌症 */
+    @Excel(name = "禁忌症")
+    private String contraindication;
+
+    /** 暂缓 */
+    @Excel(name = "暂缓")
+    private String suspend;
+
+    /** 死亡 */
+    @Excel(name = "死亡")
+    private String death;
+
+    /** 失联失踪 */
+    @Excel(name = "失联失踪")
+    private String lostInMissing;
+
+    /** 应种未种 */
+    @Excel(name = "应种未种")
+    private String shouldBe;
+
+    /** 其他 */
+    @Excel(name = "其他")
+    private String other;
+
+    /** 进度 */
+    @Excel(name = "进度")
+    private String progress;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private String isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setVillageTowns(String villageTowns) 
+    {
+        this.villageTowns = villageTowns;
+    }
+
+    public String getVillageTowns() 
+    {
+        return villageTowns;
+    }
+    public void setVillage(String village) 
+    {
+        this.village = village;
+    }
+
+    public String getVillage() 
+    {
+        return village;
+    }
+    public void setVillagerGroup(String villagerGroup) 
+    {
+        this.villagerGroup = villagerGroup;
+    }
+
+    public String getVillagerGroup() 
+    {
+        return villagerGroup;
+    }
+    public void setHouseType(String houseType) 
+    {
+        this.houseType = houseType;
+    }
+
+    public String getHouseType() 
+    {
+        return houseType;
+    }
+    public void setDomicile(String domicile) 
+    {
+        this.domicile = domicile;
+    }
+
+    public String getDomicile() 
+    {
+        return domicile;
+    }
+    public void setProvince(String province) 
+    {
+        this.province = province;
+    }
+
+    public String getProvince() 
+    {
+        return province;
+    }
+    public void setCity(String city) 
+    {
+        this.city = city;
+    }
+
+    public String getCity() 
+    {
+        return city;
+    }
+    public void setarea(String area) {
+        this.area = area;
+    }
+
+    public String getarea()  {
+        return area;
+    }
+
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setGender(String gender) 
+    {
+        this.gender = gender;
+    }
+
+    public String getGender() 
+    {
+        return gender;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setPhoneNum(String phoneNum) 
+    {
+        this.phoneNum = phoneNum;
+    }
+
+    public String getPhoneNum() 
+    {
+        return phoneNum;
+    }
+    public void setKeyIndustries(String keyIndustries) 
+    {
+        this.keyIndustries = keyIndustries;
+    }
+
+    public String getKeyIndustries() 
+    {
+        return keyIndustries;
+    }
+    public void setIsVaccination(String isVaccination) 
+    {
+        this.isVaccination = isVaccination;
+    }
+
+    public String getIsVaccination() 
+    {
+        return isVaccination;
+    }
+    public void setVaccineName(String vaccineName) 
+    {
+        this.vaccineName = vaccineName;
+    }
+
+    public String getVaccineName() 
+    {
+        return vaccineName;
+    }
+    public void setJici(String jici) 
+    {
+        this.jici = jici;
+    }
+
+    public String getJici() 
+    {
+        return jici;
+    }
+    public void setVaccinationTime(Date vaccinationTime) 
+    {
+        this.vaccinationTime = vaccinationTime;
+    }
+
+    public Date getVaccinationTime() 
+    {
+        return vaccinationTime;
+    }
+    public void setVaccinationPlace(String vaccinationPlace) 
+    {
+        this.vaccinationPlace = vaccinationPlace;
+    }
+
+    public String getVaccinationPlace() 
+    {
+        return vaccinationPlace;
+    }
+    public void setContraindication(String contraindication) 
+    {
+        this.contraindication = contraindication;
+    }
+
+    public String getContraindication() 
+    {
+        return contraindication;
+    }
+    public void setSuspend(String suspend) 
+    {
+        this.suspend = suspend;
+    }
+
+    public String getSuspend() 
+    {
+        return suspend;
+    }
+    public void setDeath(String death) 
+    {
+        this.death = death;
+    }
+
+    public String getDeath() 
+    {
+        return death;
+    }
+    public void setLostInMissing(String lostInMissing) 
+    {
+        this.lostInMissing = lostInMissing;
+    }
+
+    public String getLostInMissing() 
+    {
+        return lostInMissing;
+    }
+    public void setShouldBe(String shouldBe) 
+    {
+        this.shouldBe = shouldBe;
+    }
+
+    public String getShouldBe() 
+    {
+        return shouldBe;
+    }
+    public void setOther(String other) 
+    {
+        this.other = other;
+    }
+
+    public String getOther() 
+    {
+        return other;
+    }
+    public void setProgress(String progress) 
+    {
+        this.progress = progress;
+    }
+
+    public String getProgress() 
+    {
+        return progress;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("villageTowns", getVillageTowns())
+            .append("village", getVillage())
+            .append("villagerGroup", getVillagerGroup())
+            .append("houseType", getHouseType())
+            .append("domicile", getDomicile())
+            .append("province", getProvince())
+            .append("city", getCity())
+            .append("area", getarea())
+            .append("userName", getUserName())
+            .append("gender", getGender())
+            .append("idCard", getIdCard())
+            .append("phoneNum", getPhoneNum())
+            .append("keyIndustries", getKeyIndustries())
+            .append("isVaccination", getIsVaccination())
+            .append("vaccineName", getVaccineName())
+            .append("jici", getJici())
+            .append("vaccinationTime", getVaccinationTime())
+            .append("vaccinationPlace", getVaccinationPlace())
+            .append("contraindication", getContraindication())
+            .append("suspend", getSuspend())
+            .append("death", getDeath())
+            .append("lostInMissing", getLostInMissing())
+            .append("shouldBe", getShouldBe())
+            .append("other", getOther())
+            .append("progress", getProgress())
+            .append("remark", getRemark())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

boman-web-core/src/main/java/com/boman/web/core/mapper/VaccineInfoMapper.java

@@ -0,0 +1,61 @@
+package com.boman.web.core.mapper;
+
+import java.util.List;
+import com.boman.web.core.domain.VaccineInfo;
+
+/**
+ * 疫苗信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+public interface VaccineInfoMapper 
+{
+    /**
+     * 查询疫苗信息
+     * 
+     * @param id 疫苗信息ID
+     * @return 疫苗信息
+     */
+    public VaccineInfo selectVaccineInfoById(Long id);
+
+    /**
+     * 查询疫苗信息列表
+     * 
+     * @param vaccineInfo 疫苗信息
+     * @return 疫苗信息集合
+     */
+    public List<VaccineInfo> selectVaccineInfoList(VaccineInfo vaccineInfo);
+
+    /**
+     * 新增疫苗信息
+     * 
+     * @param vaccineInfo 疫苗信息
+     * @return 结果
+     */
+    public int insertVaccineInfo(VaccineInfo vaccineInfo);
+
+    /**
+     * 修改疫苗信息
+     * 
+     * @param vaccineInfo 疫苗信息
+     * @return 结果
+     */
+    public int updateVaccineInfo(VaccineInfo vaccineInfo);
+
+    /**
+     * 删除疫苗信息
+     * 
+     * @param id 疫苗信息ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoById(Long id);
+
+    /**
+     * 批量删除疫苗信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoByIds(Long[] ids);
+}

boman-web-core/src/main/resources/mapper/VaccineInfoMapper.xml

@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.boman.web.core.mapper.VaccineInfoMapper">
+    
+    <resultMap type="VaccineInfo" id="VaccineInfoResult">
+        <result property="id"    column="id"    />
+        <result property="villageTowns"    column="village_towns" />
+        <result property="village"    column="village"    />
+        <result property="villagerGroup"    column="villager_group" />
+        <result property="houseType"    column="house_type"  />
+        <result property="domicile"    column="domicile"   />
+        <result property="province"    column="province"  />
+        <result property="city"    column="city"  />
+        <result property="area"    column="area"  />
+        <result property="userName"    column="user_name"  />
+        <result property="gender"    column="gender"  />
+        <result property="idCard"    column="id_card"  />
+        <result property="phoneNum"    column="phone_num"  />
+        <result property="keyIndustries"    column="key_industries" />
+        <result property="isVaccination"    column="is_vaccination"  />
+        <result property="vaccineName"    column="vaccine_name"    />
+        <result property="jici"    column="jici"    />
+        <result property="vaccinationTime"    column="vaccination_time"    />
+        <result property="vaccinationPlace"    column="vaccination_place"    />
+        <result property="contraindication"    column="contraindication"    />
+        <result property="suspend"    column="suspend"    />
+        <result property="death"    column="death"    />
+        <result property="lostInMissing"    column="lost_in_missing"    />
+        <result property="shouldBe"    column="should_be"    />
+        <result property="other"    column="other"    />
+        <result property="progress"    column="progress"    />
+        <result property="remark"    column="remark"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+    </resultMap>
+
+    <sql id="selectVaccineInfoVo">
+        select id, village_towns, village, villager_group, house_type, domicile, province, city, 
+area, user_name, gender, id_card, phone_num, key_industries, is_vaccination, vaccine_name, jici, vaccination_time, vaccination_place, contraindication, suspend, death, lost_in_missing, should_be, other, progress, remark, status, create_by, create_time, update_by, update_time, is_del from vaccine_info
+    </sql>
+
+    <select id="selectVaccineInfoList" parameterType="VaccineInfo" resultMap="VaccineInfoResult">
+        <include refid="selectVaccineInfoVo"/>
+        <where>  
+            <if test="villageTowns != null  and villageTowns != ''"> and village_towns = #{villageTowns}</if>
+            <if test="village != null  and village != ''"> and village = #{village}</if>
+            <if test="villagerGroup != null  and villagerGroup != ''"> and villager_group = #{villagerGroup}</if>
+            <if test="houseType != null  and houseType != ''"> and house_type = #{houseType}</if>
+            <if test="domicile != null  and domicile != ''"> and domicile = #{domicile}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="phoneNum != null  and phoneNum != ''"> and phone_num = #{phoneNum}</if>
+            <if test="keyIndustries != null  and keyIndustries != ''"> and key_industries = #{keyIndustries}</if>
+            <if test="isVaccination != null  and isVaccination != ''"> and is_vaccination = #{isVaccination}</if>
+            <if test="vaccineName != null  and vaccineName != ''"> and vaccine_name like concat('%', #{vaccineName}, '%')</if>
+            <if test="jici != null  and jici != ''"> and jici = #{jici}</if>
+            <if test="vaccinationTime != null "> and vaccination_time = #{vaccinationTime}</if>
+            <if test="vaccinationPlace != null  and vaccinationPlace != ''"> and vaccination_place = #{vaccinationPlace}</if>
+            <if test="contraindication != null  and contraindication != ''"> and contraindication = #{contraindication}</if>
+            <if test="suspend != null  and suspend != ''"> and suspend = #{suspend}</if>
+            <if test="death != null  and death != ''"> and death = #{death}</if>
+            <if test="lostInMissing != null  and lostInMissing != ''"> and lost_in_missing = #{lostInMissing}</if>
+            <if test="shouldBe != null  and shouldBe != ''"> and should_be = #{shouldBe}</if>
+            <if test="other != null  and other != ''"> and other = #{other}</if>
+            <if test="progress != null  and progress != ''"> and progress = #{progress}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectVaccineInfoById" parameterType="Long" resultMap="VaccineInfoResult">
+        <include refid="selectVaccineInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertVaccineInfo" parameterType="VaccineInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into vaccine_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="villageTowns != null">village_towns,</if>
+            <if test="village != null">village,</if>
+            <if test="villagerGroup != null">villager_group,</if>
+            <if test="houseType != null">house_type,</if>
+            <if test="domicile != null">domicile,</if>
+            <if test="province != null">province,</if>
+            <if test="city != null">city,</if>
+            <if test="area != null and area != ''">area,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="gender != null">gender,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="phoneNum != null">phone_num,</if>
+            <if test="keyIndustries != null">key_industries,</if>
+            <if test="isVaccination != null">is_vaccination,</if>
+            <if test="vaccineName != null">vaccine_name,</if>
+            <if test="jici != null">jici,</if>
+            <if test="vaccinationTime != null">vaccination_time,</if>
+            <if test="vaccinationPlace != null">vaccination_place,</if>
+            <if test="contraindication != null">contraindication,</if>
+            <if test="suspend != null">suspend,</if>
+            <if test="death != null">death,</if>
+            <if test="lostInMissing != null">lost_in_missing,</if>
+            <if test="shouldBe != null">should_be,</if>
+            <if test="other != null">other,</if>
+            <if test="progress != null">progress,</if>
+            <if test="remark != null">remark,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null and isDel != ''">is_del,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="villageTowns != null">#{villageTowns},</if>
+            <if test="village != null">#{village},</if>
+            <if test="villagerGroup != null">#{villagerGroup},</if>
+            <if test="houseType != null">#{houseType},</if>
+            <if test="domicile != null">#{domicile},</if>
+            <if test="province != null">#{province},</if>
+            <if test="city != null">#{city},</if>
+            <if test="area != null and area != ''">#{area},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="phoneNum != null">#{phoneNum},</if>
+            <if test="keyIndustries != null">#{keyIndustries},</if>
+            <if test="isVaccination != null">#{isVaccination},</if>
+            <if test="vaccineName != null">#{vaccineName},</if>
+            <if test="jici != null">#{jici},</if>
+            <if test="vaccinationTime != null">#{vaccinationTime},</if>
+            <if test="vaccinationPlace != null">#{vaccinationPlace},</if>
+            <if test="contraindication != null">#{contraindication},</if>
+            <if test="suspend != null">#{suspend},</if>
+            <if test="death != null">#{death},</if>
+            <if test="lostInMissing != null">#{lostInMissing},</if>
+            <if test="shouldBe != null">#{shouldBe},</if>
+            <if test="other != null">#{other},</if>
+            <if test="progress != null">#{progress},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null and isDel != ''">#{isDel},</if>
+         </trim>
+    </insert>
+
+    <update id="updateVaccineInfo" parameterType="VaccineInfo">
+        update vaccine_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="villageTowns != null">village_towns = #{villageTowns},</if>
+            <if test="village != null">village = #{village},</if>
+            <if test="villagerGroup != null">villager_group = #{villagerGroup},</if>
+            <if test="houseType != null">house_type = #{houseType},</if>
+            <if test="domicile != null">domicile = #{domicile},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="area != null and area != ''">area = #{area},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="phoneNum != null">phone_num = #{phoneNum},</if>
+            <if test="keyIndustries != null">key_industries = #{keyIndustries},</if>
+            <if test="isVaccination != null">is_vaccination = #{isVaccination},</if>
+            <if test="vaccineName != null">vaccine_name = #{vaccineName},</if>
+            <if test="jici != null">jici = #{jici},</if>
+            <if test="vaccinationTime != null">vaccination_time = #{vaccinationTime},</if>
+            <if test="vaccinationPlace != null">vaccination_place = #{vaccinationPlace},</if>
+            <if test="contraindication != null">contraindication = #{contraindication},</if>
+            <if test="suspend != null">suspend = #{suspend},</if>
+            <if test="death != null">death = #{death},</if>
+            <if test="lostInMissing != null">lost_in_missing = #{lostInMissing},</if>
+            <if test="shouldBe != null">should_be = #{shouldBe},</if>
+            <if test="other != null">other = #{other},</if>
+            <if test="progress != null">progress = #{progress},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null and isDel != ''">is_del = #{isDel},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteVaccineInfoById" parameterType="Long">
+        delete from vaccine_info where id = #{id}
+    </delete>
+
+    <delete id="deleteVaccineInfoByIds" parameterType="String">
+        delete from vaccine_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>