加上url

Jinquan_Ou

2023-03-27 b6fd093def92b3a538932c6cb808c94fa6275fa1

加上url

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAbroadController.java

@@ -1,9 +1,24 @@
package com.ruoyi.web.controller.zhang;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZAbroad;
import com.ruoyi.service.ZAbroadService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.prefs.BackingStoreException;

/**
 * <p>
@@ -13,9 +28,92 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@RestController
@RequestMapping("/zAbroad")
public class ZAbroadController {
public class ZAbroadController extends BaseController {

    @Autowired
    private ZAbroadService zAbroadService;

    @GetMapping("/all")
    public AjaxResult listAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<ZAbroad> zAbroads = zAbroadService.selectExperienceList(userId);
        return AjaxResult.success(zAbroads);
    }


    /**
     * 导出出国(境)情况记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "出国(境)情况记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZAbroad zAbroad)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        List<ZAbroad> list = zAbroadService.selectExperienceList(userId);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZAbroad> util = new ExcelUtil<>(ZAbroad.class);
        util.exportExcel(response, list, "出国(境)情况记录数据");
    }
//

    /**
     * 导入出国(境)情况记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        boolean flag=zAbroadService.importExcel(file,userId);
        if(flag){
            return AjaxResult.success("导入数据成功");
        }
        return AjaxResult.error("导入数据失败");
    }

    /**
     * 新增出国(境)情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:add')")
    @Log(title = "出国(境)情况记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZAbroad zAbroad)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zAbroad.setUserId(userId);
        return toAjax(zAbroadService.save(zAbroad));
    }

    /**
     * 修改出国(境)情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:edit')")
    @Log(title = "出国(境)情况记录", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZAbroad zAbroad)
    {
        return toAjax(zAbroadService.updateById(zAbroad));
    }
//
    /**
     * 批量删除出国(境)情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:remove')")
    @Log(title = "出国(境)情况记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zAbroadService.removeByIds(Arrays.asList(ids)));
    }
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZCertificateController.java

@@ -1,9 +1,23 @@
package com.ruoyi.web.controller.zhang;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZCertificate;
import com.ruoyi.service.ZCertificateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * <p>
@@ -13,9 +27,95 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@RestController
@RequestMapping("/zCertificate")
public class ZCertificateController {
public class ZCertificateController extends BaseController {

    @Autowired
    private ZCertificateService zCertificateService;

    @GetMapping("/all")
    public AjaxResult listAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<ZCertificate> zCertificates = zCertificateService.selectExperienceList(userId);
        return AjaxResult.success(zCertificates);
    }


    /**
     * 导出持有出入境证件情况记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "持有出入境证件情况记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZCertificate zCertificate)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        List<ZCertificate> list = zCertificateService.selectExperienceList(userId);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZCertificate> util = new ExcelUtil<>(ZCertificate.class);
        util.exportExcel(response, list, "持有出入境证件情况记录数据");
    }
//

    /**
     * 导入持有出入境证件情况记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        boolean flag=zCertificateService.importExcel(file,userId);
        if(flag){
            return AjaxResult.success("导入数据成功");
        }
        return AjaxResult.error("导入数据失败");
    }



    /**
     * 新增持有出入境证件情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:add')")
    @Log(title = "持有出入境证件情况记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZCertificate zCertificate)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zCertificate.setUserId(userId);
        return toAjax(zCertificateService.save(zCertificate));
    }

    /**
     * 修改持有出入境证件情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:edit')")
    @Log(title = "持有出入境证件情况记录", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZCertificate zCertificate)
    {
        return toAjax(zCertificateService.updateById(zCertificate));
    }
//
    /**
     * 批量删除持有出入境证件情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:remove')")
    @Log(title = "持有出入境证件情况记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zCertificateService.removeByIds(Arrays.asList(ids)));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZExperienceController.java

@@ -1,9 +1,29 @@
package com.ruoyi.web.controller.zhang;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZExperience;
import com.ruoyi.service.ZExperienceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;

/**
 * <p>
@@ -13,9 +33,104 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@RestController
@RequestMapping("/zExperience")
public class ZExperienceController {
public class ZExperienceController extends BaseController {

    @Autowired
    private ZExperienceService zExperienceService;

    @GetMapping("/all")
    public AjaxResult  listAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<ZExperience> zExperiences = zExperienceService.selectExperienceList(userId);
        return AjaxResult.success(zExperiences);
    }


    /**
     * 导出个人主要学习工作经历记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "个人主要学习工作经历记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZExperience zExperience)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        List<ZExperience> list = zExperienceService.selectExperienceList(userId);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class);
        util.exportExcel(response, list, "个人主要学习工作经历记录数据");
    }
//

    /**
     * 导入个人主要学习工作经历记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        boolean flag=zExperienceService.importExcel(file,userId);
        if(flag){
            return AjaxResult.success("导入数据成功");
        }
        return AjaxResult.error("导入数据失败");
    }


//    /**
//     * 获取个人主要学习工作经历记录详细信息
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:query')")
//    @GetMapping(value = "/{id}")
//    public AjaxResult getInfo(@PathVariable("id") Long id)
//    {
//        return success(zExperienceService.getById(id));
//    }
//
    /**
     * 新增个人主要学习工作经历记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:add')")
    @Log(title = "个人主要学习工作经历记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZExperience zExperience)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zExperience.setUserId(userId);
        return toAjax(zExperienceService.save(zExperience));
    }

    /**
     * 修改个人主要学习工作经历记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:edit')")
    @Log(title = "个人主要学习工作经历记录", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZExperience zExperience)
    {
        return toAjax(zExperienceService.updateById(zExperience));
    }
//
    /**
     * 批量删除个人主要学习工作经历记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:remove')")
    @Log(title = "个人主要学习工作经历记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zExperienceService.removeByIds(Arrays.asList(ids)));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZStayOutController.java

@@ -1,9 +1,25 @@
package com.ruoyi.web.controller.zhang;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZStayOut;
import com.ruoyi.domain.ZStayOut;
import com.ruoyi.service.ZStayOutService;
import com.ruoyi.service.ZStayOutService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;

/**
 * <p>
@@ -13,9 +29,104 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@RestController
@RequestMapping("/zStayOut")
public class ZStayOutController {
public class ZStayOutController extends BaseController {

    @Autowired
    private ZStayOutService zStayOutService;

    @GetMapping("/all")
    public AjaxResult  listAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<ZStayOut> zStayOuts = zStayOutService.selectStayOutList(userId);
        return AjaxResult.success(zStayOuts);
    }


//    /**
//     * 导出移居国(境)情况记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:export')")
//    @Log(title = "移居国(境)情况记录", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, ZStayOut zStayOut)
//    {
//        SysUser user = SecurityUtils.getLoginUser().getUser();
//        Long userId = user.getUserId();
//
//        List<ZStayOut> list = zStayOutService.selectExperienceList(userId);
//        log.info("导出记录为:{}",list);
//        ExcelUtil<ZStayOut> util = new ExcelUtil<>(ZStayOut.class);
//        util.exportExcel(response, list, "移居国(境)情况记录数据");
//    }
//

//    /**
//     * 导入移居国(境)情况记录列表
//     */
//    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
//    @PostMapping("/importData")
//    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
//    {
//        SysUser user = SecurityUtils.getLoginUser().getUser();
//        Long userId = user.getUserId();
//
//        boolean flag=zStayOutService.importExcel(file,userId);
//        if(flag){
//            return AjaxResult.success("导入数据成功");
//        }
//        return AjaxResult.error("导入数据失败");
//    }


