Commit c7041602 authored by fangxinjiang's avatar fangxinjiang

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

parent 02ee7ce4
...@@ -151,6 +151,14 @@ public class TSocialHouseholdExportVo implements Serializable { ...@@ -151,6 +151,14 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty("医保-单位编号") @ExcelProperty("医保-单位编号")
private String customerNoYsd; private String customerNoYsd;
/**
* 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段)
*/
@ExcelAttribute(name = "是否需要《解除劳动合同证明书》")
@Schema(description ="是否需要《解除劳动合同证明书》")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否需要《解除劳动合同证明书》")
private String isAutoLeaveDoc;
/** /**
* 社保-登录账户 * 社保-登录账户
*/ */
......
...@@ -192,10 +192,10 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable { ...@@ -192,10 +192,10 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/** /**
* 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段) * 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段)
*/ */
@ExcelAttribute(name = "是否自动生成解除劳动合同书",errorInfo = "是否自动生成解除劳动合同书不能为空") @ExcelAttribute(name = "是否需要《解除劳动合同证明书》",errorInfo = "是否需要《解除劳动合同证明书》不能为空")
@Schema(description ="是否自动生成解除劳动合同书") @Schema(description ="是否需要《解除劳动合同证明书》")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否自动生成解除劳动合同书 0否1是") @ExcelProperty("是否需要《解除劳动合同证明书》")
private String isAutoLeaveDoc; private String isAutoLeaveDoc;
/** /**
* 自动化配置状态 0 是 1 否 * 自动化配置状态 0 是 1 否
......
...@@ -74,4 +74,6 @@ public class HouseConfigConstants { ...@@ -74,4 +74,6 @@ public class HouseConfigConstants {
public static final String IS_SINGLE_NO = "批量"; public static final String IS_SINGLE_NO = "批量";
public static final String ERROR_TEMPLATE_TWENTY_TWO = "是否自动生成解除劳动合同书只能为【是】或者【否】";
} }
...@@ -938,9 +938,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -938,9 +938,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getRosterAutoFlagYgs())){ if (Common.isNotNull(excel.getRosterAutoFlagYgs())){
household.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0"); household.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
if (CommonConstants.ONE_STRING.equals(household.getRosterAutoFlagYgs())){
if (Common.isNotNull(excel.getDataFlagYgs())){ if (Common.isNotNull(excel.getDataFlagYgs())){
household.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0"); household.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
}else {
household.setDataFlagYgs(null);
}
if (Common.isNotNull(excel.getIsSingle())){ if (Common.isNotNull(excel.getIsSingle())){
household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1"); household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
} }
...@@ -954,9 +959,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -954,9 +959,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getRosterAutoFlagYsd())){ if (Common.isNotNull(excel.getRosterAutoFlagYsd())){
household.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0"); household.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
if (CommonConstants.ONE_STRING.equals(household.getRosterAutoFlagYsd())){
if (Common.isNotNull(excel.getDataFlagYsd())){ if (Common.isNotNull(excel.getDataFlagYsd())){
household.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0"); household.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
}else {
household.setDataFlagYsd(null);
}
if (Common.isNotNull(excel.getIsSingleYsd())){ if (Common.isNotNull(excel.getIsSingleYsd())){
household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1"); household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
} }
...@@ -1087,6 +1097,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1087,6 +1097,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWENTY_ONE,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWENTY_ONE,excel));
continue; continue;
} }
//判断是否自动办理是否准确 //判断是否自动办理是否准确
if (Common.isNotNull(excel.getAutoStatus()) if (Common.isNotNull(excel.getAutoStatus())
&& !CommonConstants.IS_TRUE.equals(excel.getAutoStatus()) && !CommonConstants.IS_TRUE.equals(excel.getAutoStatus())
...@@ -1100,7 +1111,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1100,7 +1111,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THREE_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THREE_TWO,excel));
continue; continue;
} }
//判断是否自动生成解除劳动合同书 0否1是 为空
if (Common.isNotNull(excel.getIsAutoLeaveDoc())
&& !CommonConstants.IS_TRUE.equals(excel.getIsAutoLeaveDoc())
&& !CommonConstants.IS_FALSE.equals(excel.getIsAutoLeaveDoc())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWENTY_TWO,excel));
continue;
}
//判断推送类型是否准确 //判断推送类型是否准确
if (Common.isNotNull(excel.getIsSingle()) if (Common.isNotNull(excel.getIsSingle())
&& !HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingle()) && !HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingle())
...@@ -1291,9 +1308,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1291,9 +1308,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingle())) { if (Common.isNotNull(excel.getIsSingle())) {
info.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1"); info.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
} }
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYgs())){
if (Common.isNotNull(excel.getDataFlagYgs())) { if (Common.isNotNull(excel.getDataFlagYgs())) {
info.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0"); info.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
}else {
info.setDataFlagYgs(null);
}
if (Common.isNotNull(excel.getRosterAutoFlagYgs())) { if (Common.isNotNull(excel.getRosterAutoFlagYgs())) {
info.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0"); info.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
...@@ -1309,9 +1331,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1309,9 +1331,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingleYsd())) { if (Common.isNotNull(excel.getIsSingleYsd())) {
info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1"); info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
} }
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYsd())){
if (Common.isNotNull(excel.getDataFlagYsd())) { if (Common.isNotNull(excel.getDataFlagYsd())) {
info.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0"); info.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
} }
}else {
info.setDataFlagYsd(null);
}
}else { }else {
info.setRosterAutoFlagYsd(null); info.setRosterAutoFlagYsd(null);
info.setIsSingleYsd(null); info.setIsSingleYsd(null);
......
...@@ -249,7 +249,8 @@ ...@@ -249,7 +249,8 @@
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_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.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_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 case when a.DATA_FLAG_YSD = '0' then '否' when a.DATA_FLAG_YSD = '1' then '是' else '' end dataFlagYsd,
case when a.IS_AUTO_LEAVE_DOC = '0' then '否' when a.IS_AUTO_LEAVE_DOC = '1' then '是' else '' end isAutoLeaveDoc
FROM sys_house_hold_info a FROM sys_house_hold_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY 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