456

whywhyo

2023-05-23 276818f5db0125c215ccd118dc7162172b92e3b3

456

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

@@ -88,7 +88,7 @@
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData/{pid}")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable String pid) throws Exception
    {
        ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
        List<ZfPetNote> eventList = util.importExcel(file.getInputStream());

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

@@ -42,9 +42,9 @@
//    @ExcelProperty({"户籍地址"})
    private String address;

        @Excel(name = "工作地址")
        @Excel(name = "身份证")
//    @ExcelProperty({"工作地址"})
    private String workAddress;
    private String idNo;

        @Excel(name = "婚姻状况",readConverterExp = "0=未婚,1=初婚,2=离婚,3=再婚")
//    @ExcelProperty(value = {"婚姻状况"},converter = BearStatusConverter.class)

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

@@ -33,7 +33,7 @@
    /**
     * 宠物id
     */
    private Long pid;
    private String pid;

    /**
     * 记录时间

 zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java

@@ -37,8 +37,8 @@
    @Excel(name = "个人户籍地址",headerBackgroundColor = IndexedColors.YELLOW)
    private String address;
    //    @ExcelProperty({"个人信息","工作地址"})
    @Excel(name = "个人工作地址",headerBackgroundColor = IndexedColors.YELLOW)
    private String workAddress;
    @Excel(name = "个人身份证",headerBackgroundColor = IndexedColors.YELLOW)
    private String idNo;
    //    @ExcelProperty(value = {"个人信息","婚姻状况"},converter = BearStatusConverter.class)
    @Excel(name = "个人婚姻状况", readConverterExp = "0=未婚,1=初婚,2=离婚,3=再婚",headerBackgroundColor = IndexedColors.YELLOW)
    private Integer marryStatus;
@@ -66,8 +66,8 @@
    @Excel(name = "配偶户籍地址",headerBackgroundColor = IndexedColors.GREEN)
    private String spouseAddress;
    //    @ExcelProperty(value = {"配偶信息","工作地址"})
    @Excel(name = "配偶工作地址",headerBackgroundColor = IndexedColors.GREEN)
    private String spouseWorkAddress;
    @Excel(name = "配偶身份证",headerBackgroundColor = IndexedColors.GREEN)
    private String spouseIdNo;
    //    @ExcelProperty(value = {"配偶信息","婚姻状况"},converter = BearStatusConverter.class)
    @Excel(name = "配偶婚姻状况", readConverterExp = "0=未婚,1=初婚,2=离婚,3=再婚",headerBackgroundColor = IndexedColors.GREEN)
    private Integer spouseMarryStatus;

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

@@ -102,7 +102,7 @@
        marryInfoDto.setName(myself.getName());
        marryInfoDto.setBirthday(myself.getBirthday());
        marryInfoDto.setAddress(myself.getAddress());
        marryInfoDto.setWorkAddress(myself.getWorkAddress());
        marryInfoDto.setIdNo(myself.getIdNo());
        marryInfoDto.setMarryStatus(myself.getMarryStatus());
        marryInfoDto.setSex(myself.getSex());
        marryInfoDto.setNation(myself.getNation());
@@ -112,7 +112,7 @@
        marryInfoDto.setSpouseName(spouse.getName());
        marryInfoDto.setSpouseBirthday(spouse.getBirthday());
        marryInfoDto.setSpouseAddress(spouse.getAddress());
        marryInfoDto.setSpouseWorkAddress(spouse.getWorkAddress());
        marryInfoDto.setSpouseIdNo(spouse.getIdNo());
        marryInfoDto.setSpouseMarryStatus(spouse.getMarryStatus());
        marryInfoDto.setSpouseSex(spouse.getSex());
        marryInfoDto.setSpouseNation(spouse.getNation());
@@ -149,7 +149,7 @@
        myself.setName(marryInfoDto.getName());
        myself.setBirthday(marryInfoDto.getBirthday());
        myself.setAddress(marryInfoDto.getAddress());
        myself.setWorkAddress(marryInfoDto.getWorkAddress());
        myself.setIdNo(marryInfoDto.getIdNo());
        myself.setMarryStatus(marryInfoDto.getMarryStatus());
        myself.setSex(marryInfoDto.getSex());
        myself.setMyId(userId);
@@ -163,7 +163,7 @@
        spouse.setName(marryInfoDto.getSpouseName());
        spouse.setBirthday(marryInfoDto.getSpouseBirthday());
        spouse.setAddress(marryInfoDto.getSpouseAddress());
        spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
        spouse.setIdNo(marryInfoDto.getSpouseIdNo());
        spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
        spouse.setSex(marryInfoDto.getSpouseSex());
        spouse.setNation(marryInfoDto.getSpouseNation());
@@ -219,7 +219,7 @@
        myself.setName(marryInfoDto.getName());
        myself.setBirthday(marryInfoDto.getBirthday());
        myself.setAddress(marryInfoDto.getAddress());
        myself.setWorkAddress(marryInfoDto.getWorkAddress());
        myself.setIdNo(marryInfoDto.getIdNo());
        myself.setMarryStatus(marryInfoDto.getMarryStatus());
        myself.setSex(marryInfoDto.getSex());
        myself.setNation(marryInfoDto.getNation());
@@ -252,7 +252,7 @@
            spouse.setName(marryInfoDto.getSpouseName());
            spouse.setBirthday(marryInfoDto.getSpouseBirthday());
            spouse.setAddress(marryInfoDto.getSpouseAddress());
            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
            spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
            spouse.setSex(marryInfoDto.getSpouseSex());
            spouse.setNation(marryInfoDto.getSpouseNation());
@@ -284,7 +284,7 @@
            spouse.setName(marryInfoDto.getSpouseName());
            spouse.setBirthday(marryInfoDto.getSpouseBirthday());
            spouse.setAddress(marryInfoDto.getSpouseAddress());
            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
            spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
            spouse.setSex(marryInfoDto.getSpouseSex());
            spouse.setNation(marryInfoDto.getSpouseNation());