Commit e32fe410 authored by hongguangwu's avatar hongguangwu

1.7.19-离职相关

parent 01844ec2
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</foreach> </foreach>
</if> </if>
<if test="employeeRegistrationLeave.customerUsernameNew != null and employeeRegistrationLeave.customerUsernameNew.trim() != ''"> <if test="employeeRegistrationLeave.customerUsernameNew != null and employeeRegistrationLeave.customerUsernameNew.trim() != ''">
AND a.customer_username_new like CONCAT('%',#{employeeRegistrationLeave.customerUsernameNew},'%') AND b.customer_username_new like CONCAT('%',#{employeeRegistrationLeave.customerUsernameNew},'%')
</if> </if>
<if test="employeeRegistrationLeave.employeeName != null and employeeRegistrationLeave.employeeName.trim() != ''"> <if test="employeeRegistrationLeave.employeeName != null and employeeRegistrationLeave.employeeName.trim() != ''">
AND b.employee_name like CONCAT('%',#{employeeRegistrationLeave.employeeName},'%') AND b.employee_name like CONCAT('%',#{employeeRegistrationLeave.employeeName},'%')
......
...@@ -143,15 +143,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -143,15 +143,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
return R.failed(judgeAuth); return R.failed(judgeAuth);
} }
//获取行政区化代码 //获取行政区化代码
if (CommonConstants.ZERO_STRING.equals(sysHouseHoldInfo.getType())) { this.setAreaCode(sysHouseHoldInfo, null);
HashMap<String, SysArea> map = initAreaMap();
if (Common.isNotNull(map) && map.size() > 0) {
SysArea area = map.get(sysHouseHoldInfo.getCity());
if (Common.isNotNull(area)) {
sysHouseHoldInfo.setAreaCode(area.getAreaCode());
}
}
}
List<SysHouseHoldInfoFailRes> resList = sysHouseHoldInfo.getResList(); List<SysHouseHoldInfoFailRes> resList = sysHouseHoldInfo.getResList();
// 先判断 // 先判断
if (Common.isNotNull(resList) && !resList.isEmpty()) { if (Common.isNotNull(resList) && !resList.isEmpty()) {
...@@ -483,20 +476,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -483,20 +476,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
return R.failed("户下存在可用基数配置,请禁用可用基数配置后禁用户配置!"); return R.failed("户下存在可用基数配置,请禁用可用基数配置后禁用户配置!");
} }
//更新行政区划代码 //更新行政区划代码
if (CommonConstants.ZERO_STRING.equals(hold.getType()) && Common.isNotNull(hold.getCity())) { this.setAreaCode(hold, null);
if (Common.isNotNull(hold.getTown()) && "1321".equals(hold.getTown())) {
// 黄山市徽州区(徽州区默认编码341004,税友会特殊处理)
hold.setAreaCode("341004");
} else {
HashMap<String, SysArea> map = initAreaMap();
if (Common.isNotNull(map) && map.size() > 0) {
SysArea area = map.get(hold.getCity());
if (Common.isNotNull(area)) {
hold.setAreaCode(area.getAreaCode());
}
}
}
}
if (isEdit) { if (isEdit) {
List<SysHouseHoldInfoFailRes> resList = hold.getResList(); List<SysHouseHoldInfoFailRes> resList = hold.getResList();
holdInfo.setResList(sysHouseHoldInfoFailResService.list(Wrappers.<SysHouseHoldInfoFailRes>query() holdInfo.setResList(sysHouseHoldInfoFailResService.list(Wrappers.<SysHouseHoldInfoFailRes>query()
...@@ -592,6 +572,27 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -592,6 +572,27 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
} }
} }
// 获取行政区化代码
// 对徽州区做了特殊处理
private void setAreaCode(SysHouseHoldInfo hold, HashMap<String, SysArea> map) {
if (CommonConstants.ZERO_STRING.equals(hold.getType()) && Common.isNotNull(hold.getCity())) {
if (Common.isNotNull(hold.getTown()) && "1321".equals(hold.getTown())) {
// 黄山市徽州区(徽州区默认编码341004,税友会特殊处理)
hold.setAreaCode("341004");
} else {
if (map == null) {
map = initAreaMap();
}
if (Common.isNotNull(map) && !map.isEmpty()) {
SysArea area = map.get(hold.getCity());
if (Common.isNotNull(area)) {
hold.setAreaCode(area.getAreaCode());
}
}
}
}
}
@Override @Override
public R<Boolean> updateStatusById(SysHouseHoldInfo sysHouseHoldInfo) { public R<Boolean> updateStatusById(SysHouseHoldInfo sysHouseHoldInfo) {
//查询老的户配置数据 //查询老的户配置数据
...@@ -1005,7 +1006,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1005,7 +1006,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//封装和插入数据 //封装和插入数据
household.setCustomerNo(excel.getCustomerNo()); household.setCustomerNo(excel.getCustomerNo());
household.setCustomerNoYsd(excel.getCustomerNoYsd()); household.setCustomerNoYsd(excel.getCustomerNoYsd());
household.setAreaCode(areaMap.get(household.getCity()).getAreaCode()); //获取行政区化代码
this.setAreaCode(household, areaMap);
household.setIsAutoLeaveDoc(excel.getIsAutoLeaveDoc().equals(CommonConstants.IS_TRUE) ? "1" : "0"); household.setIsAutoLeaveDoc(excel.getIsAutoLeaveDoc().equals(CommonConstants.IS_TRUE) ? "1" : "0");
household.setAutoStatus(excel.getAutoStatus().equals(CommonConstants.IS_TRUE) ? "0" : "1"); household.setAutoStatus(excel.getAutoStatus().equals(CommonConstants.IS_TRUE) ? "0" : "1");
household.setAutoStatusYsd(excel.getAutoStatusYsd().equals(CommonConstants.IS_TRUE) ? "0" : "1"); household.setAutoStatusYsd(excel.getAutoStatusYsd().equals(CommonConstants.IS_TRUE) ? "0" : "1");
...@@ -1156,7 +1158,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1156,7 +1158,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getProvince()) && Common.isNotNull(excel.getCity())) { if (Common.isNotNull(excel.getProvince()) && Common.isNotNull(excel.getCity())) {
info.setProvince(excel.getProvince()); info.setProvince(excel.getProvince());
info.setCity(excel.getCity()); info.setCity(excel.getCity());
info.setAreaCode(areaMap.get(excel.getCity()).getAreaCode()); //获取行政区化代码
this.setAreaCode(info, areaMap);
if (Common.isNotNull(excel.getTown())) { if (Common.isNotNull(excel.getTown())) {
info.setTown(excel.getTown()); info.setTown(excel.getTown());
} else { } else {
......
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