Commit 406b71e6 authored by fangxinjiang's avatar fangxinjiang

派单派减分项办理

parent 2a27096e
...@@ -293,6 +293,15 @@ public class TProvidentFund extends BaseEntity { ...@@ -293,6 +293,15 @@ public class TProvidentFund extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核人" ) @ExcelProperty("审核人" )
private String auditUser; private String auditUser;
/**
* 审核人姓名
*/
@ExcelAttribute(name = "审核人姓名", maxLength = 32)
@Schema(description = "审核人姓名" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核人姓名" )
private String auditUserName;
/** /**
* 审核时间 * 审核时间
*/ */
...@@ -310,6 +319,16 @@ public class TProvidentFund extends BaseEntity { ...@@ -310,6 +319,16 @@ public class TProvidentFund extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理人" ) @ExcelProperty("办理人" )
private String handleUser; private String handleUser;
/**
* 办理人姓名
*/
@Length(max = 32, message = "办理人姓名 不能超过32个字符" )
@ExcelAttribute(name = "办理人姓名", maxLength = 32)
@Schema(description = "办理人姓名" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理人姓名" )
private String handleUserName;
/** /**
* 办理时间 * 办理时间
*/ */
......
...@@ -508,6 +508,15 @@ public class TSocialInfo extends BaseEntity { ...@@ -508,6 +508,15 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核人" ) @ExcelProperty("审核人" )
private String auditUser; private String auditUser;
/**
* 审核人姓名
*/
@ExcelAttribute(name = "审核人姓名", maxLength = 32)
@Schema(description = "审核人姓名" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("审核人姓名" )
private String auditUserName;
/** /**
* 审核时间 * 审核时间
*/ */
...@@ -525,6 +534,16 @@ public class TSocialInfo extends BaseEntity { ...@@ -525,6 +534,16 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理人" ) @ExcelProperty("办理人" )
private String handleUser; private String handleUser;
/**
* 办理人姓名
*/
@Length(max = 32, message = "办理人姓名 不能超过32个字符" )
@ExcelAttribute(name = "办理人姓名", maxLength = 32)
@Schema(description = "办理人姓名" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理人姓名" )
private String handleUserName;
/** /**
* 办理时间 * 办理时间
*/ */
......
...@@ -32,58 +32,58 @@ public class SocialHandleExportVo implements Serializable { ...@@ -32,58 +32,58 @@ public class SocialHandleExportVo implements Serializable {
private String type; private String type;
/** /**
* 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败(原-办理失败) 3已派减 4办理中 (20210609派单拆分新增fxj) 5部分办理失败 * 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败(原-办理失败) 3已派减 4办理中 (20210609派单拆分新增fxj) 5部分办理失败 6 派减办理中 7 派减部分办理失败
*/ */
@Schema(description = "社保办理状态") @Schema(description = "社保办理状态")
@ExcelAttribute(name = "社保办理状态", readConverterExp = "0=未办理,1=全部办理成功,2=全部办理失败,3=已派减,4=办理中,5=部分办理失败", needExport = true) @ExcelAttribute(name = "社保办理状态", readConverterExp = "0=未办理,1=全部办理成功,2=全部办理失败,3=已派减,4=办理中,5=部分办理失败,6=派减办理中,7=派减部分办理失败", needExport = true)
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保办理状态" ) @ExcelProperty("社保办理状态" )
private String socialHandleStatus; private String socialHandleStatus;
/** /**
* 养老办理状态:0待办理1办理成功2办理失败3已派减 * 养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "养老状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "养老状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="养老办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="养老办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老状态" ) @ExcelProperty("养老状态" )
private String pensionHandle; private String pensionHandle;
/** /**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减 * 医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "医疗状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "医疗状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="医疗办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="医疗办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗状态" ) @ExcelProperty("医疗状态" )
private String medicalHandle; private String medicalHandle;
/** /**
* 失业办理状态:0待办理1办理成功2办理失败3已派减 * 失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "失业状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "失业状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="失业办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="失业办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业状态" ) @ExcelProperty("失业状态" )
private String unemployHandle; private String unemployHandle;
/** /**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减 * 工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "工伤状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "工伤状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="工伤办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="工伤办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤状态" ) @ExcelProperty("工伤状态" )
private String workInjuryHandle; private String workInjuryHandle;
/** /**
* 生育办理状态:0待办理1办理成功2办理失败3已派减 * 生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "生育状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "生育状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="生育办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="生育办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育状态" ) @ExcelProperty("生育状态" )
private String birthHandle; private String birthHandle;
/** /**
* 大病办理状态:0待办理1办理成功2办理失败3已派减 * 大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/ */
@ExcelAttribute(name = "大病状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,null=——", needExport = true) @ExcelAttribute(name = "大病状态" , maxLength = 1 , readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败,null=——", needExport = true)
@Schema(description="大病办理状态:0待办理1办理成功2办理失败3已派减") @Schema(description="大病办理状态:0待办理1办理成功2办理失败3已派减")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病状态" ) @ExcelProperty("大病状态" )
......
...@@ -3034,6 +3034,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3034,6 +3034,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
socialInfo.setAuditTime(now); socialInfo.setAuditTime(now);
socialInfo.setAuditUser(user.getId()); socialInfo.setAuditUser(user.getId());
socialInfo.setAuditUserName(user.getNickname());
} }
// 派减审核 // 派减审核
if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){ if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){
...@@ -3084,6 +3085,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3084,6 +3085,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
providentFund.setAuditTime(now); providentFund.setAuditTime(now);
providentFund.setAuditUser(user.getId()); providentFund.setAuditUser(user.getId());
providentFund.setAuditUserName(user.getNickname());
} }
//派减 //派减
if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){ if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){
...@@ -3389,6 +3391,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3389,6 +3391,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setHandleStatus(handleStatus); socialInfo.setHandleStatus(handleStatus);
socialInfo.setHandleTime(now); socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId()); socialInfo.setHandleUser(user.getId());
socialInfo.setHandleUserName(user.getNickname());
// 社保办理状态补充判断: // 社保办理状态补充判断:
this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf); this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf);
...@@ -3425,6 +3428,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3425,6 +3428,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
providentFund.setHandleStatus(handleStatus); providentFund.setHandleStatus(handleStatus);
providentFund.setHandleTime(now); providentFund.setHandleTime(now);
providentFund.setHandleUser(user.getId()); providentFund.setHandleUser(user.getId());
providentFund.setHandleUserName(user.getNickname());
dis.setFundHandleStatus(handleStatus); dis.setFundHandleStatus(handleStatus);
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType()) && CommonConstants.ZERO_INT == flag) { if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType()) && CommonConstants.ZERO_INT == flag) {
//派增办理通过 改成可派减状态 //派增办理通过 改成可派减状态
...@@ -3513,6 +3517,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3513,6 +3517,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}*/ }*/
socialInfo.setHandleTime(now); socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId()); socialInfo.setHandleUser(user.getId());
socialInfo.setHandleUserName(user.getNickname());
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
auditInfo = new TAuditInfo(); auditInfo = new TAuditInfo();
...@@ -3561,6 +3566,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3561,6 +3566,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
providentFund.setHandleTime(now); providentFund.setHandleTime(now);
providentFund.setHandleUser(user.getId()); providentFund.setHandleUser(user.getId());
providentFund.setHandleUserName(user.getNickname());
fundMapper.updateFundInfoById(providentFund); fundMapper.updateFundInfoById(providentFund);
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
...@@ -4268,81 +4274,81 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4268,81 +4274,81 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle())){
socialInfo.setPensionHandle(handleStatusTemp); socialInfo.setPensionHandle(handleStatusTemp);
sf.setPensionHandle(handleStatusTemp); sf.setPensionHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){
sf.setPensionHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setPensionReduceStart(dis.getSocialReduceDate()); socialInfo.setPensionReduceStart(dis.getSocialReduceDate());
sf.setPensionReduceStart(dis.getSocialReduceDate()); sf.setPensionReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())){
sf.setPensionHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.TWO_STRING)) { if (socialType.contains(CommonConstants.TWO_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle())){
socialInfo.setMedicalHandle(handleStatusTemp); socialInfo.setMedicalHandle(handleStatusTemp);
sf.setMedicalHandle(handleStatusTemp); sf.setMedicalHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())){
sf.setMedicalHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setMedicalReduceStart(dis.getSocialReduceDate()); socialInfo.setMedicalReduceStart(dis.getSocialReduceDate());
sf.setMedicalReduceStart(dis.getSocialReduceDate()); sf.setMedicalReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())){
sf.setMedicalHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.THREE_STRING)) { if (socialType.contains(CommonConstants.THREE_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle())){
socialInfo.setUnemployHandle(handleStatusTemp); socialInfo.setUnemployHandle(handleStatusTemp);
sf.setUnemployHandle(handleStatusTemp); sf.setUnemployHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())){
sf.setUnemployHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setUnemployReduceStart(dis.getSocialReduceDate()); socialInfo.setUnemployReduceStart(dis.getSocialReduceDate());
sf.setUnemployReduceStart(dis.getSocialReduceDate()); sf.setUnemployReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())){
sf.setUnemployHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.FOUR_STRING)) { if (socialType.contains(CommonConstants.FOUR_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle())){
socialInfo.setWorkInjuryHandle(handleStatusTemp); socialInfo.setWorkInjuryHandle(handleStatusTemp);
sf.setWorkInjuryHandle(handleStatusTemp); sf.setWorkInjuryHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())){
sf.setWorkInjuryHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setWorkInjuryReduceStart(dis.getSocialReduceDate()); socialInfo.setWorkInjuryReduceStart(dis.getSocialReduceDate());
sf.setWorkInjuryReduceStart(dis.getSocialReduceDate()); sf.setWorkInjuryReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())){
sf.setWorkInjuryHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.FIVE_STRING)) { if (socialType.contains(CommonConstants.FIVE_STRING)) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle())){
socialInfo.setBirthHandle(handleStatusTemp); socialInfo.setBirthHandle(handleStatusTemp);
sf.setBirthHandle(handleStatusTemp); sf.setBirthHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())){
sf.setBirthHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setBirthReduceStart(dis.getSocialReduceDate()); socialInfo.setBirthReduceStart(dis.getSocialReduceDate());
sf.setBirthReduceStart(dis.getSocialReduceDate()); sf.setBirthReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())){
sf.setBirthHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.SIX_STRING) if (socialType.contains(CommonConstants.SIX_STRING)
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) { && CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) {
if (CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())){ if (CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle())){
socialInfo.setBigailmentHandle(handleStatusTemp); socialInfo.setBigailmentHandle(handleStatusTemp);
sf.setBigailmentHandle(handleStatusTemp); sf.setBigailmentHandle(handleStatusTemp);
}
if (CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
sf.setBigailmentHandle(handleStatusTemp);
}
if (flag){ if (flag){
socialInfo.setBigailmentReduceStart(dis.getSocialReduceDate()); socialInfo.setBigailmentReduceStart(dis.getSocialReduceDate());
sf.setBigailmentReduceStart(dis.getSocialReduceDate()); sf.setBigailmentReduceStart(dis.getSocialReduceDate());
} }
} }
/*if (CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())){
sf.setBigailmentHandle(handleStatusTemp);
}*/
}
} }
} }
......
...@@ -617,23 +617,28 @@ ...@@ -617,23 +617,28 @@
else null end as "TYPE" , else null end as "TYPE" ,
a.SOCIAL_HOUSEHOLD_NAME, a.SOCIAL_HOUSEHOLD_NAME,
case when a.STATUS = 0 then "待办理" case when a.STATUS = 0 then "待办理"
when a.STATUS = 1 then "办理成功" when s.HANDLE_STATUS = 1 then "办理成功"
when a.STATUS = 2 then "办理失败" when s.HANDLE_STATUS = 2 then "办理失败"
when a.STATUS = 3 then "部分办理失败" when s.HANDLE_STATUS = 3 then "已派减"
when a.STATUS = 4 then "办理中" when s.HANDLE_STATUS = 4 then "办理中"
when s.HANDLE_STATUS = 5 then "部分办理失败"
when s.HANDLE_STATUS = 6 then "派减办理中"
when s.HANDLE_STATUS = 7 then "派减部分办理失败"
else null end as "SOCIAL_HANDLE_STATUS", else null end as "SOCIAL_HANDLE_STATUS",
IF(a.TYPE='0', IF(a.TYPE='0',
case when s.PENSION_HANDLE = 0 then "待办理" case when s.PENSION_HANDLE = 0 then "待办理"
when s.PENSION_HANDLE = 1 then "办理成功" when s.PENSION_HANDLE = 1 then "办理成功"
when s.PENSION_HANDLE = 2 then "办理失败" when s.PENSION_HANDLE = 2 then "办理失败"
when s.PENSION_HANDLE = 3 then "已派减" when s.PENSION_HANDLE = 3 then "已派减"
when s.PENSION_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.PENSION_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.PENSION_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.PENSION_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.PENSION_HANDLE = 3 then "已派减"
else null end when s.PENSION_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as PENSION_HANDLE, as PENSION_HANDLE,
IF(a.TYPE='0', IF(a.TYPE='0',
...@@ -641,13 +646,15 @@ ...@@ -641,13 +646,15 @@
when s.MEDICAL_HANDLE = 1 then "办理成功" when s.MEDICAL_HANDLE = 1 then "办理成功"
when s.MEDICAL_HANDLE = 2 then "办理失败" when s.MEDICAL_HANDLE = 2 then "办理失败"
when s.MEDICAL_HANDLE = 3 then "已派减" when s.MEDICAL_HANDLE = 3 then "已派减"
when s.MEDICAL_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.MEDICAL_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.MEDICAL_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.MEDICAL_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.MEDICAL_HANDLE = 3 then "已派减"
else null end when s.MEDICAL_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as MEDICAL_HANDLE, as MEDICAL_HANDLE,
IF(a.TYPE='0', IF(a.TYPE='0',
...@@ -655,13 +662,15 @@ ...@@ -655,13 +662,15 @@
when s.UNEMPLOY_HANDLE = 1 then "办理成功" when s.UNEMPLOY_HANDLE = 1 then "办理成功"
when s.UNEMPLOY_HANDLE = 2 then "办理失败" when s.UNEMPLOY_HANDLE = 2 then "办理失败"
when s.UNEMPLOY_HANDLE = 3 then "已派减" when s.UNEMPLOY_HANDLE = 3 then "已派减"
when s.UNEMPLOY_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.UNEMPLOY_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.UNEMPLOY_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.UNEMPLOY_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.UNEMPLOY_HANDLE = 3 then "已派减"
else null end when s.UNEMPLOY_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as UNEMPLOY_HANDLE, as UNEMPLOY_HANDLE,
IF(a.TYPE='0', IF(a.TYPE='0',
...@@ -669,13 +678,15 @@ ...@@ -669,13 +678,15 @@
when s.WORK_INJURY_HANDLE = 1 then "办理成功" when s.WORK_INJURY_HANDLE = 1 then "办理成功"
when s.WORK_INJURY_HANDLE = 2 then "办理失败" when s.WORK_INJURY_HANDLE = 2 then "办理失败"
when s.WORK_INJURY_HANDLE = 3 then "已派减" when s.WORK_INJURY_HANDLE = 3 then "已派减"
when s.WORK_INJURY_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.WORK_INJURY_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.WORK_INJURY_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.WORK_INJURY_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.WORK_INJURY_HANDLE = 3 then "已派减"
else null end when s.WORK_INJURY_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as WORK_INJURY_HANDLE, as WORK_INJURY_HANDLE,
IF(a.TYPE='0', IF(a.TYPE='0',
...@@ -683,13 +694,15 @@ ...@@ -683,13 +694,15 @@
when s.BIRTH_HANDLE = 1 then "办理成功" when s.BIRTH_HANDLE = 1 then "办理成功"
when s.BIRTH_HANDLE = 2 then "办理失败" when s.BIRTH_HANDLE = 2 then "办理失败"
when s.BIRTH_HANDLE = 3 then "已派减" when s.BIRTH_HANDLE = 3 then "已派减"
when s.BIRTH_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.BIRTH_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.BIRTH_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.BIRTH_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.BIRTH_HANDLE = 3 then "已派减"
else null end when s.BIRTH_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as BIRTH_HANDLE, as BIRTH_HANDLE,
IF(a.TYPE='0', IF(a.TYPE='0',
...@@ -697,13 +710,15 @@ ...@@ -697,13 +710,15 @@
when s.BIGAILMENT_HANDLE = 1 then "办理成功" when s.BIGAILMENT_HANDLE = 1 then "办理成功"
when s.BIGAILMENT_HANDLE = 2 then "办理失败" when s.BIGAILMENT_HANDLE = 2 then "办理失败"
when s.BIGAILMENT_HANDLE = 3 then "已派减" when s.BIGAILMENT_HANDLE = 3 then "已派减"
when s.BIGAILMENT_HANDLE = 4 then "派减失败"
else null end, else null end,
IF(a.TYPE='1' and a.SOCIAL_HANDLE_STATUS = '1',"已派减", IF(a.TYPE='1',
case when a.SOCIAL_HANDLE_STATUS = 0 then "待办理" case when s.BIGAILMENT_HANDLE = 0 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 1 then "办理成功" when s.BIGAILMENT_HANDLE = 1 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 2 then "办理失败" when s.BIGAILMENT_HANDLE = 2 then "待办理"
when a.SOCIAL_HANDLE_STATUS = 3 then "已派减" when s.BIGAILMENT_HANDLE = 3 then "已派减"
else null end when s.BIGAILMENT_HANDLE = 4 then "派减失败"
else null end,""
)) ))
as BIGAILMENT_HANDLE, as BIGAILMENT_HANDLE,
case when a.FUND_HANDLE_STATUS = 0 then "待办理" case when a.FUND_HANDLE_STATUS = 0 then "待办理"
...@@ -743,10 +758,10 @@ ...@@ -743,10 +758,10 @@
when a.STATUS = 4 then "已办结" when a.STATUS = 4 then "已办结"
else null end ) else null end )
) as FUND_AUDIT_STATUS, ) as FUND_AUDIT_STATUS,
c.AUDIT_USER as FUND_AUDIT_USER, c.AUDIT_USER_NAME as FUND_AUDIT_USER,
c.HANDLE_USER as FUND_HANDLE_USER, c.HANDLE_USER_NAME as FUND_HANDLE_USER,
c.HANDLE_TIME as FUND_HANDLE_TIME, c.HANDLE_TIME as FUND_HANDLE_TIME,
s.AUDIT_USER as AUDIT_USER_NAME, s.AUDIT_USER_NAME as AUDIT_USER_NAME,
if(a.SOCIAL_ID =NULL,'', if(a.SOCIAL_ID =NULL,'',
(case when a.STATUS = 0 then "未提交" (case when a.STATUS = 0 then "未提交"
when a.STATUS = 1 then "待审核" when a.STATUS = 1 then "待审核"
...@@ -758,14 +773,15 @@ ...@@ -758,14 +773,15 @@
s.SOCIAL_START_DATE, s.SOCIAL_START_DATE,
a.SOCIAL_REDUCE_DATE, a.SOCIAL_REDUCE_DATE,
s.RECORD_BASE, s.RECORD_BASE,
s.HANDLE_USER, s.HANDLE_USER_NAME,
s.HANDLE_TIME, s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL, s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL, s.UNIT_MEDICAL_CARDINAL,
s.UNIT_UNEMPLOYMENT_CARDINAL, s.UNIT_UNEMPLOYMENT_CARDINAL,
s.UNIT_BIGAILMENT_CARDINAL, s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_WORK_INJURY_CARDINAL, s.UNIT_WORK_INJURY_CARDINAL,
s.UNIT_BIRTH_CARDINAL s.UNIT_BIRTH_CARDINAL,
c.PROVIDENT_HOUSEHOLD_NAME
from t_dispatch_info a from t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID left join t_social_info s on s.id=a.SOCIAL_ID
......
...@@ -52,8 +52,10 @@ ...@@ -52,8 +52,10 @@
<result property="fundPayPoint" column="FUND_PAY_POINT"/> <result property="fundPayPoint" column="FUND_PAY_POINT"/>
<result property="processInstId" column="PROCESS_INST_ID"/> <result property="processInstId" column="PROCESS_INST_ID"/>
<result property="auditUser" column="AUDIT_USER"/> <result property="auditUser" column="AUDIT_USER"/>
<result property="auditUserName" column="AUDIT_USER_NAME"/>
<result property="auditTime" column="AUDIT_TIME"/> <result property="auditTime" column="AUDIT_TIME"/>
<result property="handleUser" column="HANDLE_USER"/> <result property="handleUser" column="HANDLE_USER"/>
<result property="handleUserName" column="HANDLE_USER_NAME"/>
<result property="handleTime" column="HANDLE_TIME"/> <result property="handleTime" column="HANDLE_TIME"/>
<result property="applyUser" column="APPLY_USER"/> <result property="applyUser" column="APPLY_USER"/>
<result property="applyTime" column="APPLY_TIME"/> <result property="applyTime" column="APPLY_TIME"/>
......
...@@ -79,8 +79,10 @@ ...@@ -79,8 +79,10 @@
<result property="collectType" column="COLLECT_TYPE"/> <result property="collectType" column="COLLECT_TYPE"/>
<result property="processInstId" column="PROCESS_INST_ID"/> <result property="processInstId" column="PROCESS_INST_ID"/>
<result property="auditUser" column="AUDIT_USER"/> <result property="auditUser" column="AUDIT_USER"/>
<result property="auditUserName" column="AUDIT_USER_NAME"/>
<result property="auditTime" column="AUDIT_TIME"/> <result property="auditTime" column="AUDIT_TIME"/>
<result property="handleUser" column="HANDLE_USER"/> <result property="handleUser" column="HANDLE_USER"/>
<result property="handleUserName" column="HANDLE_USER_NAME"/>
<result property="handleTime" column="HANDLE_TIME"/> <result property="handleTime" column="HANDLE_TIME"/>
<result property="belongUnit" column="BELONG_UNIT"/> <result property="belongUnit" column="BELONG_UNIT"/>
<result property="socialReduceDate" column="SOCIAL_REDUCE_DATE"/> <result property="socialReduceDate" column="SOCIAL_REDUCE_DATE"/>
......
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