更新房屋是否党员中心户，加个房屋变更记录

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseChangeEnums.java

@@ -14,8 +14,9 @@ public enum HouseChangeEnums {
     RENT_FLAG("RENT_FLAG","房屋状态"),
     OWNER_NAME("OWNER_NAME","房主姓名"),
     OWNER_PHONE("OWNER_PHONE","房主电话"),
-    OWNER_ID_CARD("OWNER_ID_CARD","房主身份证");
-
+    OWNER_ID_CARD("OWNER_ID_CARD","房主身份证"),
+    // 灵山项目：是否党员中心户：1是；0不是
+    PARTY_CENTER_HOUSE_FLAG("PARTY_CENTER_HOUSE_FLAG", "党员中心户");
     private String column;
 
     private String columnName;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -356,6 +356,44 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无");
             entityList.add(e);
         }
+        if (StringUtils.isNotBlank(entity.getPartyCenterHouseFlag())) {
+            if(!entity.getPartyCenterHouseFlag().equals(houseDTO.getPartyCenterHouseFlag())){
+                String originName=NumConstant.ZERO_STR.equals(entity.getPartyCenterHouseFlag())?"否":"是";
+                String nowName="";
+                if(NumConstant.ZERO_STR.equals(houseDTO.getPartyCenterHouseFlag())){
+                    nowName="否";
+                }else if(NumConstant.ONE_STR.equals(houseDTO.getPartyCenterHouseFlag())){
+                    nowName="是";
+                }else{
+                    nowName="-";
+                }
+                sbAfter.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(nowName).append("；");
+                sbBefore.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(originName).append("；");
+                IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
+                e.setChangeCol(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumn());
+                e.setChangeAfter(nowName);
+                e.setChangeBefore(originName);
+                entityList.add(e);
+            }
+        } else {
+            // 原来不确定是否是党员中心户
+            String nowName="";
+            if(NumConstant.ZERO_STR.equals(houseDTO.getPartyCenterHouseFlag())){
+                nowName="否";
+            }else if(NumConstant.ONE_STR.equals(houseDTO.getPartyCenterHouseFlag())){
+                nowName="是";
+            }else{
+                nowName="-";
+            }
+            sbAfter.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(nowName).append("；");
+            sbBefore.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append("-").append("；");
+            IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
+            e.setChangeCol(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumn());
+            e.setChangeAfter(nowName);
+            e.setChangeBefore("-");
+            entityList.add(e);
+        }
+
         if (StringUtils.isNotBlank(sbAfter)) {
             String before = sbBefore.substring(NumConstant.ZERO, sbBefore.length() - NumConstant.ONE);
             String after = sbAfter.substring(NumConstant.ZERO, sbAfter.length() - NumConstant.ONE);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -39,6 +39,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.CustomerGridService;
+import com.epmet.service.HouseService;
 import com.epmet.service.IcHouseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -541,13 +542,20 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
      */
     @Override
     public void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag) {
-        LambdaUpdateWrapper<IcHouseEntity> update = new LambdaUpdateWrapper<>();
-        update.set(IcHouseEntity::getPartyCenterHouseFlag, partyCenterHouseFlag).eq(IcHouseEntity::getId, houseId);
-        baseDao.update(null, update);
         if(NumConstant.ZERO_STR.equals(partyCenterHouseFlag)){
             //房屋如果不是党员中心户，自动删除绑定的联户
             partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(houseId);
         }
+        //加一条变更记录吧。。 就当留痕了
+        IcHouseEntity origin = baseDao.selectById(houseId);
+        IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(origin, IcHouseDTO.class);
+        SpringContextUtils.getBean(HouseService.class).houseChangeRecord(houseId, icHouseDTO.getCustomerId(), icHouseDTO);
+        //修改
+        LambdaUpdateWrapper<IcHouseEntity> update = new LambdaUpdateWrapper<>();
+        update.set(IcHouseEntity::getPartyCenterHouseFlag, partyCenterHouseFlag)
+                .set(IcHouseEntity::getUpdatedTime,new Date())
+                .eq(IcHouseEntity::getId, houseId);
+        baseDao.update(null, update);
     }