//    /**
//     * 获取移居国(境)情况记录详细信息
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:query')")
//    @GetMapping(value = "/{id}")
//    public AjaxResult getInfo(@PathVariable("id") Long id)
//    {
//        return success(zStayOutService.getById(id));
//    }
//
    /**
     * 新增或修改移居国(境)情况记录
     */
//    @PreAuthorize("@ss.hasPermi('system:property:add')")
    @Log(title = "移居国(境)情况记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZStayOut zStayOut)
    {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zStayOut.setUserId(userId);
        return toAjax(zStayOutService.saveOrUpdate(zStayOut));
    }

//    /**
//     * 修改移居国(境)情况记录
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:edit')")
//    @Log(title = "移居国(境)情况记录", businessType = BusinessType.UPDATE)
//    @PutMapping
//    public AjaxResult edit(@RequestBody ZStayOut zStayOut)
//    {
//        return toAjax(zStayOutService.updateById(zStayOut));
//    }
//
//    /**
//     * 批量删除移居国(境)情况记录
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:remove')")
//    @Log(title = "移居国(境)情况记录", businessType = BusinessType.DELETE)
//    @DeleteMapping("/{ids}")
//    public AjaxResult remove(@PathVariable Long[] ids)
//    {
//        return toAjax(zStayOutService.removeByIds(Arrays.asList(ids)));
//    }

}


 zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java

