Commit a25680dd authored by hongguangwu's avatar hongguangwu

MVP1.7.17-2000改为5条

parent afce3123
......@@ -617,8 +617,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo.setContractEnd(null);
baseMapper.updateContractEnd(tEmployeeContractInfo);
}
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
return R.ok(null, CommonConstants.SAVE_AND_UPDATE);
} else {
return R.ok(null, CommonConstants.SAVE_SUCCESS);
}
}
/**
* @Author fxj
......
......@@ -4772,7 +4772,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else {
// 如果没有可用的,查找终止的,放在离职待办的详情里
contractId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFour(contractId);
returnVo.setResultIdFourStatus(contractId);
}
}
return returnVo;
......
......@@ -329,6 +329,8 @@ public interface CommonConstants {
String RESULT_DATA_SUCESS= "操作成功";
String SAVE_SUCCESS = "保存成功!";
// 保存并审核通过-合同专用,离职待办同步使用
String SAVE_AND_UPDATE = "保存成功!!";
String UPDATE_SUCCESS = "更新成功!";
......
......@@ -139,6 +139,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
searchVo.setAuthSql(null);
//获取项目信息
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
......@@ -146,6 +150,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
}
}
}
}
private boolean haveRole(YifuUser user) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
......@@ -715,7 +720,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
returnVo = returnR.getData();
if (Common.isNotNull(returnVo.getResultIdThree())) {
contractId = returnVo.getResultIdThree();
contractIdEnd = returnVo.getResultIdFour();
contractIdEnd = returnVo.getResultIdFourStatus();
}
}
if (!CommonConstants.ONE_STRING.equals(leave.getDoStatusContract())
......@@ -1406,9 +1411,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
Map<String, String> errorMap = new HashMap<>();
// 存放成功的新ID
Map<String, String> successMap = new HashMap<>();
Map<String, String> successAndAuditMap = new HashMap<>();
for (ErrorMessage message : contractParamList) {
if (CommonConstants.SAVE_SUCCESS.equals(message.getMessage())) {
successMap.put(message.getKey(), message.getName());
} else if (CommonConstants.SAVE_AND_UPDATE.equals(message.getMessage())) {
successAndAuditMap.put(message.getKey(), message.getName());
} else {
errorMap.put(message.getKey(), message.getMessage());
}
......@@ -1419,6 +1427,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if (successMap.get(leave.getId()) != null) {
leave.setContractId(successMap.get(leave.getId()));
leave.setDoStatusContract(CommonConstants.FOUR_STRING);
} else if (successAndAuditMap.get(leave.getId()) != null) {
leave.setContractId(successAndAuditMap.get(leave.getId()));
leave.setDoStatusContract(CommonConstants.EIGHT_STRING);
} else if (errorMap.get(leave.getId()) != null) {
// 失败
errorMessage = errorMap.get(leave.getId());
......
......@@ -1854,11 +1854,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && domainR.getData().getDeptNos().size() > 0) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
searchVo.setId(CommonConstants.ONE_STRING_NEGATE);
}
}
}
}
public boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
......
......@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if>
</where>
ORDER BY b.create_time desc,b.id asc
limit 5
limit 2000
</select>
<!--离职确认列表-->
<select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap">
......
......@@ -157,6 +157,10 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
searchVo.setAuthSql(null);
//获取项目信息
R<TSettleDomainRegistListVo> domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
domainR = archivesDaprUtil.getAllDeptByCustomerLoginName(user.getUsername());
if (null != domainR && null != domainR.getData() && null != domainR.getData().getDeptNos() && !domainR.getData().getDeptNos().isEmpty()) {
searchVo.setDeptNoList(domainR.getData().getDeptNos());
} else {
......@@ -164,6 +168,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
}
}
}
}
public boolean haveRole(YifuUser user, long roleId) {
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
......
......@@ -2225,7 +2225,7 @@
a.id
from
t_insurance_detail a
where a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS != 4
where a.DELETE_FLAG = 0 and (a.REDUCE_HANDLE_STATUS is null or a.REDUCE_HANDLE_STATUS != 4)
and a.EMP_IDCARD_NO = #{empIdCard}
and a.DEPT_NO = #{deptNo}
......
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