Commit dae030e9 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-税友拆分社保、医保

parent bbb1f23e
...@@ -216,8 +216,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -216,8 +216,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
List<TSalaryEmployee> empList = employeeService.list(Wrappers.<TSalaryEmployee>query().lambda() List<TSalaryEmployee> empList = employeeService.list(Wrappers.<TSalaryEmployee>query().lambda()
.eq(TSalaryEmployee::getUnitId, dept.getCustomerId())); .eq(TSalaryEmployee::getUnitId, dept.getCustomerId()));
Map<String, TSalaryEmployee> empIdCardMap = new HashMap<>(); Map<String, TSalaryEmployee> empIdCardMap = new HashMap<>();
Map<String, TSalaryEmployee> empNameMap = new HashMap<>(); // 2025-9-12 10:06:42 倩倩说不能根据姓名找人
boolean isDuplicateName = false; // Map<String, TSalaryEmployee> empNameMap = new HashMap<>()
// boolean isDuplicateName = false;
if (empList != null) { if (empList != null) {
TSalaryEmployee es; TSalaryEmployee es;
// 筛选人员,添加判断:非在职,或开户行为空,或 结算主体等于选择的结算主体且在职,都可以存入Map优先备用 // 筛选人员,添加判断:非在职,或开户行为空,或 结算主体等于选择的结算主体且在职,都可以存入Map优先备用
...@@ -226,12 +227,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -226,12 +227,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
es = empIdCardMap.get(e.getEmpIdcard()); es = empIdCardMap.get(e.getEmpIdcard());
if (es == null || (e.getDeptId().equals(settleDepart) && Common.isNotNull(e.getBankProvince()))) { if (es == null || (e.getDeptId().equals(settleDepart) && Common.isNotNull(e.getBankProvince()))) {
empIdCardMap.put(e.getEmpIdcard(), e); empIdCardMap.put(e.getEmpIdcard(), e);
empNameMap.put(e.getEmpName().replace(" ", ""), e); //empNameMap.put(e.getEmpName().replace(" ", ""), e);
} }
} }
if (empNameMap.size() == empIdCardMap.size()) { /*if (empNameMap.size() == empIdCardMap.size()) {
isDuplicateName = true; isDuplicateName = true;
} }*/
} }
// 自有员工结算主体id,新员工使用 // 自有员工结算主体id,新员工使用
Map<String, Integer> ownDeptMap = tOwnDeptService.getOwnDeptMap(); Map<String, Integer> ownDeptMap = tOwnDeptService.getOwnDeptMap();
...@@ -269,7 +270,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -269,7 +270,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
Map<String, String> bankMap = tBankSetService.getBankMap(null); Map<String, String> bankMap = tBankSetService.getBankMap(null);
util1.getJsonStringToList(user, vo, dept, configSalary, salaryConfigMap, isMustMap, util1.getJsonStringToList(user, vo, dept, configSalary, salaryConfigMap, isMustMap,
empIdCardMap, empNameMap, isDuplicateName, checkListY, invoiceTitle, empIdCardMap, checkListY, invoiceTitle,
employeeService, checkMap, specialMap, ownEmployeeMap, ownDeptMap, tSalaryAccountService, bankMap); employeeService, checkMap, specialMap, ownEmployeeMap, ownDeptMap, tSalaryAccountService, bankMap);
List<TSalaryAccountVo> saList = util1.getEntityList(); List<TSalaryAccountVo> saList = util1.getEntityList();
......
...@@ -60,8 +60,8 @@ public class SalaryAccountUtil implements Serializable { ...@@ -60,8 +60,8 @@ public class SalaryAccountUtil implements Serializable {
* @param configSalary 当前项目下的配置(结算月等 * @param configSalary 当前项目下的配置(结算月等
* @param salaryConfigMap 客户原表-工资模板配置Map * @param salaryConfigMap 客户原表-工资模板配置Map
* @param empIdCardMap 当前项目下的员工Map * @param empIdCardMap 当前项目下的员工Map
* @param empNameMap 当前项目下的员工Map * empNameMap 当前项目下的员工Map 2025-9-12 10:06:42 倩倩说不能根据姓名找人
* @param isDuplicateName false:有重名(当前项目下的员工),则不可用姓名查找,必须含有身份证号列 * isDuplicateName false:有重名(当前项目下的员工),则不可用姓名查找,必须含有身份证号列
* repeatFlag 默认 0:不允许重复导入已存在系统内的数据;1:允许重复导入 * repeatFlag 默认 0:不允许重复导入已存在系统内的数据;1:允许重复导入
* @param ownEmployeeMap 自有员工所在项目Map * @param ownEmployeeMap 自有员工所在项目Map
* @Description: 将jsonStr数据源的数据导入到 List<TSalaryAccount> * @Description: 将jsonStr数据源的数据导入到 List<TSalaryAccount>
...@@ -71,7 +71,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -71,7 +71,7 @@ public class SalaryAccountUtil implements Serializable {
**/ **/
public void getJsonStringToList(YifuUser user, SalaryUploadParamVo vo, TSettleDomainSelectVo dept public void getJsonStringToList(YifuUser user, SalaryUploadParamVo vo, TSettleDomainSelectVo dept
, TConfigSalary configSalary, Map<String, TSalaryConfigStandard> salaryConfigMap, Map<String, Boolean> isMustMap , TConfigSalary configSalary, Map<String, TSalaryConfigStandard> salaryConfigMap, Map<String, Boolean> isMustMap
, Map<String, TSalaryEmployee> empIdCardMap, Map<String, TSalaryEmployee> empNameMap, boolean isDuplicateName , Map<String, TSalaryEmployee> empIdCardMap
, List<String> checkListY, String invoiceTitle, TSalaryEmployeeService tSalaryEmployeeService , List<String> checkListY, String invoiceTitle, TSalaryEmployeeService tSalaryEmployeeService
, Map<String, Integer> checkMap, Map<String, BigDecimal> specialMap, Map<String, Integer> ownEmployeeMap , Map<String, Integer> checkMap, Map<String, BigDecimal> specialMap, Map<String, Integer> ownEmployeeMap
, Map<String, Integer> ownDeptMap, TSalaryAccountService tSalaryAccountService, Map<String, String> bankMap) { , Map<String, Integer> ownDeptMap, TSalaryAccountService tSalaryAccountService, Map<String, String> bankMap) {
...@@ -274,9 +274,9 @@ public class SalaryAccountUtil implements Serializable { ...@@ -274,9 +274,9 @@ public class SalaryAccountUtil implements Serializable {
} }
if (SalaryConstants.EMP_NAME.equals(dbFiedName)) { if (SalaryConstants.EMP_NAME.equals(dbFiedName)) {
empName = cellValueStr = cellValueStr.replace(" ", ""); empName = cellValueStr = cellValueStr.replace(" ", "");
if (isDuplicateName) { /*if (isDuplicateName) {
emp = empNameMap.get(empName); emp = empNameMap.get(empName);
} }*/
newEmp.setEmpName(empName); newEmp.setEmpName(empName);
} }
......
...@@ -846,4 +846,55 @@ public class TDispatchInfo extends BaseEntity { ...@@ -846,4 +846,55 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("是否自动生成解除劳动合同书 0否1是") @ExcelProperty("是否自动生成解除劳动合同书 0否1是")
private String isAutoLeaveDoc; private String isAutoLeaveDoc;
/**
* 医保自动化(自动化配置状态) 0 启用 1 禁用 -MVP1.7.15新增医保自动化
*/
@Schema(description ="医保自动化")
private String autoFlagYsd;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute(name = "医保推送类型" )
@Schema(description ="医保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保推送类型")
private String isSingleYsd;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelAttribute(name = "社保是否自动生成花名册" )
@Schema(description ="社保是否自动生成花名册 0否1是")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否自动生成花名册")
private String rosterAutoFlagYgs;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelAttribute(name = "医保是否自动生成花名册" )
@Schema(description ="医保是否自动生成花名册 0否1是")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否自动生成花名册")
private String rosterAutoFlagYsd;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelAttribute(name = "社保仅补缴生成材料" )
@Schema(description ="社保仅补缴生成材料 0否1是")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保仅补缴生成材料")
private String dataFlagYgs;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelAttribute(name = "医保仅补缴生成材料" )
@Schema(description ="医保仅补缴生成材料 0否1是")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保仅补缴生成材料")
private String dataFlagYsd;
} }
...@@ -14,6 +14,14 @@ import java.io.Serializable; ...@@ -14,6 +14,14 @@ import java.io.Serializable;
public class AutoFlagVo implements Serializable { public class AutoFlagVo implements Serializable {
// 派单ID // 派单ID
private String dispatchId; private String dispatchId;
// 自动化标识 0 // 社保自动化标识 0
private String autoFlag; private String autoFlagYgs;
// 医保自动化标识 0
private String autoFlagYsd;
private String isSingleYgs;
private String isSingleYsd;
private String rosterAutoFlagYgs;
private String rosterAutoFlagYsd;
private String dataFlagYgs;
private String dataFlagYsd;
} }
...@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -164,4 +163,34 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -164,4 +163,34 @@ public class SociaFriendYgsAddVo implements Serializable {
// 户ID,用来查章 // 户ID,用来查章
private String huId; private String huId;
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelProperty("医保推送类型")
private String isSingleYsd;
/**
* 社保是否自动生成花名册 0否1是
*/
@ExcelProperty("社保是否自动生成花名册")
private String rosterAutoFlagYgs;
/**
* 医保是否自动生成花名册 0否1是
*/
@ExcelProperty("医保是否自动生成花名册")
private String rosterAutoFlagYsd;
/**
* 社保仅补缴生成材料 0否1是
*/
@ExcelProperty("社保仅补缴生成材料")
private String dataFlagYgs;
/**
* 医保仅补缴生成材料 0否1是
*/
@ExcelProperty("医保仅补缴生成材料")
private String dataFlagYsd;
} }
...@@ -294,16 +294,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> { ...@@ -294,16 +294,8 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo); HouseNameConfigVo getFundSumExportVoTwo(@Param("houseName") String houseName,@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo);
List<AutoFlagVo> getAutoFlag(@Param("idsList")List<String> idsList); List<AutoFlagVo> getAutoFlag(@Param("idsList") List<String> idsList);
/**
* @param idsList 派单IDlist
* @Description: 获取单个的推送的户的派单ID
* @Author: hgw
* @Date: 2025/5/12 18:31
* @return: java.util.List<java.lang.String>
**/
List<String> getSingleFlagMap(@Param("idsList")List<String> idsList);
// 获取自动生成减员离职证明的派单ID // 获取自动生成减员离职证明的派单ID
List<String> getAutoDocFlagMap(@Param("idsList")List<String> idsList); List<String> getAutoDocFlagMap(@Param("idsList")List<String> idsList);
......
...@@ -3588,12 +3588,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3588,12 +3588,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
// 获取所有派单信息 // 获取所有派单信息
List<TDispatchInfo> dispatchs = baseMapper.selectList(Wrappers.<TDispatchInfo>query().lambda().in(TDispatchInfo::getId, idsList)); List<TDispatchInfo> dispatchs = baseMapper.selectList(Wrappers.<TDispatchInfo>query().lambda().in(TDispatchInfo::getId, idsList));
// 获取所有派单对应的自动化配置信息 // 获取所有派单对应的户的自动化配置信息
Map<String, String> autoFlagMap = new HashMap<>(); Map<String, AutoFlagVo> autoFlagMap = this.getAutoFlagMap(idsList);
autoFlagMap = getAutoFlagMap(idsList, autoFlagMap);
// 户配置为单个推送的派单
Map<String, String> singleFlagMap = new HashMap<>();
singleFlagMap = getSingleFlagMap(idsList, singleFlagMap);
Map<String, String> autoDocMap = new HashMap<>(); Map<String, String> autoDocMap = new HashMap<>();
autoDocMap = getAutoDocFlagMap(idsList, autoDocMap); autoDocMap = getAutoDocFlagMap(idsList, autoDocMap);
if (Common.isNotNull(dispatchs)) { if (Common.isNotNull(dispatchs)) {
...@@ -3610,15 +3607,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3610,15 +3607,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
int forecastFlag; int forecastFlag;
// 是否SSC,true是 // 是否SSC,true是
boolean isSSC; boolean isSSC;
String autoFlag; String autoFlagYgs;
String autoFlagYsd;
TDispatchSocialFundInfo socialFundInfo; TDispatchSocialFundInfo socialFundInfo;
// 是否自动化办理,true:推送到社保士兵 // 是否自动化办理,true:推送到社保士兵
boolean isAuto; boolean isAuto;
AutoFlagVo autoFlagVo;
for (TDispatchInfo dis : dispatchs) { for (TDispatchInfo dis : dispatchs) {
autoFlag = autoFlagMap.get(dis.getId()); autoFlagVo = autoFlagMap.get(dis.getId());
if (Common.isEmpty(autoFlag)) { if (autoFlagVo == null) {
autoFlag = "1"; autoFlagVo = new AutoFlagVo();
}
autoFlagYgs = autoFlagVo.getAutoFlagYgs();
autoFlagYsd = autoFlagVo.getAutoFlagYsd();
if (Common.isEmpty(autoFlagYgs)) {
autoFlagYgs = "1";
}
if (Common.isEmpty(autoFlagYsd)) {
autoFlagYsd = "1";
} }
isSSC = CommonConstants.FIVE_STRING.equals(dis.getStatus()); isSSC = CommonConstants.FIVE_STRING.equals(dis.getStatus());
forecastFlag = getForecastFlag(dis); forecastFlag = getForecastFlag(dis);
...@@ -3644,14 +3650,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3644,14 +3650,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue; continue;
} }
// 批量审核+审核为自动化+户配置为单个推送 // 批量审核+审核为自动化+户配置为单个推送
if (!CommonConstants.ONE_STRING.equals(isSingleAudit) // 2025-9-11 16:41:08 1.7.15版本,批量审核允许通过类型为单个的
/*if (!CommonConstants.ONE_STRING.equals(isSingleAudit)
&& singleFlagMap.get(dis.getId()) != null && singleFlagMap.get(dis.getId()) != null
&& CommonConstants.THREE_STRING.equals(auditStatus) && CommonConstants.THREE_STRING.equals(auditStatus)
&& null != socialInfo) { && null != socialInfo) {
// 自动忽略这种社保,要单个审核并选择上传附件才行 // 自动忽略这种社保,要单个审核并选择上传附件才行
errorList.add(new ErrorMessage(-1, "户配置为单个推送,已跳过此条,请单个审核:" + dis.getEmpName())); errorList.add(new ErrorMessage(-1, "户配置为单个推送,已跳过此条,请单个审核:" + dis.getEmpName()));
continue; continue;
} }*/
if (null != socialInfo) { if (null != socialInfo) {
// 派增审核 // 派增审核
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())) { if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())) {
...@@ -3727,7 +3734,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3727,7 +3734,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle()) || CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle()) || CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle())
|| CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle())) || CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag)) { && CommonConstants.ZERO_STRING.equals(autoFlagYgs)) {
socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING);
} else { } else {
socialInfo.setYgsHandleStatus(CommonConstants.ZERO_STRING); socialInfo.setYgsHandleStatus(CommonConstants.ZERO_STRING);
...@@ -3738,7 +3745,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3738,7 +3745,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle()) || CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle()) || CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle())
|| CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle())) || CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag)) { && CommonConstants.ZERO_STRING.equals(autoFlagYsd)) {
socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING);
} else { } else {
socialInfo.setYsdHandleStatus(CommonConstants.ZERO_STRING); socialInfo.setYsdHandleStatus(CommonConstants.ZERO_STRING);
...@@ -3910,22 +3917,48 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3910,22 +3917,48 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//人工处理 //人工处理
if (CommonConstants.ONE_STRING.equals(auditStatus)) { if (CommonConstants.ONE_STRING.equals(auditStatus)) {
dis.setAutoFlag(CommonConstants.ONE_STRING); dis.setAutoFlag(CommonConstants.ONE_STRING);
dis.setAutoFlagYsd(CommonConstants.ONE_STRING);
} }
// 初始化为非自动办理 // 初始化为非自动办理
isAuto = false; isAuto = false;
//自动化处理,如果未配置还是人工处理 //自动化处理,如果未配置还是人工处理
if (CommonConstants.THREE_STRING.equals(auditStatus)) { if (CommonConstants.THREE_STRING.equals(auditStatus)) {
// 自动化处理 // 自动化处理
if (CommonConstants.ZERO_STRING.equals(autoFlag)) { if (CommonConstants.ZERO_STRING.equals(autoFlagYgs)) {
dis.setSocialHandleStatus(CommonConstants.FOUR_STRING); dis.setSocialHandleStatus(CommonConstants.FOUR_STRING);
dis.setAutoFlag(CommonConstants.ZERO_STRING); dis.setAutoFlag(CommonConstants.ZERO_STRING);
isAuto = true; isAuto = true;
} else { } else {
dis.setAutoFlag(CommonConstants.ONE_STRING); dis.setAutoFlag(CommonConstants.ONE_STRING);
} }
if (CommonConstants.ZERO_STRING.equals(autoFlagYsd)) {
dis.setSocialHandleStatus(CommonConstants.FOUR_STRING);
dis.setAutoFlagYsd(CommonConstants.ZERO_STRING);
isAuto = true;
} else {
dis.setAutoFlagYsd(CommonConstants.ONE_STRING);
}
}
if (Common.isNotNull(autoFlagVo.getIsSingleYgs())) {
dis.setIsSingle(autoFlagVo.getIsSingleYgs());
}
if (Common.isNotNull(autoFlagVo.getIsSingleYsd())) {
dis.setIsSingleYsd(autoFlagVo.getIsSingleYsd());
}
if (Common.isNotNull(autoFlagVo.getRosterAutoFlagYgs())) {
dis.setRosterAutoFlagYgs(autoFlagVo.getRosterAutoFlagYgs());
}
if (Common.isNotNull(autoFlagVo.getRosterAutoFlagYsd())) {
dis.setRosterAutoFlagYsd(autoFlagVo.getRosterAutoFlagYsd());
} }
dis.setIsSingle(isSingleAudit); if (Common.isNotNull(autoFlagVo.getDataFlagYgs())) {
dis.setDataFlagYgs(autoFlagVo.getDataFlagYgs());
}
if (Common.isNotNull(autoFlagVo.getDataFlagYsd())) {
dis.setDataFlagYsd(autoFlagVo.getDataFlagYsd());
}
dis.setIsAutoLeaveDoc(autoDocMap.get(dis.getId())); dis.setIsAutoLeaveDoc(autoDocMap.get(dis.getId()));
baseMapper.updateById(dis); baseMapper.updateById(dis);
socialFundMapper.updateById(sf); socialFundMapper.updateById(sf);
...@@ -4011,32 +4044,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4011,32 +4044,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return errorList; return errorList;
} }
private Map<String, String> getAutoFlagMap(List<String> idsList, Map<String, String> autoFlagMap) { // type 1社保,2医保
private Map<String, AutoFlagVo> getAutoFlagMap(List<String> idsList) {
Map<String, AutoFlagVo> autoFlagMap = new HashMap<>();
List<AutoFlagVo> autoFlagList = baseMapper.getAutoFlag(idsList); List<AutoFlagVo> autoFlagList = baseMapper.getAutoFlag(idsList);
if (Common.isNotNull(autoFlagList)) { if (Common.isNotNull(autoFlagList)) {
if (Common.isNotNull(autoFlagMap)) {
autoFlagMap = new HashMap<>();
}
for (AutoFlagVo flagVo : autoFlagList) { for (AutoFlagVo flagVo : autoFlagList) {
autoFlagMap.put(flagVo.getDispatchId(), flagVo.getAutoFlag()); autoFlagMap.put(flagVo.getDispatchId(), flagVo);
} }
} }
return autoFlagMap; return autoFlagMap;
} }
// 返回单个派单的map
private Map<String, String> getSingleFlagMap(List<String> idsList, Map<String, String> singleFlagMap) {
List<String> singleFlagList = baseMapper.getSingleFlagMap(idsList);
if (Common.isNotNull(singleFlagList)) {
if (Common.isNotNull(singleFlagMap)) {
singleFlagMap = new HashMap<>();
}
for (String dispatchId : singleFlagList) {
singleFlagMap.put(dispatchId, CommonConstants.ONE_STRING);
}
}
return singleFlagMap;
}
// 返回需要自动生成离职证明的map // 返回需要自动生成离职证明的map
private Map<String, String> getAutoDocFlagMap(List<String> idsList, Map<String, String> autoDocMap) { private Map<String, String> getAutoDocFlagMap(List<String> idsList, Map<String, String> autoDocMap) {
......
...@@ -107,6 +107,13 @@ ...@@ -107,6 +107,13 @@
<result property="isSingle" column="IS_SINGLE"/> <result property="isSingle" column="IS_SINGLE"/>
<result property="isAutoLeaveDoc" column="IS_AUTO_LEAVE_DOC"/> <result property="isAutoLeaveDoc" column="IS_AUTO_LEAVE_DOC"/>
<result property="autoFlagYsd" column="AUTO_FLAG_YSD"/>
<result property="isSingleYsd" column="IS_SINGLE_YSD"/>
<result property="rosterAutoFlagYgs" column="ROSTER_AUTO_FLAG_YGS"/>
<result property="rosterAutoFlagYsd" column="ROSTER_AUTO_FLAG_YSD"/>
<result property="dataFlagYgs" column="DATA_FLAG_YGS"/>
<result property="dataFlagYsd" column="DATA_FLAG_YSD"/>
</resultMap> </resultMap>
<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap"> <resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/> <result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
...@@ -446,8 +453,11 @@ ...@@ -446,8 +453,11 @@
a.SCHOOL_NAME, a.SCHOOL_NAME,
a.MAJOR, a.MAJOR,
a.FIRST_PAY_TIME, a.FIRST_PAY_TIME,
a.GRADUATION_TIME,a.AUTO_FLAG,a.IS_SINGLE a.GRADUATION_TIME
,a.IS_AUTO_LEAVE_DOC ,a.AUTO_FLAG,a.IS_SINGLE,a.IS_AUTO_LEAVE_DOC
,a.AUTO_FLAG_YSD,a.IS_SINGLE_YSD,a.ROSTER_AUTO_FLAG_YGS,a.ROSTER_AUTO_FLAG_YSD
,a.DATA_FLAG_YGS,a.DATA_FLAG_YSD
</sql> </sql>
<sql id="tDispatchInfo_where"> <sql id="tDispatchInfo_where">
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
...@@ -2809,28 +2819,19 @@ ...@@ -2809,28 +2819,19 @@
OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' )) OR ( APPLY_END_DATE IS NULL OR APPLY_END_DATE = '' ))
GROUP BY A.`NAME` GROUP BY A.`NAME`
</select> </select>
<resultMap id="autoFlagMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.AutoFlagVo"> <select id="getAutoFlag" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.AutoFlagVo">
<result property="dispatchId" column="dispatchId"/> select a.id as 'dispatchId',
<result property="autoFlag" column="autoFlag"/> b.AUTO_STATUS as 'autoFlag',
</resultMap> b.AUTO_STATUS_YSD as 'autoFlagYsd',
<select id="getAutoFlag" resultMap="autoFlagMap"> b.IS_SINGLE as 'isSingleYgs',
select a.id as "dispatchId", b.IS_SINGLE_YSD as 'isSingleYsd',
b.AUTO_STATUS as 'autoFlag' b.ROSTER_AUTO_FLAG_YGS as 'rosterAutoFlagYgs',
FROM t_dispatch_info a b.ROSTER_AUTO_FLAG_YSD as 'rosterAutoFlagYsd',
LEFT JOIN sys_house_hold_info b on a.SOCIAL_HOUSEHOLD_NAME=b.`NAME` and b.TYPE='0' b.DATA_FLAG_YGS as 'dataFlagYgs',
where a.SOCIAL_HOUSEHOLD_NAME is not null b.DATA_FLAG_YSD as 'dataFlagYsd'
and a.id in
<foreach item="item" index="index" collection="idsList" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="getSingleFlagMap" resultType="java.lang.String">
select a.id as "dispatchId"
FROM t_dispatch_info a FROM t_dispatch_info a
LEFT JOIN sys_house_hold_info b on a.SOCIAL_HOUSEHOLD_NAME=b.`NAME` and b.TYPE='0' LEFT JOIN sys_house_hold_info b on a.SOCIAL_HOUSEHOLD_NAME=b.`NAME` and b.TYPE='0'
where a.SOCIAL_HOUSEHOLD_NAME is not null where a.SOCIAL_HOUSEHOLD_NAME is not null
and b.IS_SINGLE='1'
and a.id in and a.id in
<foreach item="item" index="index" collection="idsList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="idsList" open="(" separator="," close=")">
#{item} #{item}
......
...@@ -81,6 +81,13 @@ ...@@ -81,6 +81,13 @@
s.SOCIAL_TOWN socialTown, s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx, a.SCHOOL_NAME byyx,
a.IS_SINGLE isSingle, a.IS_SINGLE isSingle,
a.IS_SINGLE_YSD isSingleYsd,
a.ROSTER_AUTO_FLAG_YGS rosterAutoFlagYgs,
a.ROSTER_AUTO_FLAG_YSD rosterAutoFlagYsd,
a.DATA_FLAG_YGS dataFlagYgs,
a.DATA_FLAG_YSD dataFlagYsd,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc, a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate, DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate, DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
...@@ -125,6 +132,11 @@ ...@@ -125,6 +132,11 @@
,CONCAT('补缴',DATE_FORMAT(if(YGS_SOCIAL_START_DATE_NEXT is not null,YGS_SOCIAL_START_DATE_NEXT,if(s.PENSION_START is not null,s.PENSION_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark ,CONCAT('补缴',DATE_FORMAT(if(YGS_SOCIAL_START_DATE_NEXT is not null,YGS_SOCIAL_START_DATE_NEXT,if(s.PENSION_START is not null,s.PENSION_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/
and a.IS_SINGLE = '1'
</if>
and a.AUTO_FLAG = '0'
and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3') and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3')
and ( and (
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '0' or if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '0' or
...@@ -150,7 +162,7 @@ ...@@ -150,7 +162,7 @@
AND a.STATUS = "2" AND a.STATUS = "2"
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) )) and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) ))
and a.SOCIAL_HANDLE_STATUS in ('0','4') and a.SOCIAL_HANDLE_STATUS in ('0','4')
and a.AUTO_FLAG = '0'
</where> </where>
</sql> </sql>
...@@ -166,6 +178,12 @@ ...@@ -166,6 +178,12 @@
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/
and a.IS_SINGLE = '1'
</if>
and a.AUTO_FLAG = '0'
and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','3') and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','3')
and ( and (
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '5' or if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '5' or
...@@ -188,6 +206,12 @@ ...@@ -188,6 +206,12 @@
,CONCAT('补缴',DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark ,CONCAT('补缴',DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark
,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal ,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/
and a.IS_SINGLE_YSD = '1'
</if>
and a.AUTO_FLAG_YSD = '0'
and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','3') and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','3')
and ( and (
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or
...@@ -257,6 +281,13 @@ ...@@ -257,6 +281,13 @@
s.SOCIAL_TOWN socialTown, s.SOCIAL_TOWN socialTown,
a.SCHOOL_NAME byyx, a.SCHOOL_NAME byyx,
a.IS_SINGLE isSingle, a.IS_SINGLE isSingle,
a.IS_SINGLE_YSD isSingleYsd,
a.ROSTER_AUTO_FLAG_YGS rosterAutoFlagYgs,
a.ROSTER_AUTO_FLAG_YSD rosterAutoFlagYsd,
a.DATA_FLAG_YGS dataFlagYgs,
a.DATA_FLAG_YSD dataFlagYsd,
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc, a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate, DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate, DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
...@@ -281,6 +312,11 @@ ...@@ -281,6 +312,11 @@
,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal ,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal
,s.SOCIAL_HOUSEHOLD huId ,s.SOCIAL_HOUSEHOLD huId
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/
and a.IS_SINGLE_YSD = '1'
</if>
and a.AUTO_FLAG_YSD = '0'
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3') and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3')
and ( and (
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or
......
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