@@ -3,8 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -14,83 +20,39 @@
 * @author ojq
 * @since 2023-03-14
 */
@Data
@ToString
@TableName("z_abroad")
public class ZAbroad implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 用户id
     */
    private Integer userId;
    private Long userId;

    /**
     * 目的地
     */
    @Excel(name="目的地")
    private String destination;

    /**
     * 到目的地事由
     */
    @Excel(name="到目的地是由")
    private String cause;

    /**
     * 起始日期
     */
    private LocalDateTime startDate;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name="起始日期",dateFormat = "yyyy-MM-dd")
    private Date startDate;


    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getUserId() {
        return userId;
    }

    public void setUserId(Integer userId) {
        this.userId = userId;
    }

    public String getDestination() {
        return destination;
    }

    public void setDestination(String destination) {
        this.destination = destination;
    }

    public String getCause() {
        return cause;
    }

    public void setCause(String cause) {
        this.cause = cause;
    }

    public LocalDateTime getStartDate() {
        return startDate;
    }

    public void setStartDate(LocalDateTime startDate) {
        this.startDate = startDate;
    }

    @Override
    public String toString() {
        return "ZAbroad{" +
        "id=" + id +
        ", userId=" + userId +
        ", destination=" + destination +
        ", cause=" + cause +
        ", startDate=" + startDate +
        "}";
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java

@@ -3,8 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -14,83 +20,46 @@
 * @author ojq
 * @since 2023-03-14
 */
@Data
@ToString
@TableName("z_certificate")
public class ZCertificate implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 用户id
     */
    private Integer userId;
    private Long userId;

    /**
     * 证件名称
     */
    @Excel(name = "证件名称")
    private String cerName;

    /**
     * 证件号码
     */
    @Excel(name="证件号码")
    private String idNo;

    /**
     * 有效期
     */
    private LocalDateTime validityDate;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name="证件有效期至",dateFormat = "yyyy-MM-dd")
    private Date validityDate;

    /**
     * 持有情况
     */
    @Excel(name = "持有情况")
    private String ownStatus;


    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getUserId() {
        return userId;
    }

    public void setUserId(Integer userId) {
        this.userId = userId;
    }

    public String getCerName() {
        return cerName;
    }

    public void setCerName(String cerName) {
        this.cerName = cerName;
    }

    public String getIdNo() {
        return idNo;
    }

    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }

    public LocalDateTime getValidityDate() {
        return validityDate;
    }

    public void setValidityDate(LocalDateTime validityDate) {
        this.validityDate = validityDate;
    }

    @Override
    public String toString() {
        return "ZCertificate{" +
        "id=" + id +
        ", userId=" + userId +
        ", cerName=" + cerName +
        ", idNo=" + idNo +
        ", validityDate=" + validityDate +
        "}";
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZExperience.java

@@ -3,8 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -14,83 +20,41 @@
 * @author ojq
 * @since 2023-03-14
 */

@Data
@ToString
@TableName("z_experience")
public class ZExperience implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 用户id
     */
    private Integer userId;
    private Long userId;

    /**
     * 主要学习经历、工作单位及任职情况
     */

    @Excel(name = "主要学习经历、工作单位及任职情况")
    private String content;

    /**
     * 起始日期
     */
    private LocalDateTime startDate;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "起始日期", dateFormat = "yyyy-MM-dd")
    private Date startDate;

    /**
     * 证明人名字
     */
    @Excel(name = "证明人名字")
    private String witness;


    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getUserId() {
        return userId;
    }

    public void setUserId(Integer userId) {
        this.userId = userId;
    }

    public String getContent() {
        return content;
    }

    public void setContent(String content) {
        this.content = content;
    }

    public LocalDateTime getStartDate() {
        return startDate;
    }

    public void setStartDate(LocalDateTime startDate) {
        this.startDate = startDate;
    }

    public String getWitness() {
        return witness;
    }

    public void setWitness(String witness) {
        this.witness = witness;
    }

    @Override
    public String toString() {
        return "ZExperience{" +
        "id=" + id +
        ", userId=" + userId +
        ", content=" + content +
        ", startDate=" + startDate +
        ", witness=" + witness +
        "}";
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -118,6 +118,18 @@
    private String position;

    /**
     * 拥有外籍、境外永久居留权或者长期居留许可的情况,1：有、0：没有
     */
    @Excel(name="拥有外籍、境外永久居留权或者长期居留许可的情况",readConverterExp = "0=没有,1=有")
    private Integer outStatus;

    /**
     * 外籍、境外相关证件号码
     */
    @Excel(name = "外籍、境外相关证件号码")
    private String idNo;

    /**
     * 图片地址
     */
    private String img;
@@ -144,4 +156,7 @@
     */
    private String url;




}

 zhang-content/src/main/java/com/ruoyi/domain/ZStayOut.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -13,69 +15,28 @@
 * @author ojq
 * @since 2023-03-14
 */
