住户导入

linwe

2024-06-04 ad22371088e209b743011248fcc5e5cf3a935d45

住户导入

 src/main/java/org/springblade/modules/house/controller/HouseholdController.java

@@ -40,6 +40,7 @@
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.excel.ImportTenantHouseholdExcel;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.AddHouseholdVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
import org.springframework.transaction.annotation.Transactional;
@@ -201,6 +202,23 @@
        return R.status(householdService.saveOrUpdateHousehold(household));
    }


    /**
     * 批量自定义新增或修改
     *
     * @param addHouseholdVO
     * @return
     */
    @PostMapping("/saveOrUpdateHouseholdBatch")
    @ApiLog("批量自定义新增或修改")
    @ApiOperation(value = "批量自定义新增或修改", notes = "传入household")
    public R saveOrUpdateHouseholdBatch(@Valid @RequestBody AddHouseholdVO addHouseholdVO) {
        bladeLogger.info("住户信息新增或修改", JsonUtil.toJson(addHouseholdVO));
        List<HouseholdVO> householdVOList = addHouseholdVO.getHouseholdVOList();
        boolean result = householdService.saveOrUpdateHouseholdBatch(householdVOList);
        return R.status(result);
    }

    /**
     * 住户 删除
     */

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -669,7 +669,7 @@
            </if>
            <!-- 不等于18 就是非租户 -->
            <if test="household.relationship!=null and household.relationship != 18">
                and jh.relationship != #{household.relationship}
                and jh.relationship != 18
            </if>

            <if test="household.phoneNumber!=null and household.phoneNumber !=''">

 src/main/java/org/springblade/modules/house/service/IHouseholdService.java

@@ -155,4 +155,11 @@
    List<HouseholdVO> getAllList(int i, int size);

    List<HouseTenantExcel> exportTenant(HouseholdVO household);

    /**
     *
     * @param householdVOList
     * @return
     */
    boolean saveOrUpdateHouseholdBatch(List<HouseholdVO> householdVOList);
}

 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java

@@ -62,6 +62,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

/**
@@ -813,4 +814,16 @@
        );
        return houseTenantExcels;
    }

    @Override
    public boolean saveOrUpdateHouseholdBatch(List<HouseholdVO> householdVOList) {
        if (householdVOList.size() == 0) {
            return false;
        }
        AtomicBoolean restult = new AtomicBoolean(false);
        householdVOList.forEach(item -> {
            restult.set(saveOrUpdateHousehold(item));
        });
        return restult.get();
    }
}

 src/main/java/org/springblade/modules/house/vo/AddHouseholdVO.java

New file
@@ -0,0 +1,11 @@
package org.springblade.modules.house.vo;

import lombok.Data;

import java.util.List;

@Data
public class AddHouseholdVO {

    private List<HouseholdVO> householdVOList;
}