Commit 79506681 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19

parents ddf5d6f4 7b803dff
......@@ -841,6 +841,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
case "5": // 全部成功
leave.setLeaveStatus("3"); // 已处理
break;
case "6": // 无需处理
leave.setLeaveStatus("3"); // 已处理
break;
// case "1": // 未执行 - 保持原有状态(可能是待处理)
// case "6": // 无需处理 - 保持原有状态
// default: // 其他情况保持原有状态不变
......@@ -1645,7 +1648,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
// 6人员档案:加一重保险:失败的再查一下是否已完结,变为无需处理
if (CommonConstants.NINE_STRING.equals(leave.getDoStatusProject())) {
if (CommonConstants.NINE_STRING.equals(leave.getDoStatusEmp())) {
paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo());
......
......@@ -484,11 +484,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
//更新行政区划代码
if (CommonConstants.ZERO_STRING.equals(hold.getType()) && Common.isNotNull(hold.getCity())) {
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 (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());
}
}
}
}
......
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