@Data
@TableName("z_stay_out")
public class ZStayOut implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;

    /**
     * 用户id
     */
    private Integer userId;
    private Long userId;

    /**
     * 拥有外籍、境外永久居留权或者长期居留许可的情况
     * 拥有外籍、境外永久居留权或者长期居留许可的情况,1：有、0：没有
     */
    private String content;
    private Integer content;

    /**
     * 证件号码
     */
    private String idNo;


    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getUserId() {
        return userId;
    }

    public void setUserId(Integer userId) {
        this.userId = userId;
    }

    public String getContent() {
        return content;
    }

    public void setContent(String content) {
        this.content = content;
    }

    public String getIdNo() {
        return idNo;
    }

    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }

    @Override
    public String toString() {
        return "ZStayOut{" +
        "id=" + id +
        ", userId=" + userId +
        ", content=" + content +
        ", idNo=" + idNo +
        "}";
    }
}

 zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java

@@ -61,5 +61,6 @@
    @Excel(name="备注信息")
    private String remark;

    private String url;

}

 zhang-content/src/main/java/com/ruoyi/service/ZAbroadService.java

@@ -3,6 +3,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZAbroad;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
 * <p>
@@ -14,4 +17,7 @@
 */
public interface ZAbroadService extends IService<ZAbroad> {

    List<ZAbroad> selectExperienceList(Long userId);

    boolean importExcel(MultipartFile file, Long userId);
}

 zhang-content/src/main/java/com/ruoyi/service/ZCertificateService.java

@@ -3,6 +3,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZCertificate;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
 * <p>
@@ -14,4 +17,7 @@
 */
public interface ZCertificateService extends IService<ZCertificate> {

    List<ZCertificate> selectExperienceList(Long userId);

    boolean importExcel(MultipartFile file, Long userId);
}

 zhang-content/src/main/java/com/ruoyi/service/ZExperienceService.java

@@ -3,6 +3,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZExperience;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

/**
 * <p>
@@ -14,4 +17,7 @@
 */
public interface ZExperienceService extends IService<ZExperience> {

    List<ZExperience> selectExperienceList(Long userId);

    boolean importExcel(MultipartFile file, Long userId);
}

 zhang-content/src/main/java/com/ruoyi/service/ZStayOutService.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZStayOut;

import java.util.List;

/**
 * <p>
 *  服务类
@@ -14,4 +16,5 @@
 */
public interface ZStayOutService extends IService<ZStayOut> {

    List<ZStayOut> selectStayOutList(Long userId);
}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZAbroadServiceImpl.java

