文章通过范围查询

linwe

2023-12-01 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be

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

@@ -36,6 +36,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
@@ -147,9 +148,10 @@
    * @param isCovered
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered) {
      for (HouseAndHoldExcel houseAndHoldExcel : data) {
         System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
//         System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
         // 保存房屋数据--一个一个插入，防止一个表格中存在多个地址编号相同的数据
         saveHouseData(houseAndHoldExcel);
         // 保存住户数据（包含标签）--一个一个插入，防止一个表格中存在多个地址编号相同的数据
@@ -162,7 +164,8 @@
    * 保存房屋数据
    * @param houseAndHoldExcel
    */
   private void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
   @Transactional(rollbackFor = Exception.class)
   public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
      // 查询库中是否已存在
      QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
@@ -175,7 +178,9 @@
         houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
         houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
         houseEntity.setUnit(houseAndHoldExcel.getUnit());
         houseEntity.setFloor(houseAndHoldExcel.getFloor());
         if (!Strings.isBlank(houseAndHoldExcel.getFloor())){
            houseEntity.setFloor(houseAndHoldExcel.getFloor());
         }
         houseEntity.setRoom(houseAndHoldExcel.getRoom());
         houseEntity.setBuilding(houseAndHoldExcel.getBuilding());
         houseEntity.setArea(houseAndHoldExcel.getArea());
@@ -195,7 +200,8 @@
    * 保存住户数据
    * @param houseAndHoldExcel
    */
   private void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
   @Transactional(rollbackFor = Exception.class)
   public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
      // 查询库中是否已存在
      QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
@@ -217,10 +223,19 @@
         if (!Strings.isBlank(houseAndHoldExcel.getIsPrimaryContact())){
            householdEntity.setIsPrimaryContact(Integer.parseInt(houseAndHoldExcel.getIsPrimaryContact()));
         }
         // 居住状态
         if (!Strings.isBlank(houseAndHoldExcel.getResidentialStatus())){
            householdEntity.setResidentialStatus(Integer.parseInt(houseAndHoldExcel.getResidentialStatus()));
         }
         // 性别
         if (!Strings.isBlank(houseAndHoldExcel.getGender())){
            householdEntity.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
         }
         householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
         // 党员
         if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())){
            householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
         }
         householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
         householdEntity.setPassport(houseAndHoldExcel.getPassport());
         if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())){
@@ -238,6 +253,8 @@
            householdEntity.setMaritalStatus(Integer.parseInt(houseAndHoldExcel.getMaritalStatus()));
         }
         householdEntity.setCardNumber(houseAndHoldExcel.getCardNumber());
         householdEntity.setOtherContact(houseAndHoldExcel.getOtherContact());
         householdEntity.setDisabilityCert(houseAndHoldExcel.getDisabilityCert());
         householdEntity.setRemark(houseAndHoldExcel.getRemarks());
         householdEntity.setCreateTime(new Date());
         householdEntity.setCreateUser(AuthUtil.getUserId());