Skip to content

Y
yifu-mvp
Commit c1de8685 authored by hongguangwu's avatar hongguangwu
Browse files
Options

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

parents b04058e7 cc761b6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 101 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TElecEmployeeInfoServiceImpl.java
View file @ c1de8685
...@@ -156,7 +156,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -156,7 +156,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
elecTypeMap.put(entry.getValue(),entry.getKey()); elecTypeMap.put(entry.getValue(),entry.getKey());
} }
} }
if (!elecTypeMap.isEmpty()) { if (elecTypeMap.isEmpty()) {
return R.failed("获取字典失败！"); return R.failed("获取字典失败！");
} }
// 判断源文件是否存在 // 判断源文件是否存在
...@@ -176,14 +176,19 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -176,14 +176,19 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
TEmployeeInfo tEmployeeInfo; TEmployeeInfo tEmployeeInfo;
ZipEntry entry; ZipEntry entry;
String idCard;
String empInfo;
while (entriesCheck.hasMoreElements()) { while (entriesCheck.hasMoreElements()) {
entry = (ZipEntry) entriesCheck.nextElement(); entry = (ZipEntry) entriesCheck.nextElement();
//添加进filesName //添加进filesName
String empInfo = entry.getName(); empInfo = entry.getName();
infoList.add(empInfo); infoList.add(empInfo);
String dataType = ""; String dataType = "";
if (empInfo.length() == empInfo.lastIndexOf("/") + 1) { if (empInfo.length() == empInfo.lastIndexOf("/") + 1) {
String idCard = empInfo.substring(0, empInfo.indexOf("/")); if (!empInfo.contains("-")) {
return R.failed("请使用正确的文件夹命名格式：身份证-员工姓名");
}
idCard = empInfo.substring(0, empInfo.indexOf("-"));
tEmployeeInfo = tEmployeeInfoService.getOne((Wrappers.<TEmployeeInfo>query().lambda() tEmployeeInfo = tEmployeeInfoService.getOne((Wrappers.<TEmployeeInfo>query().lambda()
.eq(TEmployeeInfo::getEmpIdcard, idCard)).eq(TEmployeeInfo::getFileStatus, CommonConstants.ZERO_INT) .eq(TEmployeeInfo::getEmpIdcard, idCard)).eq(TEmployeeInfo::getFileStatus, CommonConstants.ZERO_INT)
.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.ZERO_STRING) .eq(TEmployeeInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
...@@ -197,7 +202,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -197,7 +202,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
if (!Common.isNotNull(elecTypeMap.get(dataType))) { if (!Common.isNotNull(elecTypeMap.get(dataType))) {
return R.failed("资料类型错误：" + dataType); return R.failed("资料类型错误：" + dataType);
} }
cardType.add(idCard + "/" + dataType); cardType.add(idCard + "_" + dataType);
} }
} }
} }
...@@ -219,7 +224,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -219,7 +224,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
while (entries.hasMoreElements()) { while (entries.hasMoreElements()) {
entry = (ZipEntry) entries.nextElement(); entry = (ZipEntry) entries.nextElement();
//添加进filesName //添加进filesName
String empInfo = entry.getName(); empInfo = entry.getName();
// 如果是文件夹，就创建个文件夹 // 如果是文件夹，就创建个文件夹
if (entry.isDirectory()) { if (entry.isDirectory()) {
String dirPath = destDirPath + "/" + entry.getName(); String dirPath = destDirPath + "/" + entry.getName();
...@@ -245,7 +250,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -245,7 +250,7 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
TElecEmployeeInfo tElecEmployeeInfo = new TElecEmployeeInfo(); TElecEmployeeInfo tElecEmployeeInfo = new TElecEmployeeInfo();
if (empInfo.length() > empInfo.lastIndexOf("/") + 1) { if (empInfo.length() > empInfo.lastIndexOf("/") + 1) {
String idCard = empInfo.substring(0, empInfo.indexOf("/")); idCard = empInfo.substring(0, empInfo.indexOf("-"));
String dataType = empInfo.substring(empInfo.indexOf("/") + 1, empInfo.lastIndexOf("/")); String dataType = empInfo.substring(empInfo.indexOf("/") + 1, empInfo.lastIndexOf("/"));
String empName = ""; String empName = "";
employeeInfo = tEmployeeInfoService.getOne((Wrappers.<TEmployeeInfo>query().lambda() employeeInfo = tEmployeeInfoService.getOne((Wrappers.<TEmployeeInfo>query().lambda()
...@@ -388,16 +393,12 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM ...@@ -388,16 +393,12 @@ public class TElecEmployeeInfoServiceImpl extends ServiceImpl<TElecEmployeeInfoM
} }
public boolean containsCheckTwo(String e,String idCard) { public boolean containsCheckTwo(String e,String idCard) {
if (e.contains(idCard) && e.length() > 20) { return e.contains(idCard) && e.length() > 20;
return true;
}
return false;
} }
public boolean containsCheckOne(String e,String cardType) { public boolean containsCheckOne(String e,String cardType) {
if (e.contains(cardType) && e.contains(CommonConstants.SPOT)) { String empIdcard = cardType.substring(0,cardType.indexOf("_"));
return true; String fileName = cardType.substring(cardType.indexOf("_") +1);
} return e.contains(empIdcard) && e.contains(fileName) && e.contains(CommonConstants.SPOT);
return false;
} }
} }
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @ c1de8685
...@@ -114,11 +114,11 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -114,11 +114,11 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType()); updateTEmployeeProject.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
updateTEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType()); updateTEmployeeProject.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
updateTEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType()); updateTEmployeeProject.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
// 记录变更日志
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), tEmployeeProjectOld, updateTEmployeeProject);
updateTEmployeeProject.setOdlDeptId(tEmployeeProjectOld.getDeptId()); updateTEmployeeProject.setOdlDeptId(tEmployeeProjectOld.getDeptId());
tEmployeeProjectService.updateById(updateTEmployeeProject); tEmployeeProjectService.updateById(updateTEmployeeProject);
tEmpChangeInfo.setProId(updateTEmployeeProject.getId()); tEmpChangeInfo.setProId(updateTEmployeeProject.getId());
// 记录变更日志
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeeProject.getId(), tEmployeeProjectOld, updateTEmployeeProject);
UpdateSocialFoundVo updateSocialFoundVo = new UpdateSocialFoundVo(); UpdateSocialFoundVo updateSocialFoundVo = new UpdateSocialFoundVo();
updateSocialFoundVo.setOldDeptId(updateTEmployeeProject.getOdlDeptId()); updateSocialFoundVo.setOldDeptId(updateTEmployeeProject.getOdlDeptId());
...@@ -232,10 +232,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -232,10 +232,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro.setUnitName(tSettleDomain.getCustomerName()); updateTEmployeePro.setUnitName(tSettleDomain.getCustomerName());
updateTEmployeePro.setChangeStartMonth(excel.getChangeStartMonth()); updateTEmployeePro.setChangeStartMonth(excel.getChangeStartMonth());
updateTEmployeePro.setUnsettleDeal(CommonConstants.IS_NO_CHANGE); updateTEmployeePro.setUnsettleDeal(CommonConstants.IS_NO_CHANGE);
// 记录变更日志
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", updateTEmployeePro.getId(), tEmployeeProjectOld, updateTEmployeePro);
updateTEmployeePro.setOdlDeptId(tEmployeeProjectOld.getDeptId()); updateTEmployeePro.setOdlDeptId(tEmployeeProjectOld.getDeptId());
updateList.add(updateTEmployeePro); updateList.add(updateTEmployeePro);
// 记录变更日志
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProjectOld.getId(), tEmployeeProjectOld, updateTEmployeePro);
} }
} else { } else {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_SEARCH_EXIT, excel.getOldSettleCode())); errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_PERSON_SEARCH_EXIT, excel.getOldSettleCode()));
...@@ -286,7 +286,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -286,7 +286,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
*/ */
@Override @Override
public R<List<TSettleDomain>> getAllDept(String customerName) { public R<List<TSettleDomain>> getAllDept(String customerName) {
List<TSettleDomain> list = null; List<TSettleDomain> list;
if (Common.isNotNull(customerName)){ if (Common.isNotNull(customerName)){
list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL) list = tSettleDomainMapper.selectList(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL).eq(TSettleDomain::getCustomerName,customerName)); .eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL).eq(TSettleDomain::getCustomerName,customerName));
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @ c1de8685
...@@ -56,6 +56,12 @@ public class DeptChangeCheckParam implements Serializable { ...@@ -56,6 +56,12 @@ public class DeptChangeCheckParam implements Serializable {
@Schema(description = "新项目编码") @Schema(description = "新项目编码")
private String newDeptNo; private String newDeptNo;
/**
* 新项目id
*/
@Schema(description = "新项目id")
private String newDeptId;
/** /**
* 保险公司名称 * 保险公司名称
*/ */
...@@ -134,6 +140,12 @@ public class DeptChangeCheckParam implements Serializable { ...@@ -134,6 +140,12 @@ public class DeptChangeCheckParam implements Serializable {
@Schema(description = "客户编码") @Schema(description = "客户编码")
private String newCustomerCode; private String newCustomerCode;
/**
* 客户id
*/
@Schema(description = "客户id")
private String newCustomerId;
/** /**
* 客户名称 * 客户名称
*/ */
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @ c1de8685
...@@ -4791,6 +4791,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4791,6 +4791,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.set(TInsuranceDetail :: getDeptName,success.getNewDeptName()) .set(TInsuranceDetail :: getDeptName,success.getNewDeptName())
.set(TInsuranceDetail :: getUnitNo,success.getNewCustomerCode()) .set(TInsuranceDetail :: getUnitNo,success.getNewCustomerCode())
.set(TInsuranceDetail :: getUnitName,success.getNewCustomerName()) .set(TInsuranceDetail :: getUnitName,success.getNewCustomerName())
.set(TInsuranceDetail :: getDeptId,success.getNewDeptId())
.set(TInsuranceDetail :: getUnitId,success.getNewCustomerId())
.set(TInsuranceDetail :: getSettleType,newSettleType) .set(TInsuranceDetail :: getSettleType,newSettleType)
.set(TInsuranceDetail :: getActualPremium,actualPremium) .set(TInsuranceDetail :: getActualPremium,actualPremium)
.set(TInsuranceDetail :: getEstimatePremium,estimatePremium) .set(TInsuranceDetail :: getEstimatePremium,estimatePremium)
...@@ -6496,6 +6498,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6496,6 +6498,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param.setNewDeptName(jsonObject.getDepartName()); param.setNewDeptName(jsonObject.getDepartName());
param.setNewCustomerName(jsonObject.getCustomerName()); param.setNewCustomerName(jsonObject.getCustomerName());
param.setNewCustomerCode(jsonObject.getCustomerCode()); param.setNewCustomerCode(jsonObject.getCustomerCode());
param.setNewDeptId(jsonObject.getId());
param.setNewCustomerId(jsonObject.getCustomerId());
String settleType = jsonObject.getInsuranceSettleType(); String settleType = jsonObject.getInsuranceSettleType();
if (StringUtils.isEmpty(settleType)){ if (StringUtils.isEmpty(settleType)){
param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE); param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);
...@@ -6546,18 +6550,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -6546,18 +6550,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
errorList.add(param); errorList.add(param);
continue; continue;
} }
//旧项目ID不在当前权限范围内 // //旧项目ID不在当前权限范围内
if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){ // if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){
param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST); // param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
errorList.add(param); // errorList.add(param);
continue; // continue;
} // }
//新项目ID不在当前权限范围内 // //新项目ID不在当前权限范围内
if(deptNoList.stream().noneMatch(u ->u.equals(newDeptNo))){ // if(deptNoList.stream().noneMatch(u ->u.equals(newDeptNo))){
param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST); // param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
errorList.add(param); // errorList.add(param);
continue; // continue;
} // }
//替换类型的保单不能变更所属项目 //替换类型的保单不能变更所属项目
Integer buyType = insuranceDetail.getBuyType(); Integer buyType = insuranceDetail.getBuyType();
if (CommonConstants.FOUR_INT == buyType){ if (CommonConstants.FOUR_INT == buyType){
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @ c1de8685
...@@ -611,6 +611,9 @@ ...@@ -611,6 +611,9 @@
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and and
a.BUY_HANDLE_STATUS = 3 a.BUY_HANDLE_STATUS = 3
<if test="param.isEffect != null">
and a.IS_EFFECT = #{param.isEffect}
</if>
<if test="param.unitName != null and param.unitName.trim() != ''"> <if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%') and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if> </if>
...@@ -688,6 +691,9 @@ ...@@ -688,6 +691,9 @@
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and and
a.BUY_HANDLE_STATUS = 3 a.BUY_HANDLE_STATUS = 3
<if test="param.isEffect != null">
and a.IS_EFFECT = #{param.isEffect}
</if>
<if test="param.createName != null and param.createName.trim() != ''"> <if test="param.createName != null and param.createName.trim() != ''">
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%') and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if> </if>
......
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @ c1de8685
...@@ -584,7 +584,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -584,7 +584,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
public R invalidOrder(String id) { public R invalidOrder(String id) {
TOrder one = baseMapper.selectById(id); TOrder one = baseMapper.selectById(id);
if (Common.isNotNull(one) && CommonConstants.ZERO_INT == one.getOrderStatus()) { if (Common.isNotNull(one) && CommonConstants.ZERO_INT != one.getOrderStatus()) {
return R.failed(OrderConstants.ORDER_INVALID_FAILED); return R.failed(OrderConstants.ORDER_INVALID_FAILED);
} }
one.setDeleteFlag(CommonConstants.ONE_INT); one.setDeleteFlag(CommonConstants.ONE_INT);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @ c1de8685
...@@ -231,14 +231,14 @@ public class TSalaryAccountController { ...@@ -231,14 +231,14 @@ public class TSalaryAccountController {
@Operation(description = "获取工资条") @Operation(description = "获取工资条")
@GetMapping("/getEmpAccount") @GetMapping("/getEmpAccount")
public R<TSalaryDetailVo> getEmpAccount(String empIdcard, String settleDepartId, String settlementMonth public R<TSalaryDetailVo> getEmpAccount(String empIdcard, String settleDepartId, String settlementMonth
, String settleDepartNo, String settleDepartName, String empName) { , String deptNo, String deptName, String empName) {
TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo(); TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo();
if (Common.isEmpty(empIdcard) && Common.isEmpty(settleDepartId) && Common.isEmpty(settlementMonth) if (Common.isEmpty(empIdcard) && Common.isEmpty(settleDepartId) && Common.isEmpty(settlementMonth)
&& Common.isEmpty(settleDepartNo) && Common.isEmpty(settleDepartName) && Common.isEmpty(empName)) { && Common.isEmpty(deptNo) && Common.isEmpty(deptName) && Common.isEmpty(empName)) {
return R.failed("请输入查询条件"); return R.failed("请输入查询条件");
} }
if (Common.isNotNull(settlementMonth) && Common.isEmpty(empIdcard) && Common.isEmpty(settleDepartId) if (Common.isNotNull(settlementMonth) && Common.isEmpty(empIdcard) && Common.isEmpty(settleDepartId)
&& Common.isEmpty(settleDepartNo) && Common.isEmpty(settleDepartName) && Common.isEmpty(empName)) { && Common.isEmpty(deptNo) && Common.isEmpty(deptName) && Common.isEmpty(empName)) {
return R.failed("结算月需配合其他查询条件一起使用，请输入其他查询条件！"); return R.failed("结算月需配合其他查询条件一起使用，请输入其他查询条件！");
} }
//报账表 //报账表
...@@ -258,11 +258,11 @@ public class TSalaryAccountController { ...@@ -258,11 +258,11 @@ public class TSalaryAccountController {
if (Common.isNotNull(empName)) { if (Common.isNotNull(empName)) {
queryWrapperSa.eq("EMP_NAME", empName); queryWrapperSa.eq("EMP_NAME", empName);
} }
if (Common.isNotNull(settleDepartNo)) { if (Common.isNotNull(deptNo)) {
queryWrapperSa.eq("DEPT_NO", settleDepartNo); queryWrapperSa.eq("DEPT_NO", deptNo);
} }
if (Common.isNotNull(settleDepartName)) { if (Common.isNotNull(deptName)) {
queryWrapperSa.like("DEPT_NAME", settleDepartName); queryWrapperSa.like("DEPT_NAME", deptName);
} }
if (Common.isNotNull(settlementMonth) && settlementMonth.length() < 6) { if (Common.isNotNull(settlementMonth) && settlementMonth.length() < 6) {
queryWrapperSa.like("SETTLEMENT_MONTH", settlementMonth); queryWrapperSa.like("SETTLEMENT_MONTH", settlementMonth);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @ c1de8685
...@@ -13,7 +13,6 @@ public class SocialConstants { ...@@ -13,7 +13,6 @@ public class SocialConstants {
public static final String DIFF_TYPE_THR = "实缴"; public static final String DIFF_TYPE_THR = "实缴";
public static final String DIFF_TYPE_TWO = "差额"; public static final String DIFF_TYPE_TWO = "差额";
public static final String ERROR_TEMPLATE = "模板中已存在对应员工"; public static final String ERROR_TEMPLATE = "模板中已存在对应员工";
public static final String EXIT_TEMPLATE = "已存在对应员工身份证";
public static final String YL = "养老"; public static final String YL = "养老";
public static final String DB = "大病"; public static final String DB = "大病";
...@@ -24,4 +23,9 @@ public class SocialConstants { ...@@ -24,4 +23,9 @@ public class SocialConstants {
public static final String BJ = "补缴"; public static final String BJ = "补缴";
public static final String YEAR_1970 = "1970-02"; public static final String YEAR_1970 = "1970-02";
public static final String NOT_EXIT_SETTLEiNFO = "未找到该人员对应的项目信息，请核实";
public static final String ERROR_PRI = "该人员归属的";
public static final String ERROR_END = "信息缺失，将导致后续无法结算，请联系卢名旭处理";
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @ c1de8685
...@@ -63,6 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> { ...@@ -63,6 +63,8 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
List<TSocialFundInfoExportVo> exportList(@Param("tSocialFundInfo") TSocialFundInfoSearchVo tSocialFundInfo); List<TSocialFundInfoExportVo> exportList(@Param("tSocialFundInfo") TSocialFundInfoSearchVo tSocialFundInfo);
Integer exportListCount(@Param("tSocialFundInfo") TSocialFundInfoSearchVo tSocialFundInfo);
void updateSocialAndFoundInfo(@Param("infoVo") UpdateSocialFoundVo infoVo); void updateSocialAndFoundInfo(@Param("infoVo") UpdateSocialFoundVo infoVo);
void updateSocialAndFoundInfoF(@Param("infoVo") UpdateSocialFoundVo infoVo); void updateSocialAndFoundInfoF(@Param("infoVo") UpdateSocialFoundVo infoVo);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ c1de8685
...@@ -3771,7 +3771,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3771,7 +3771,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 2.派减办理成功 处理预估 (不管社保还是公积金办理失败) // 2.派减办理成功 处理预估 (不管社保还是公积金办理失败)
if (CommonConstants.ONE_STRING.equals(dis.getType()) if (CommonConstants.ONE_STRING.equals(dis.getType())
&& CommonConstants.ZERO_INT == flag && CommonConstants.ZERO_INT == flag
&& CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())){ && (CommonConstants.EIGHT_STRING.equals(sf.getSocialStatus())
|| CommonConstants.SEVEN_STRING.equals(sf.getFundStatus()))){
// 同步预估库数据 // 同步预估库数据
socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT); socialTask.asynchronousDisPatchHandle(sf, forecastFlag,null,null,CommonConstants.ZERO_INT);
} }
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @ c1de8685
...@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
...@@ -103,7 +102,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe ...@@ -103,7 +102,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
String fileName = "社保公积金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = "社保公积金批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表 //获取要导出的列表
List<TSocialFundInfoExportVo> list = new ArrayList<>(); List<TSocialFundInfoExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo); long count = baseMapper.exportListCount(searchVo);
ServletOutputStream out = null; ServletOutputStream out = null;
try { try {
out = response.getOutputStream(); out = response.getOutputStream();
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ c1de8685
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
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_NAME, s.HANDLE_USER_NAME as HANDLE_USER,
s.HANDLE_TIME, s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL, s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL, s.UNIT_MEDICAL_CARDINAL,
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ c1de8685
...@@ -941,6 +941,17 @@ ...@@ -941,6 +941,17 @@
</where> </where>
</select> </select>
<!--导出-->
<select id="exportListCount" resultType="java.lang.Integer">
select
count(1)
from t_social_fund_info a
<where>
1=1
<include refid="tSocialFundInfo_where"/>
</where>
</select>
<!--导出--> <!--导出-->
<select id="exportList" resultMap="exportMap"> <select id="exportList" resultMap="exportMap">
select select
...@@ -978,6 +989,7 @@ ...@@ -978,6 +989,7 @@
d.CONTRACT_TERM, d.CONTRACT_TERM,
d.EDUCATION_NAME, d.EDUCATION_NAME,
a.RECORD_BASE, a.RECORD_BASE,
<!--"社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过）、派减（6待审核 7待办理 8办理成功 9 办理失败 11 派减办理中 12 派减部分办理失败）" ) -->
case when a.SOCIAL_STATUS = 0 then "派增待审核" case when a.SOCIAL_STATUS = 0 then "派增待审核"
when a.SOCIAL_STATUS = 1 then "派增待办理" when a.SOCIAL_STATUS = 1 then "派增待办理"
when a.SOCIAL_STATUS = 2 then "派增办理中" when a.SOCIAL_STATUS = 2 then "派增办理中"
...@@ -989,6 +1001,8 @@ ...@@ -989,6 +1001,8 @@
when a.SOCIAL_STATUS = 8 then "派减办理成功" when a.SOCIAL_STATUS = 8 then "派减办理成功"
when a.SOCIAL_STATUS = 9 then "派减办理失败" when a.SOCIAL_STATUS = 9 then "派减办理失败"
when a.SOCIAL_STATUS = 10 then "派增审核不通过" when a.SOCIAL_STATUS = 10 then "派增审核不通过"
WHEN a.SOCIAL_STATUS = 11 THEN "派减办理中"
WHEN a.SOCIAL_STATUS = 12 THEN "派减部分办理失败"
else null end as "SOCIAL_STATUS" , else null end as "SOCIAL_STATUS" ,
case when a.FUND_STATUS = 0 then "派增待审核" case when a.FUND_STATUS = 0 then "派增待审核"
when a.FUND_STATUS = 1 then "派增待办理" when a.FUND_STATUS = 1 then "派增待办理"
...@@ -1111,9 +1125,9 @@ ...@@ -1111,9 +1125,9 @@
LEFT JOIN sys_area s1 on a.SOCIAL_PROVINCE=s1.id LEFT JOIN sys_area s1 on a.SOCIAL_PROVINCE=s1.id
LEFT JOIN sys_area s2 on a.SOCIAL_CITY=s2.id LEFT JOIN sys_area s2 on a.SOCIAL_CITY=s2.id
LEFT JOIN sys_area s3 on a.SOCIAL_TOWN=s3.id LEFT JOIN sys_area s3 on a.SOCIAL_TOWN=s3.id
LEFT JOIN sys_area f1 on d.FUND_PROVINCE=f1.id LEFT JOIN sys_area f1 on a.FUND_PROVINCE=f1.id
LEFT JOIN sys_area f2 on d.FUND_CITY=f2.id LEFT JOIN sys_area f2 on a.FUND_CITY=f2.id
LEFT JOIN sys_area f3 on d.FUND_TOWN=f3.id LEFT JOIN sys_area f3 on a.FUND_TOWN=f3.id
LEFT JOIN sys_area d1 on d.FILE_PROVINCE=d1.id LEFT JOIN sys_area d1 on d.FILE_PROVINCE=d1.id
LEFT JOIN sys_area d2 on d.FILE_CITY=d2.id LEFT JOIN sys_area d2 on d.FILE_CITY=d2.id
LEFT JOIN sys_area d3 on d.FILE_TOWN=d3.id LEFT JOIN sys_area d3 on d.FILE_TOWN=d3.id
......
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