shiqian преди 3 години
родител
ревизия
649048b52e
променени са 16 файла, в които са добавени 1393 реда и са изтрити 65 реда
  1. 210 0
      boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java
  2. 136 0
      boman-api/boman-domain/src/main/java/com/boman/domain/CzrkJzdz.java
  3. 1 1
      boman-api/boman-domain/src/main/java/com/boman/domain/VaccineInfoOperation.java
  4. 2 0
      boman-common/boman-common-redis/src/main/java/com/boman/common/redis/RedisKey.java
  5. 104 0
      boman-web-core/src/main/java/com/boman/web/core/controller/Czrk1Controller.java
  6. 58 63
      boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java
  7. 91 0
      boman-web-core/src/main/java/com/boman/web/core/controller/CzrkJzdzController.java
  8. 62 0
      boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkJzdzMapper.java
  9. 62 0
      boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java
  10. 87 0
      boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java
  11. 93 0
      boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java
  12. 62 0
      boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java
  13. 61 0
      boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkService.java
  14. 1 1
      boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java
  15. 152 0
      boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml
  16. 211 0
      boman-web-core/src/main/resources/mapper/CzrkMapper.xml

+ 210 - 0
boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -0,0 +1,210 @@
+package com.boman.domain;
+
+import java.util.Date;
+
+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;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 常住人口对象 czrk
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class Czrk {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String gender;
+
+    /**
+     * 年龄
+     */
+    @Excel(name = "年龄")
+    private Integer age;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private java.sql.Date birthday;
+
+    /**
+     * 身份证号码
+     */
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /**
+     * 联系号码
+     */
+    @Excel(name = "联系号码")
+    private String phoneNum;
+
+    /**
+     * 户籍号
+     */
+    @Excel(name = "户籍号")
+    private String code;
+
+    /**
+     * 是否是户主
+     */
+    @Excel(name = "是否是户主")
+    private String houseType;
+
+    /**
+     * 认领人
+     */
+    @Excel(name = "认领人")
+    private String rlr;
+
+    /**
+     * 认领时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "认领时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private java.sql.Date rlTime;
+
+    /**
+     * 与户主关系
+     */
+    @Excel(name = "与户主关系")
+    private String yhzgx;
+
+    /**
+     * 工作单位
+     */
+    @Excel(name = "工作单位")
+    private String workUnit;
+
+    /**
+     * 户籍地的省份
+     */
+    @Excel(name = "户籍地的省份")
+    private String provinceId;
+
+    /**
+     * 户籍地的省份
+     */
+    @Excel(name = "户籍地的省份")
+    private String province;
+
+    /**
+     * 户籍地的城市
+     */
+    @Excel(name = "户籍地的城市")
+    private String cityId;
+
+    /**
+     * 户籍地的城市
+     */
+    @Excel(name = "户籍地的城市")
+    private String city;
+
+    /**
+     * 户籍地的区
+     */
+    @Excel(name = "户籍地的区")
+    private String regionId;
+
+    /**
+     * 户籍地的区
+     */
+    @Excel(name = "户籍地的区")
+    private String region;
+
+    /**
+     * 户籍地的镇
+     */
+    @Excel(name = "户籍地的镇")
+    private String villageTownsId;
+
+    /**
+     * 户籍地的镇
+     */
+    @Excel(name = "户籍地的镇")
+    private String villageTowns;
+
+    /**
+     * 户籍地的村
+     */
+    @Excel(name = "户籍地的村")
+    private String villageId;
+
+    /**
+     * 户籍地的村
+     */
+    @Excel(name = "户籍地的村")
+    private String village;
+
+    /**
+     * 户籍地的组
+     */
+    @Excel(name = "户籍地的组")
+    private String villagerGroupId;
+
+    /**
+     * 户籍地的组
+     */
+    @Excel(name = "户籍地的组")
+    private String villagerGroup;
+
+    /**
+     * 户籍地的详细地址
+     */
+    @Excel(name = "户籍地的详细地址")
+    private String nowIn;
+
+    /**
+     * 状态
+     */
+    @Excel(name = "状态")
+    private String status;
+
+    /**
+     * 是否删除
+     */
+    @Excel(name = "是否删除")
+    private String isDel;
+
+    /**
+     * 删除原因
+     */
+    @Excel(name = "删除原因")
+    private String deleteReason;
+    private String remark;
+
+    private java.sql.Timestamp createTime;
+    private java.sql.Timestamp updateTime;
+    private String createBy;
+    private String updateBy;
+}

+ 136 - 0
boman-api/boman-domain/src/main/java/com/boman/domain/CzrkJzdz.java

