Commit 21430633 authored by hongguangwu's avatar hongguangwu

MVP1.7.18-优化导入与更新

parent ece5227b
......@@ -951,15 +951,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingle())){
if (excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO)) {
household.setIsSingle(CommonConstants.ZERO_STRING);
household.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else {
household.setIsSingle(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYgsPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
household.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYgsPush())) {
household.setIsSingleYgsPush(CommonConstants.ONE_STRING);
}
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
household.setIsSingleYgsPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYgsPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
household.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
}
}
}
......@@ -986,15 +985,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingleYsd())){
if (excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO)) {
household.setIsSingleYsd(CommonConstants.ZERO_STRING);
household.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else {
household.setIsSingleYsd(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYsdPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
household.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYsdPush())) {
household.setIsSingleYsdPush(CommonConstants.ONE_STRING);
}
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
household.setIsSingleYsdPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYsdPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
household.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
}
}
}
......@@ -1342,12 +1340,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
} else {
info.setIsSingle(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYgsPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
info.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYgsPush())) {
info.setIsSingleYgsPush(CommonConstants.ONE_STRING);
}
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
info.setIsSingleYgsPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYgsPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
info.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
}
}
}
......@@ -1378,12 +1374,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
} else {
info.setIsSingleYsd(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYsdPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
info.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYsdPush())) {
info.setIsSingleYsdPush(CommonConstants.ONE_STRING);
}
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
info.setIsSingleYsdPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYsdPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
info.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment