Commit 02ee7ce4 authored by fangxinjiang's avatar fangxinjiang

户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj

parent 088a8e29
......@@ -944,6 +944,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingle())){
household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
}else {
household.setRosterAutoFlagYgs(null);
household.setDataFlagYgs(null);
household.setIsSingle(null);
}
//如果医保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if (CommonConstants.ZERO_STRING.equals(household.getAutoStatusYsd())){
......@@ -956,6 +960,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingleYsd())){
household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
}else {
household.setRosterAutoFlagYsd(null);
household.setDataFlagYsd(null);
household.setIsSingleYsd(null);
}
household.setOrganId(dicMap.get(household.getOrganName()));
......@@ -1289,6 +1297,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getRosterAutoFlagYgs())) {
info.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
}else {
info.setIsSingle(null);
info.setDataFlagYgs(null);
info.setRosterAutoFlagYgs(null);
}
if (CommonConstants.ZERO_STRING.equals(info.getAutoStatusYsd())){
if (Common.isNotNull(excel.getRosterAutoFlagYsd())) {
......@@ -1300,6 +1312,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getDataFlagYsd())) {
info.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
}else {
info.setRosterAutoFlagYsd(null);
info.setIsSingleYsd(null);
info.setDataFlagYsd(null);
}
if (Common.isNotNull(excel.getOrganName())) {
......
......@@ -244,12 +244,12 @@
if(a.IS_SIGN = '0','是','否') isSign,
if(a.AUTO_STATUS = '0','启用','禁用') autoStatus,
if(a.AUTO_STATUS_YSD = '0','启用','禁用') autoStatusYsd,
if(a.IS_SINGLE = '0','批量','单个') isSingle,
if(a.IS_SINGLE_YSD = '0','批量','单个') isSingleYsd,
if(a.ROSTER_AUTO_FLAG_YGS = '0','否','是') rosterAutoFlagYgs,
if(a.ROSTER_AUTO_FLAG_YSD = '0','否','是') rosterAutoFlagYsd,
if(a.DATA_FLAG_YGS = '0','否','是') dataFlagYgs,
if(a.DATA_FLAG_YSD = '0','否','是') dataFlagYsd
case when a.IS_SINGLE = '0' then '批量' when a.IS_SINGLE = '1' then '单个' else '' end isSingle,
case when a.IS_SINGLE_YSD = '0' then '批量' when a.IS_SINGLE_YSD = '1' then '单个' else '' end isSingleYsd,
case when a.ROSTER_AUTO_FLAG_YGS = '0' then '否' when a.ROSTER_AUTO_FLAG_YGS = '1' then '是' else '' end rosterAutoFlagYgs,
case when a.ROSTER_AUTO_FLAG_YSD = '0' then '否' when a.ROSTER_AUTO_FLAG_YSD = '1' then '是' else '' end rosterAutoFlagYsd,
case when a.DATA_FLAG_YGS = '0' then '否' when a.DATA_FLAG_YGS = '1' then '是' else '' end dataFlagYgs,
case when a.DATA_FLAG_YSD = '0' then '否' when a.DATA_FLAG_YSD = '1' then '是' else '' end dataFlagYsd
FROM sys_house_hold_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY
......
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