@@ -0,0 +1,136 @@
+package com.boman.domain;
+
+import com.boman.domain.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 常住人口对应的居住地址对象 czrk_jzdz
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class CzrkJzdz {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * czrk表的id
+     */
+    @Excel(name = "czrk表的id")
+    private Long czrkId;
+
+    /**
+     * 身份证号码
+     */
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /**
+     * 居住地址的排序
+     */
+    @Excel(name = "居住地址的排序")
+    private Integer sort;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long deptId;
+
+    /**
+     * 户籍地的省份
+     */
+    @Excel(name = "户籍地的省份")
+    private String provinceId;
+
+    /**
+     * 户籍地的省份
+     */
+    @Excel(name = "户籍地的省份")
+    private String province;
+
+    /**
+     * 户籍地的城市
+     */
+    @Excel(name = "户籍地的城市")
+    private String cityId;
+
+    /**
+     * 户籍地的城市
+     */
+    @Excel(name = "户籍地的城市")
+    private String city;
+
+    /**
+     * 户籍地的区
+     */
+    @Excel(name = "户籍地的区")
+    private String regionId;
+
+    /**
+     * 户籍地的区
+     */
+    @Excel(name = "户籍地的区")
+    private String region;
+
+    /**
+     * 居住地的镇
+     */
+    @Excel(name = "居住地的镇")
+    private String townId;
+
+    /**
+     * 居住地的镇
+     */
+    @Excel(name = "居住地的镇")
+    private String town;
+
+    /**
+     * 居住地的村
+     */
+    @Excel(name = "居住地的村")
+    private String villageId;
+
+    /**
+     * 居住地的村
+     */
+    @Excel(name = "居住地的村")
+    private String village;
+
+    /**
+     * 居住地的详细地址
+     */
+    @Excel(name = "居住地的详细地址")
+    private String nowIn;
+
+    /**
+     * Y有效地址,N无效地址
+     */
+    @Excel(name = "Y有效地址,N无效地址")
+    private String status;
+
+    private java.sql.Timestamp createTime;
+    private java.sql.Timestamp updateTime;
+    private String createBy;
+    private String updateBy;
+
+}

+ 1 - 1
boman-api/boman-domain/src/main/java/com/boman/domain/VaccineInfoOperation.java

