fix 新增疫苗操作记录

boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -102,9 +102,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			update_time
 		FROM
 			information_schema.TABLES
-		WHERE
+		<where>
 			table_schema = (SELECT DATABASE())
-		  AND table_name NOT LIKE 'qrtz_%'
+			AND table_name NOT LIKE 'qrtz_%'
+		<if test="tableName != null and tableName != ''">
+			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+		</if>
+		</where>
 	</select>
 	
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">

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

@@ -0,0 +1,106 @@
+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.vc.IVaccineInfoOperationService;
+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.VaccineInfoOperation;
+
+
+/**
+ * 疫苗信息操作Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+@RestController
+@RequestMapping("/core/operation")
+public class VaccineInfoOperationController extends BaseController
+{
+    @Autowired
+    private IVaccineInfoOperationService vaccineInfoOperationService;
+
+    /**
+     * 查询疫苗信息操作列表
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(VaccineInfoOperation vaccineInfoOperation)
+    {
+        startPage();
+        List<VaccineInfoOperation> list = vaccineInfoOperationService.selectVaccineInfoOperationList(vaccineInfoOperation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出疫苗信息操作列表
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:export')")
+    @Log(title = "疫苗信息操作", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(VaccineInfoOperation vaccineInfoOperation)
+    {
+        List<VaccineInfoOperation> list = vaccineInfoOperationService.selectVaccineInfoOperationList(vaccineInfoOperation);
+        ExcelUtil<VaccineInfoOperation> util = new ExcelUtil<VaccineInfoOperation>(VaccineInfoOperation.class);
+       // return util.exportExcel(list, "operation");
+        return null;
+    }
+
+    /**
+     * 获取疫苗信息操作详细信息
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(vaccineInfoOperationService.selectVaccineInfoOperationById(id));
+    }
+
+    /**
+     * 新增疫苗信息操作
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:add')")
+    @Log(title = "疫苗信息操作", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody VaccineInfoOperation vaccineInfoOperation)
+    {
+        return toAjax(vaccineInfoOperationService.insertVaccineInfoOperation(vaccineInfoOperation));
+    }
+
+    /**
+     * 修改疫苗信息操作
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:edit')")
+    @Log(title = "疫苗信息操作", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody VaccineInfoOperation vaccineInfoOperation)
+    {
+        return toAjax(vaccineInfoOperationService.updateVaccineInfoOperation(vaccineInfoOperation));
+    }
+
+    /**
+     * 删除疫苗信息操作
+     */
+    @PreAuthorize(hasPermi = "@ss.hasPermi('core:operation:remove')")
+    @Log(title = "疫苗信息操作", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(vaccineInfoOperationService.deleteVaccineInfoOperationByIds(ids));
+    }
+}

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