@@ -1,11 +1,18 @@
package com.ruoyi.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZAbroad;
import com.ruoyi.mapper.ZAbroadMapper;
import com.ruoyi.service.ZAbroadService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -15,7 +22,31 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@Service
public class ZAbroadServiceImpl extends ServiceImpl<ZAbroadMapper, ZAbroad> implements ZAbroadService {

    @Override
    public List<ZAbroad> selectExperienceList(Long userId) {
        LambdaQueryWrapper<ZAbroad> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZAbroad::getUserId,userId);
        return list(lqw);
    }

    @Override
    public boolean importExcel(MultipartFile file, Long userId) {
        ExcelUtil<ZAbroad> util = new ExcelUtil<>(ZAbroad.class);
        List<ZAbroad> abroadList = null;
        try {
            abroadList = util.importExcel(file.getInputStream());
        } catch (Exception e) {
            e.printStackTrace();
        }
        assert abroadList != null;
        List<ZAbroad> list = abroadList.stream().peek(
                (abroad) -> abroad.setUserId(userId)
        ).collect(Collectors.toList());
        log.info("资产列表为：{}",list);
        return saveBatch(list);
    }
}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZCertificateServiceImpl.java

@@ -1,11 +1,19 @@
package com.ruoyi.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZCertificate;
import com.ruoyi.domain.ZExperience;
import com.ruoyi.mapper.ZCertificateMapper;
import com.ruoyi.service.ZCertificateService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -15,7 +23,32 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@Service
public class ZCertificateServiceImpl extends ServiceImpl<ZCertificateMapper, ZCertificate> implements ZCertificateService {

    @Override
    public List<ZCertificate> selectExperienceList(Long userId) {
        LambdaQueryWrapper<ZCertificate> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZCertificate::getUserId,userId);
        return list(lqw);
    }

    @Override
    public boolean importExcel(MultipartFile file, Long userId) {
        ExcelUtil<ZCertificate> util = new ExcelUtil<>(ZCertificate.class);
        List<ZCertificate> certificateList = null;
        try {
            certificateList = util.importExcel(file.getInputStream());
        } catch (Exception e) {
            e.printStackTrace();
        }
        assert certificateList != null;
        List<ZCertificate> list = certificateList.stream().peek(
                (certificate) -> certificate.setUserId(userId)
        ).collect(Collectors.toList());
        log.info("资产列表为：{}",list);
        return saveBatch(list);
    }

}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZExperienceServiceImpl.java

@@ -1,11 +1,19 @@
package com.ruoyi.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZExperience;
import com.ruoyi.mapper.ZExperienceMapper;
import com.ruoyi.service.ZExperienceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -15,7 +23,34 @@
 * @author ojq
 * @since 2023-03-14
 */
@Slf4j
@Service
public class ZExperienceServiceImpl extends ServiceImpl<ZExperienceMapper, ZExperience> implements ZExperienceService {

    @Override
    public List<ZExperience> selectExperienceList(Long userId) {

        LambdaQueryWrapper<ZExperience> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZExperience::getUserId,userId);
        return list(lqw);


    }

    @Override
    public boolean importExcel(MultipartFile file, Long userId) {
        ExcelUtil<ZExperience> util = new ExcelUtil<>(ZExperience.class);
        List<ZExperience> propertyList = null;
        try {
            propertyList = util.importExcel(file.getInputStream());
        } catch (Exception e) {
            e.printStackTrace();
        }
        assert propertyList != null;
        List<ZExperience> list = propertyList.stream().peek(
                (property) -> property.setUserId(userId)
        ).collect(Collectors.toList());
        log.info("资产列表为：{}",list);
        return saveBatch(list);
    }
}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZStayOutServiceImpl.java

@@ -1,11 +1,14 @@
package com.ruoyi.service.impl;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.domain.ZStayOut;
import com.ruoyi.mapper.ZStayOutMapper;
import com.ruoyi.service.ZStayOutService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -18,4 +21,12 @@
@Service
public class ZStayOutServiceImpl extends ServiceImpl<ZStayOutMapper, ZStayOut> implements ZStayOutService {

    @Override
    public List<ZStayOut> selectStayOutList(Long userId) {

        LambdaQueryWrapper<ZStayOut> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZStayOut::getUserId,userId);
        return list(lqw);

    }
}