@@ -44,7 +44,7 @@ public class VaccineInfoOperation extends BaseEntity {
     private String villagerGroup;
 
     /**
-     * 户别 是否是户主 是Y, 否N
+     * 户别 是否是户主 是, 否
      */
     @Excel(name = "户别")
     private String houseType;

+ 2 - 0
boman-common/boman-common-redis/src/main/java/com/boman/common/redis/RedisKey.java

@@ -40,4 +40,6 @@ public class RedisKey {
 
     /** 常住人口统计 **/
     public static final String STS_CZRK_ = "sts:czrk:";
+    /** 常住人口统计 **/
+    public static final String CHINA_AREA = "CHINA_AREA";
 }

+ 104 - 0
boman-web-core/src/main/java/com/boman/web/core/controller/Czrk1Controller.java

@@ -0,0 +1,104 @@
+package com.boman.web.core.controller;
+
+import com.boman.common.core.web.controller.BaseController;
+import com.boman.domain.TableDataInfo;
+import com.boman.domain.VaccineInfoOperation;
+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.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author shiqian
+ * @description 常驻人口
+ * @date 2022年01月05日 15:39
+ **/
+@RestController
+@RequestMapping("/core/czrk")
+public class Czrk1Controller extends BaseController {
+
+    @Autowired
+    private IVaccineInfoService vaccineInfoService;
+
+    /**
+     * 功能描述: 项目首页统计信息,
+     * 当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/stsByCzrkHomePage")
+    public AjaxResult stsByCzrkHomePage() {
+        return AjaxResult.success("成功", vaccineInfoService.stsByCzrkHomePage());
+    }
+
+    /**
+     * 功能描述: 当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/stsByCzrk")
+    public AjaxResult stsByCzrk() {
+        return AjaxResult.success("成功", vaccineInfoService.stsByCzrk());
+    }
+
+    /**
+     * 功能描述: ”当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人“ 中的新增人员列表
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/listByXz")
+    public TableDataInfo listByXz(VaccineInfoOperation condition) {
+        List<VaccineInfoOperation> list = vaccineInfoService.listByXz(condition);
+        return getDataTable(list);
+    }
+
+    /**
+     * 功能描述: ”当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人“ 中的减少人员列表
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/listByJs")
+    public TableDataInfo listByJs(VaccineInfoOperation condition) {
+        List<VaccineInfoOperation> list = vaccineInfoService.listByJs(condition);
+        return getDataTable(list);
+    }
+
+    /**
+     * 功能描述: 删除常住人口,人员认领中的删除也是这个接口
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/deleteCzrk")
+    public AjaxResult deleteCzrk(VaccineInfoOperation vaccineInfoOperation) {
+        return vaccineInfoService.deleteCzrk(vaccineInfoOperation);
+    }
+
+    /**
+     * 功能描述: 回收站的还原功能
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/reduction/{id}")
+    public AjaxResult reduction(@PathVariable("id") String id) {
+        int reduction = vaccineInfoService.reduction(id);
+        return reduction > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 功能描述: 根据户号查找家庭中所有人员
+     *
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @GetMapping("/family/{code}")
+    public AjaxResult family(@PathVariable("code") String code) {
+        return AjaxResult.success(vaccineInfoService.family(code));
+    }
+
+
+
+}

+ 58 - 63
boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -1,104 +1,99 @@
 package com.boman.web.core.controller;
 
+import java.io.IOException;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.boman.common.core.utils.poi.ExcelUtil;
 import com.boman.common.core.web.controller.BaseController;
+import com.boman.common.log.annotation.Log;
+import com.boman.common.log.enums.BusinessType;
+import com.boman.domain.Czrk;
 import com.boman.domain.TableDataInfo;
-import com.boman.domain.VaccineInfoOperation;
 import com.boman.domain.dto.AjaxResult;
-import com.boman.web.core.service.vaccineInfo.IVaccineInfoService;
+import com.boman.web.core.service.czrk.ICzrkService;
 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 java.util.List;
-
 /**
- * @author shiqian
- * @description 常驻人口
- * @date 2022年01月05日 15:39
- **/
+ * 常住人口Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
 @RestController
-@RequestMapping("/core/czrk")
+@RequestMapping("/czrk")
 public class CzrkController extends BaseController {
 
     @Autowired
-    private IVaccineInfoService vaccineInfoService;
-
-    /**
-     * 功能描述: 项目首页统计信息,
-     * 当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人
-     *
-     * @return com.boman.domain.dto.AjaxResult
-     */
-    @GetMapping("/stsByCzrkHomePage")
-    public AjaxResult stsByCzrkHomePage() {
-        return AjaxResult.success("成功", vaccineInfoService.stsByCzrkHomePage());
-    }
+    private ICzrkService czrkService;
 
     /**
-     * 功能描述: 当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 查询常住人口列表
      */
-    @GetMapping("/stsByCzrk")
-    public AjaxResult stsByCzrk() {
-        return AjaxResult.success("成功", vaccineInfoService.stsByCzrk());
+//    @PreAuthorize("@ss.hasPermi('system:czrk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Czrk czrk) {
+        startPage();
+        List<Czrk> list = czrkService.selectCzrkList(czrk);
+        return getDataTable(list);
     }
 
     /**
-     * 功能描述: ”当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人“ 中的新增人员列表
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 导出常住人口列表
      */
-    @GetMapping("/listByXz")
-    public TableDataInfo listByXz(VaccineInfoOperation condition) {
-        List<VaccineInfoOperation> list = vaccineInfoService.listByXz(condition);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:czrk:export')")
+    @Log(title = "常住人口", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Czrk czrk) throws IOException {
+        List<Czrk> list = czrkService.selectCzrkList(czrk);
+        ExcelUtil<Czrk> util = new ExcelUtil<>(Czrk.class);
+        util.exportExcel(response, list, "常住人口数据");
     }
 
     /**
-     * 功能描述: ”当前单位:镇,村:7个,组:300个,常住人口:5000人,新增 2人  减少 2人“ 中的减少人员列表
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 获取常住人口详细信息
      */
-    @GetMapping("/listByJs")
-    public TableDataInfo listByJs(VaccineInfoOperation condition) {
-        List<VaccineInfoOperation> list = vaccineInfoService.listByJs(condition);
-        return getDataTable(list);
+//    @PreAuthorize("@ss.hasPermi('system:czrk:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(czrkService.selectCzrkById(id));
     }
 
     /**
-     * 功能描述: 删除常住人口,人员认领中的删除也是这个接口
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 新增常住人口
      */
-    @GetMapping("/deleteCzrk")
-    public AjaxResult deleteCzrk(VaccineInfoOperation vaccineInfoOperation) {
-        return vaccineInfoService.deleteCzrk(vaccineInfoOperation);
+//    @PreAuthorize("@ss.hasPermi('system:czrk:add')")
+    @Log(title = "常住人口", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Czrk czrk) {
+        return toAjax(czrkService.insertCzrk(czrk));
     }
 
     /**
-     * 功能描述: 回收站的还原功能
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 修改常住人口
      */
-    @GetMapping("/reduction/{id}")
-    public AjaxResult reduction(@PathVariable("id") String id) {
-        int reduction = vaccineInfoService.reduction(id);
-        return reduction > 0 ? AjaxResult.success() : AjaxResult.error();
+//    @PreAuthorize("@ss.hasPermi('system:czrk:edit')")
+    @Log(title = "常住人口", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Czrk czrk) {
+        return toAjax(czrkService.updateCzrk(czrk));
     }
 
     /**
-     * 功能描述: 根据户号查找家庭中所有人员
-     *
-     * @return com.boman.domain.dto.AjaxResult
+     * 删除常住人口
      */
-    @GetMapping("/family/{code}")
-    public AjaxResult family(@PathVariable("code") String code) {
-        return AjaxResult.success(vaccineInfoService.family(code));
+//    @PreAuthorize("@ss.hasPermi('system:czrk:remove')")
+    @Log(title = "常住人口", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(czrkService.deleteCzrkByIds(ids));
     }
-
-
-
 }

+ 91 - 0
boman-web-core/src/main/java/com/boman/web/core/controller/CzrkJzdzController.java

@@ -0,0 +1,91 @@
+package com.boman.web.core.controller;
+
+import com.boman.common.core.utils.poi.ExcelUtil;
+import com.boman.common.core.web.controller.BaseController;
+import com.boman.common.log.annotation.Log;
+import com.boman.common.log.enums.BusinessType;
+import com.boman.domain.CzrkJzdz;
+import com.boman.domain.TableDataInfo;
+import com.boman.domain.dto.AjaxResult;
+import com.boman.web.core.service.czrk.ICzrkJzdzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 常住人口对应的居住地址Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@RestController
+@RequestMapping("/system/jzdz")
+public class CzrkJzdzController extends BaseController {
+    @Autowired
+    private ICzrkJzdzService czrkJzdzService;
+
+    /**
+     * 查询常住人口对应的居住地址列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CzrkJzdz czrkJzdz) {
+        startPage();
+        List<CzrkJzdz> list = czrkJzdzService.selectCzrkJzdzList(czrkJzdz);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出常住人口对应的居住地址列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:export')")
+    @Log(title = "常住人口对应的居住地址", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CzrkJzdz czrkJzdz) throws IOException {
+        List<CzrkJzdz> list = czrkJzdzService.selectCzrkJzdzList(czrkJzdz);
+        ExcelUtil<CzrkJzdz> util = new ExcelUtil<>(CzrkJzdz.class);
+        util.exportExcel(response, list, "常住人口对应的居住地址数据");
+    }
+
+    /**
+     * 获取常住人口对应的居住地址详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(czrkJzdzService.selectCzrkJzdzById(id));
+    }
+
+    /**
+     * 新增常住人口对应的居住地址
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:add')")
+    @Log(title = "常住人口对应的居住地址", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CzrkJzdz czrkJzdz) {
+        return toAjax(czrkJzdzService.insertCzrkJzdz(czrkJzdz));
+    }
+
+    /**
+     * 修改常住人口对应的居住地址
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:edit')")
+    @Log(title = "常住人口对应的居住地址", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CzrkJzdz czrkJzdz) {
+        return toAjax(czrkJzdzService.updateCzrkJzdz(czrkJzdz));
+    }
+
+    /**
+     * 删除常住人口对应的居住地址
+     */
+//    @PreAuthorize("@ss.hasPermi('system:jzdz:remove')")
+    @Log(title = "常住人口对应的居住地址", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(czrkJzdzService.deleteCzrkJzdzByIds(ids));
+    }
+}

+ 62 - 0
boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkJzdzMapper.java

@@ -0,0 +1,62 @@
+package com.boman.web.core.mapper;
+
+import com.boman.domain.CzrkJzdz;
+
+import java.util.List;
+
+/**
+ * 常住人口对应的居住地址Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+ public interface CzrkJzdzMapper
+{
+    /**
+     * 查询常住人口对应的居住地址
+     * 
+     * @param id 常住人口对应的居住地址主键
+     * @return 常住人口对应的居住地址
+     */
+     CzrkJzdz selectCzrkJzdzById(Long id);
+
+    /**
+     * 查询常住人口对应的居住地址列表
+     * 
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 常住人口对应的居住地址集合
+     */
+     List<CzrkJzdz> selectCzrkJzdzList(CzrkJzdz czrkJzdz);
+
+    /**
+     * 新增常住人口对应的居住地址
+     * 
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+     int insertCzrkJzdz(CzrkJzdz czrkJzdz);
+
+    /**
+     * 修改常住人口对应的居住地址
+     * 
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+     int updateCzrkJzdz(CzrkJzdz czrkJzdz);
+
+    /**
+     * 删除常住人口对应的居住地址
+     * 
+     * @param id 常住人口对应的居住地址主键
+     * @return 结果
+     */
+     int deleteCzrkJzdzById(Long id);
+
+    /**
+     * 批量删除常住人口对应的居住地址
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteCzrkJzdzByIds(Long[] ids);
+}

+ 62 - 0
boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -0,0 +1,62 @@
+package com.boman.web.core.mapper;
+
+import com.boman.domain.Czrk;
+
+import java.util.List;
+
+
+/**
+ * 常住人口Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+public interface CzrkMapper {
+    /**
+     * 查询常住人口
+     *
+     * @param id 常住人口主键
+     * @return 常住人口
+     */
+    Czrk selectCzrkById(Long id);
+
+    /**
+     * 查询常住人口列表
+     *
+     * @param czrk 常住人口
+     * @return 常住人口集合
+     */
+    List<Czrk> selectCzrkList(Czrk czrk);
+
+    /**
+     * 新增常住人口
+     *
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    int insertCzrk(Czrk czrk);
+
+    /**
+     * 修改常住人口
+     *
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    int updateCzrk(Czrk czrk);
+
+    /**
+     * 删除常住人口
+     *
+     * @param id 常住人口主键
+     * @return 结果
+     */
+    int deleteCzrkById(Long id);
+
+    /**
+     * 批量删除常住人口
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCzrkByIds(Long[] ids);
+}

+ 87 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -0,0 +1,87 @@
+package com.boman.web.core.service.czrk;
+
+import com.boman.domain.CzrkJzdz;
+import com.boman.web.core.mapper.CzrkJzdzMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 常住人口对应的居住地址Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@Service
+public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
+
+    @Autowired
+    private CzrkJzdzMapper czrkJzdzMapper;
+
+    /**
+     * 查询常住人口对应的居住地址
+     *
+     * @param id 常住人口对应的居住地址主键
+     * @return 常住人口对应的居住地址
+     */
+    @Override
+    public CzrkJzdz selectCzrkJzdzById(Long id) {
+        return czrkJzdzMapper.selectCzrkJzdzById(id);
+    }
+
+    /**
+     * 查询常住人口对应的居住地址列表
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 常住人口对应的居住地址
+     */
+    @Override
+    public List<CzrkJzdz> selectCzrkJzdzList(CzrkJzdz czrkJzdz) {
+        return czrkJzdzMapper.selectCzrkJzdzList(czrkJzdz);
+    }
+
+    /**
+     * 新增常住人口对应的居住地址
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+    @Override
+    public int insertCzrkJzdz(CzrkJzdz czrkJzdz) {
+        return czrkJzdzMapper.insertCzrkJzdz(czrkJzdz);
+    }
+
+    /**
+     * 修改常住人口对应的居住地址
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+    @Override
+    public int updateCzrkJzdz(CzrkJzdz czrkJzdz) {
+        return czrkJzdzMapper.updateCzrkJzdz(czrkJzdz);
+    }
+
+    /**
+     * 批量删除常住人口对应的居住地址
+     *
+     * @param ids 需要删除的常住人口对应的居住地址主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCzrkJzdzByIds(Long[] ids) {
+        return czrkJzdzMapper.deleteCzrkJzdzByIds(ids);
+    }
+
+    /**
+     * 删除常住人口对应的居住地址信息
+     *
+     * @param id 常住人口对应的居住地址主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCzrkJzdzById(Long id) {
+        return czrkJzdzMapper.deleteCzrkJzdzById(id);
+    }
+}

+ 93 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -0,0 +1,93 @@
+package com.boman.web.core.service.czrk;
+
+import com.boman.domain.Czrk;
+import com.boman.web.core.mapper.CzrkMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 常住人口Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+@Service
+public class CzrkServiceImpl implements ICzrkService 
+{
+    @Autowired
+    private CzrkMapper czrkMapper;
+
+    /**
+     * 查询常住人口
+     * 
+     * @param id 常住人口主键
+     * @return 常住人口
+     */
+    @Override
+    public Czrk selectCzrkById(Long id)
+    {
+        return czrkMapper.selectCzrkById(id);
+    }
+
+    /**
+     * 查询常住人口列表
+     * 
+     * @param czrk 常住人口
+     * @return 常住人口
+     */
+    @Override
+    public List<Czrk> selectCzrkList(Czrk czrk)
+    {
+        return czrkMapper.selectCzrkList(czrk);
+    }
+
+    /**
+     * 新增常住人口
+     * 
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    @Override
+    public int insertCzrk(Czrk czrk)
+    {
+        return czrkMapper.insertCzrk(czrk);
+    }
+
+    /**
+     * 修改常住人口
+     * 
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    @Override
+    public int updateCzrk(Czrk czrk)
+    {
+        return czrkMapper.updateCzrk(czrk);
+    }
+
+    /**
+     * 批量删除常住人口
+     * 
+     * @param ids 需要删除的常住人口主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCzrkByIds(Long[] ids)
+    {
+        return czrkMapper.deleteCzrkByIds(ids);
+    }
+
+    /**
+     * 删除常住人口信息
+     * 
+     * @param id 常住人口主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCzrkById(Long id)
+    {
+        return czrkMapper.deleteCzrkById(id);
+    }
+}

+ 62 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java

@@ -0,0 +1,62 @@
+package com.boman.web.core.service.czrk;
+
+
+import com.boman.domain.CzrkJzdz;
+
+import java.util.List;
+
+/**
+ * 常住人口对应的居住地址Service接口
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+public interface ICzrkJzdzService {
+    /**
+     * 查询常住人口对应的居住地址
+     *
+     * @param id 常住人口对应的居住地址主键
+     * @return 常住人口对应的居住地址
+     */
+    CzrkJzdz selectCzrkJzdzById(Long id);
+
+    /**
+     * 查询常住人口对应的居住地址列表
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 常住人口对应的居住地址集合
+     */
+    List<CzrkJzdz> selectCzrkJzdzList(CzrkJzdz czrkJzdz);
+
+    /**
+     * 新增常住人口对应的居住地址
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+    int insertCzrkJzdz(CzrkJzdz czrkJzdz);
+
+    /**
+     * 修改常住人口对应的居住地址
+     *
+     * @param czrkJzdz 常住人口对应的居住地址
+     * @return 结果
+     */
+    int updateCzrkJzdz(CzrkJzdz czrkJzdz);
+
+    /**
+     * 批量删除常住人口对应的居住地址
+     *
+     * @param ids 需要删除的常住人口对应的居住地址主键集合
+     * @return 结果
+     */
+    int deleteCzrkJzdzByIds(Long[] ids);
+
+    /**
+     * 删除常住人口对应的居住地址信息
+     *
+     * @param id 常住人口对应的居住地址主键
+     * @return 结果
+     */
+    int deleteCzrkJzdzById(Long id);
+}

+ 61 - 0
boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkService.java

@@ -0,0 +1,61 @@
+package com.boman.web.core.service.czrk;
+
+import com.boman.domain.Czrk;
+
+import java.util.List;
+
+/**
+ * 常住人口Service接口
+ *
+ * @author ruoyi
+ * @date 2022-01-14
+ */
+public interface ICzrkService {
+    /**
+     * 查询常住人口
+     *
+     * @param id 常住人口主键
+     * @return 常住人口
+     */
+    Czrk selectCzrkById(Long id);
+
+    /**
+     * 查询常住人口列表
+     *
+     * @param czrk 常住人口
+     * @return 常住人口集合
+     */
+    List<Czrk> selectCzrkList(Czrk czrk);
+
+    /**
+     * 新增常住人口
+     *
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    int insertCzrk(Czrk czrk);
+
+    /**
+     * 修改常住人口
+     *
+     * @param czrk 常住人口
+     * @return 结果
+     */
+    int updateCzrk(Czrk czrk);
+
+    /**
+     * 批量删除常住人口
+     *
+     * @param ids 需要删除的常住人口主键集合
+     * @return 结果
+     */
+    int deleteCzrkByIds(Long[] ids);
+
+    /**
+     * 删除常住人口信息
+     *
+     * @param id 常住人口主键
+     * @return 结果
+     */
+    int deleteCzrkById(Long id);
+}

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -1132,7 +1132,7 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
 
         int count = vaccineInfoMapper.countIdCard(vaccineInfo.getIdCard());
         if (count > 0) {
-            return  AjaxResult.error(String.format("该人员[%s]已存在,请勿重复添加", vaccineInfo.getIdCard()));
+            return  AjaxResult.error(String.format("该人员[身份证号为: %s]已存在,请勿重复添加", vaccineInfo.getIdCard()));
         }
 
         int i = vaccineInfoMapper.insertVaccineInfo(vaccineInfo);

+ 152 - 0
boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml

@@ -0,0 +1,152 @@
+<?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.CzrkJzdzMapper">
+    
+    <resultMap type="com.boman.domain.CzrkJzdz" id="CzrkJzdzResult">
+        <result property="id"    column="id"    />
+        <result property="czrkId"    column="czrk_id"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="userName"    column="user_name"    />
+        <result property="sort"    column="sort"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="province"    column="province"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="city"    column="city"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="region"    column="region"    />
+        <result property="townId"    column="town_id"    />
+        <result property="town"    column="town"    />
+        <result property="villageId"    column="village_id"    />
+        <result property="village"    column="village"    />
+        <result property="nowIn"    column="now_in"    />
+        <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="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectCzrkJzdzVo">
+        select id, czrk_id, id_card, user_name, sort, dept_id, province_id, province, city_id, city, region_id, region, town_id, town, village_id, village, now_in, create_by, create_time, update_by, update_time, status from czrk_jzdz
+    </sql>
+
+    <select id="selectCzrkJzdzList" resultMap="CzrkJzdzResult">
+        <include refid="selectCzrkJzdzVo"/>
+        <where>  
+            <if test="czrkId != null "> and czrk_id = #{czrkId}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="provinceId != null  and provinceId != ''"> and province_id = #{provinceId}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="regionId != null  and regionId != ''"> and region_id = #{regionId}</if>
+            <if test="region != null  and region != ''"> and region = #{region}</if>
+            <if test="townId != null  and townId != ''"> and town_id = #{townId}</if>
+            <if test="town != null  and town != ''"> and town = #{town}</if>
+            <if test="villageId != null  and villageId != ''"> and village_id = #{villageId}</if>
+            <if test="village != null  and village != ''"> and village = #{village}</if>
+            <if test="nowIn != null  and nowIn != ''"> and now_in = #{nowIn}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectCzrkJzdzById" parameterType="Long" resultMap="CzrkJzdzResult">
+        <include refid="selectCzrkJzdzVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCzrkJzdz" useGeneratedKeys="true" keyProperty="id">
+        insert into czrk_jzdz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="czrkId != null">czrk_id,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="sort != null">sort,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="province != null">province,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="city != null">city,</if>
+            <if test="regionId != null">region_id,</if>
+            <if test="region != null">region,</if>
+            <if test="townId != null">town_id,</if>
+            <if test="town != null">town,</if>
+            <if test="villageId != null">village_id,</if>
+            <if test="village != null">village,</if>
+            <if test="nowIn != null">now_in,</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="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="czrkId != null">#{czrkId},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="province != null">#{province},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="city != null">#{city},</if>
+            <if test="regionId != null">#{regionId},</if>
+            <if test="region != null">#{region},</if>
+            <if test="townId != null">#{townId},</if>
+            <if test="town != null">#{town},</if>
+            <if test="villageId != null">#{villageId},</if>
+            <if test="village != null">#{village},</if>
+            <if test="nowIn != null">#{nowIn},</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="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCzrkJzdz" >
+        update czrk_jzdz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="czrkId != null">czrk_id = #{czrkId},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="townId != null">town_id = #{townId},</if>
+            <if test="town != null">town = #{town},</if>
+            <if test="villageId != null">village_id = #{villageId},</if>
+            <if test="village != null">village = #{village},</if>
+            <if test="nowIn != null">now_in = #{nowIn},</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="status != null">status = #{status},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCzrkJzdzById" parameterType="Long">
+        delete from czrk_jzdz where id = #{id}
+    </delete>
+
+    <delete id="deleteCzrkJzdzByIds" parameterType="String">
+        delete from czrk_jzdz where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 211 - 0
boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -0,0 +1,211 @@
+<?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.CzrkMapper">
+    
+    <resultMap type="com.boman.domain.Czrk" id="CzrkResult">
+        <result property="id"    column="id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="gender"    column="gender"    />
+        <result property="age"    column="age"    />
+        <result property="birthday"    column="birthday"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="phoneNum"    column="phone_num"    />
+        <result property="code"    column="code"    />
+        <result property="houseType"    column="house_type"    />
+        <result property="rlr"    column="rlr"    />
+        <result property="rlTime"    column="rl_time"    />
+        <result property="yhzgx"    column="yhzgx"    />
+        <result property="workUnit"    column="work_unit"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="province"    column="province"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="city"    column="city"    />
+        <result property="regionId"    column="region_id"    />
+        <result property="region"    column="region"    />
+        <result property="villageTownsId"    column="village_towns_id"    />
+        <result property="villageTowns"    column="village_towns"    />
+        <result property="villageId"    column="village_id"    />
+        <result property="village"    column="village"    />
+        <result property="villagerGroupId"    column="villager_group_id"    />
+        <result property="villagerGroup"    column="villager_group"    />
+        <result property="nowIn"    column="now_in"    />
+        <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"    />
+        <result property="deleteReason"    column="delete_reason"    />
+    </resultMap>
+
+    <sql id="selectCzrkVo">
+        select id, user_name, gender, age, birthday, id_card, phone_num, code, house_type, rlr, rl_time, yhzgx, work_unit, province_id, province, city_id, city, region_id, region, village_towns_id, village_towns, village_id, village, villager_group_id, villager_group, now_in, remark, status, create_by, create_time, update_by, update_time, is_del, delete_reason from czrk
+    </sql>
+
+    <select id="selectCzrkList"  resultMap="CzrkResult">
+        <include refid="selectCzrkVo"/>
+        <where>  
+            <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="age != null "> and age = #{age}</if>
+            <if test="birthday != null "> and birthday = #{birthday}</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="code != null  and code != ''"> and code = #{code}</if>
+            <if test="houseType != null  and houseType != ''"> and house_type = #{houseType}</if>
+            <if test="rlr != null  and rlr != ''"> and rlr = #{rlr}</if>
+            <if test="rlTime != null "> and rl_time = #{rlTime}</if>
+            <if test="yhzgx != null  and yhzgx != ''"> and yhzgx = #{yhzgx}</if>
+            <if test="workUnit != null  and workUnit != ''"> and work_unit = #{workUnit}</if>
+            <if test="provinceId != null  and provinceId != ''"> and province_id = #{provinceId}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="regionId != null  and regionId != ''"> and region_id = #{regionId}</if>
+            <if test="region != null  and region != ''"> and region = #{region}</if>
+            <if test="villageTownsId != null  and villageTownsId != ''"> and village_towns_id = #{villageTownsId}</if>
+            <if test="villageTowns != null  and villageTowns != ''"> and village_towns = #{villageTowns}</if>
+            <if test="villageId != null  and villageId != ''"> and village_id = #{villageId}</if>
+            <if test="village != null  and village != ''"> and village = #{village}</if>
+            <if test="villagerGroupId != null  and villagerGroupId != ''"> and villager_group_id = #{villagerGroupId}</if>
+            <if test="villagerGroup != null  and villagerGroup != ''"> and villager_group = #{villagerGroup}</if>
+            <if test="nowIn != null  and nowIn != ''"> and now_in = #{nowIn}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="deleteReason != null  and deleteReason != ''"> and delete_reason = #{deleteReason}</if>
+        </where>
+    </select>
+    
+    <select id="selectCzrkById" parameterType="Long" resultMap="CzrkResult">
+        <include refid="selectCzrkVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCzrk"  useGeneratedKeys="true" keyProperty="id">
+        insert into czrk
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userName != null">user_name,</if>
+            <if test="gender != null">gender,</if>
+            <if test="age != null">age,</if>
+            <if test="birthday != null">birthday,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="phoneNum != null">phone_num,</if>
+            <if test="code != null">code,</if>
+            <if test="houseType != null">house_type,</if>
+            <if test="rlr != null">rlr,</if>
+            <if test="rlTime != null">rl_time,</if>
+            <if test="yhzgx != null">yhzgx,</if>
+            <if test="workUnit != null">work_unit,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="province != null">province,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="city != null">city,</if>
+            <if test="regionId != null">region_id,</if>
+            <if test="region != null">region,</if>
+            <if test="villageTownsId != null">village_towns_id,</if>
+            <if test="villageTowns != null">village_towns,</if>
+            <if test="villageId != null">village_id,</if>
+            <if test="village != null">village,</if>
+            <if test="villagerGroupId != null">villager_group_id,</if>
+            <if test="villagerGroup != null">villager_group,</if>
+            <if test="nowIn != null">now_in,</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>
+            <if test="deleteReason != null">delete_reason,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userName != null">#{userName},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="age != null">#{age},</if>
+            <if test="birthday != null">#{birthday},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="phoneNum != null">#{phoneNum},</if>
+            <if test="code != null">#{code},</if>
+            <if test="houseType != null">#{houseType},</if>
+            <if test="rlr != null">#{rlr},</if>
+            <if test="rlTime != null">#{rlTime},</if>
+            <if test="yhzgx != null">#{yhzgx},</if>
+            <if test="workUnit != null">#{workUnit},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="province != null">#{province},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="city != null">#{city},</if>
+            <if test="regionId != null">#{regionId},</if>
+            <if test="region != null">#{region},</if>
+            <if test="villageTownsId != null">#{villageTownsId},</if>
+            <if test="villageTowns != null">#{villageTowns},</if>
+            <if test="villageId != null">#{villageId},</if>
+            <if test="village != null">#{village},</if>
+            <if test="villagerGroupId != null">#{villagerGroupId},</if>
+            <if test="villagerGroup != null">#{villagerGroup},</if>
+            <if test="nowIn != null">#{nowIn},</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>
+            <if test="deleteReason != null">#{deleteReason},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCzrk" >
+        update czrk
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="birthday != null">birthday = #{birthday},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="phoneNum != null">phone_num = #{phoneNum},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="houseType != null">house_type = #{houseType},</if>
+            <if test="rlr != null">rlr = #{rlr},</if>
+            <if test="rlTime != null">rl_time = #{rlTime},</if>
+            <if test="yhzgx != null">yhzgx = #{yhzgx},</if>
+            <if test="workUnit != null">work_unit = #{workUnit},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="villageTownsId != null">village_towns_id = #{villageTownsId},</if>
+            <if test="villageTowns != null">village_towns = #{villageTowns},</if>
+            <if test="villageId != null">village_id = #{villageId},</if>
+            <if test="village != null">village = #{village},</if>
+            <if test="villagerGroupId != null">villager_group_id = #{villagerGroupId},</if>
+            <if test="villagerGroup != null">villager_group = #{villagerGroup},</if>
+            <if test="nowIn != null">now_in = #{nowIn},</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>
+            <if test="deleteReason != null">delete_reason = #{deleteReason},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCzrkById" parameterType="Long">
+        delete from czrk where id = #{id}
+    </delete>
+
+    <delete id="deleteCzrkByIds" parameterType="String">
+        delete from czrk where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>