@@ -0,0 +1,451 @@
+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_operation
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+public class VaccineInfoOperation 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;
+
+    /** 操作类型 */
+    @Excel(name = "操作类型")
+    private String operationType;
+
+    /** 疫苗信息 */
+    @Excel(name = "疫苗信息")
+    private Long vaccineInfoId;
+
+    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 getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    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 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;
+    }
+    public void setOperationType(String operationType) 
+    {
+        this.operationType = operationType;
+    }
+
+    public String getOperationType() 
+    {
+        return operationType;
+    }
+    public void setVaccineInfoId(Long vaccineInfoId) 
+    {
+        this.vaccineInfoId = vaccineInfoId;
+    }
+
+    public Long getVaccineInfoId() 
+    {
+        return vaccineInfoId;
+    }
+
+    @Override
+    public String toString() {
+        return "VaccineInfoOperation{" +
+                "id=" + id +
+                ", villageTowns='" + villageTowns + '\'' +
+                ", village='" + village + '\'' +
+                ", villagerGroup='" + villagerGroup + '\'' +
+                ", houseType='" + houseType + '\'' +
+                ", domicile='" + domicile + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", area='" + area + '\'' +
+                ", userName='" + userName + '\'' +
+                ", gender='" + gender + '\'' +
+                ", idCard='" + idCard + '\'' +
+                ", phoneNum='" + phoneNum + '\'' +
+                ", keyIndustries='" + keyIndustries + '\'' +
+                ", isVaccination='" + isVaccination + '\'' +
+                ", vaccineName='" + vaccineName + '\'' +
+                ", jici='" + jici + '\'' +
+                ", vaccinationTime=" + vaccinationTime +
+                ", vaccinationPlace='" + vaccinationPlace + '\'' +
+                ", contraindication='" + contraindication + '\'' +
+                ", suspend='" + suspend + '\'' +
+                ", death='" + death + '\'' +
+                ", lostInMissing='" + lostInMissing + '\'' +
+                ", shouldBe='" + shouldBe + '\'' +
+                ", other='" + other + '\'' +
+                ", progress='" + progress + '\'' +
+                ", status='" + status + '\'' +
+                ", isDel='" + isDel + '\'' +
+                ", operationType='" + operationType + '\'' +
+                ", vaccineInfoId=" + vaccineInfoId +
+                '}';
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.boman.web.core.mapper;
+
+import java.util.List;
+import com.boman.web.core.domain.VaccineInfoOperation;
+
+/**
+ * 疫苗信息操作Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+public interface VaccineInfoOperationMapper 
+{
+    /**
+     * 查询疫苗信息操作
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 疫苗信息操作
+     */
+    public VaccineInfoOperation selectVaccineInfoOperationById(Long id);
+
+    /**
+     * 查询疫苗信息操作列表
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 疫苗信息操作集合
+     */
+    public List<VaccineInfoOperation> selectVaccineInfoOperationList(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 新增疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    public int insertVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 修改疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    public int updateVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 删除疫苗信息操作
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoOperationById(Long id);
+
+    /**
+     * 批量删除疫苗信息操作
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoOperationByIds(Long[] ids);
+}

boman-web-core/src/main/java/com/boman/web/core/service/vc/IVaccineInfoOperationService.java

@@ -0,0 +1,61 @@
+package com.boman.web.core.service.vc;
+
+import java.util.List;
+import com.boman.web.core.domain.VaccineInfoOperation;
+
+/**
+ * 疫苗信息操作Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+public interface IVaccineInfoOperationService 
+{
+    /**
+     * 查询疫苗信息操作
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 疫苗信息操作
+     */
+    public VaccineInfoOperation selectVaccineInfoOperationById(Long id);
+
+    /**
+     * 查询疫苗信息操作列表
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 疫苗信息操作集合
+     */
+    public List<VaccineInfoOperation> selectVaccineInfoOperationList(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 新增疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    public int insertVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 修改疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    public int updateVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation);
+
+    /**
+     * 批量删除疫苗信息操作
+     * 
+     * @param ids 需要删除的疫苗信息操作ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoOperationByIds(Long[] ids);
+
+    /**
+     * 删除疫苗信息操作信息
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 结果
+     */
+    public int deleteVaccineInfoOperationById(Long id);
+}

boman-web-core/src/main/java/com/boman/web/core/service/vc/impl/VaccineInfoOperationServiceImpl.java

@@ -0,0 +1,97 @@
+package com.boman.web.core.service.vc.impl;
+
+import java.util.List;
+
+import com.boman.common.core.utils.DateUtils;
+import com.boman.web.core.service.vc.IVaccineInfoOperationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.boman.web.core.mapper.VaccineInfoOperationMapper;
+import com.boman.web.core.domain.VaccineInfoOperation;
+
+/**
+ * 疫苗信息操作Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-05
+ */
+@Service
+public class VaccineInfoOperationServiceImpl implements IVaccineInfoOperationService
+{
+    @Autowired
+    private VaccineInfoOperationMapper vaccineInfoOperationMapper;
+
+    /**
+     * 查询疫苗信息操作
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 疫苗信息操作
+     */
+    @Override
+    public VaccineInfoOperation selectVaccineInfoOperationById(Long id)
+    {
+        return vaccineInfoOperationMapper.selectVaccineInfoOperationById(id);
+    }
+
+    /**
+     * 查询疫苗信息操作列表
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 疫苗信息操作
+     */
+    @Override
+    public List<VaccineInfoOperation> selectVaccineInfoOperationList(VaccineInfoOperation vaccineInfoOperation)
+    {
+        return vaccineInfoOperationMapper.selectVaccineInfoOperationList(vaccineInfoOperation);
+    }
+
+    /**
+     * 新增疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    @Override
+    public int insertVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation)
+    {
+        vaccineInfoOperation.setCreateTime(DateUtils.getNowDate());
+        return vaccineInfoOperationMapper.insertVaccineInfoOperation(vaccineInfoOperation);
+    }
+
+    /**
+     * 修改疫苗信息操作
+     * 
+     * @param vaccineInfoOperation 疫苗信息操作
+     * @return 结果
+     */
+    @Override
+    public int updateVaccineInfoOperation(VaccineInfoOperation vaccineInfoOperation)
+    {
+        vaccineInfoOperation.setUpdateTime(DateUtils.getNowDate());
+        return vaccineInfoOperationMapper.updateVaccineInfoOperation(vaccineInfoOperation);
+    }
+
+    /**
+     * 批量删除疫苗信息操作
+     * 
+     * @param ids 需要删除的疫苗信息操作ID
+     * @return 结果
+     */
+    @Override
+    public int deleteVaccineInfoOperationByIds(Long[] ids)
+    {
+        return vaccineInfoOperationMapper.deleteVaccineInfoOperationByIds(ids);
+    }
+
+    /**
+     * 删除疫苗信息操作信息
+     * 
+     * @param id 疫苗信息操作ID
+     * @return 结果
+     */
+    @Override
+    public int deleteVaccineInfoOperationById(Long id)
+    {
+        return vaccineInfoOperationMapper.deleteVaccineInfoOperationById(id);
+    }
+}