Commit 8929255f authored by huyuchen's avatar huyuchen

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

parents 0790a308 69db0e32
......@@ -2094,46 +2094,48 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
**/
@Override
public void doSaveBelongDept(TEmployeeProject p, String feedbackType) {
TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo();
searchCspVo.setDeptId(p.getDeptId());
searchCspVo.setEmpIdCard(p.getEmpIdcard());
searchCspVo.setFeedbackType(feedbackType);
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getNickname())) {
searchCspVo.setUserId(user.getId());
searchCspVo.setUserName(user.getNickname());
} else if (Common.isNotNull(p.getOperationUserId())) {
searchCspVo.setUserId(p.getOperationUserId());
searchCspVo.setUserName(p.getOperationUserName());
} else {
searchCspVo.setUserId(p.getCreateBy());
searchCspVo.setUserName(p.getCreateName());
}
if (CommonConstants.ONE_STRING.equals(feedbackType)) {
searchCspVo.setEmpCreateAndLeaveTime(p.getCreateTime());
searchCspVo.setEmpCreateAndLeaveUser(p.getCreateName());
} else {
searchCspVo.setEmpCreateAndLeaveTime(p.getLeaveTime());
searchCspVo.setEmpCreateAndLeaveUser(p.getLeaveUser());
}
// 查询CSP:已接收的身份证与项目对应的所属部门,加日志,改状态为已处理:
R<TEmployeeProjectBelongDept> cspEmpDeptR = HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(), daprCspProperties.getAppId()
, "/employeeregistration/inner/getZeroRegistrationAndUpdateTwo", searchCspVo, TEmployeeProjectBelongDept.class, SecurityConstants.FROM_IN);
if (cspEmpDeptR != null && cspEmpDeptR.getData() != null) {
TEmployeeProjectBelongDept cspEmpDept = cspEmpDeptR.getData();
// 1项目档案改为在项,生成所属部门(同步CSP的入离职信息的【所属部门】到项目档案的子表里)
if (Common.isNotNull(cspEmpDept.getEmpDeptid()) && Common.isNotNull(cspEmpDept.getEmpDeptname())) {
TEmployeeProjectBelongDept belongDept = tEmployeeProjectBelongDeptService.getById(p.getId());
if (belongDept == null) {
belongDept = new TEmployeeProjectBelongDept();
belongDept.setId(p.getId());
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
tEmployeeProjectBelongDeptService.save(belongDept);
} else {
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
tEmployeeProjectBelongDeptService.updateById(belongDept);
if (p != null) {
TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo();
searchCspVo.setDeptId(p.getDeptId());
searchCspVo.setEmpIdCard(p.getEmpIdcard());
searchCspVo.setFeedbackType(feedbackType);
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getNickname())) {
searchCspVo.setUserId(user.getId());
searchCspVo.setUserName(user.getNickname());
} else if (Common.isNotNull(p.getOperationUserId())) {
searchCspVo.setUserId(p.getOperationUserId());
searchCspVo.setUserName(p.getOperationUserName());
} else {
searchCspVo.setUserId(p.getCreateBy());
searchCspVo.setUserName(p.getCreateName());
}
if (CommonConstants.ONE_STRING.equals(feedbackType)) {
searchCspVo.setEmpCreateAndLeaveTime(p.getCreateTime());
searchCspVo.setEmpCreateAndLeaveUser(p.getCreateName());
} else {
searchCspVo.setEmpCreateAndLeaveTime(p.getLeaveTime());
searchCspVo.setEmpCreateAndLeaveUser(p.getLeaveUser());
}
// 查询CSP:已接收的身份证与项目对应的所属部门,加日志,改状态为已处理:
R<TEmployeeProjectBelongDept> cspEmpDeptR = HttpDaprUtil.invokeMethodPost(daprCspProperties.getAppUrl(), daprCspProperties.getAppId()
, "/employeeregistration/inner/getZeroRegistrationAndUpdateTwo", searchCspVo, TEmployeeProjectBelongDept.class, SecurityConstants.FROM_IN);
if (cspEmpDeptR != null && cspEmpDeptR.getData() != null) {
TEmployeeProjectBelongDept cspEmpDept = cspEmpDeptR.getData();
// 1项目档案改为在项,生成所属部门(同步CSP的入离职信息的【所属部门】到项目档案的子表里)
if (Common.isNotNull(cspEmpDept.getEmpDeptid()) && Common.isNotNull(cspEmpDept.getEmpDeptname())) {
TEmployeeProjectBelongDept belongDept = tEmployeeProjectBelongDeptService.getById(p.getId());
if (belongDept == null) {
belongDept = new TEmployeeProjectBelongDept();
belongDept.setId(p.getId());
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
tEmployeeProjectBelongDeptService.save(belongDept);
} else {
belongDept.setEmpDeptid(cspEmpDept.getEmpDeptid());
belongDept.setEmpDeptname(cspEmpDept.getEmpDeptname());
tEmployeeProjectBelongDeptService.updateById(belongDept);
}
}
}
}
......
......@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmployeeProjectService.updateById(project);
} else {
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
}
} else {
// 新建档案、项目档案,将档案id赋值,给其他附属信息
......@@ -1835,16 +1835,17 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId = emp.getId();
empIdCard = emp.getEmpIdcard();
// 2项目档案
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
}
}
if (emp == null) {
return R.failed("新建员工失败!");
}
// 增加,同步CSP
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
if (project != null) {
// 增加,同步CSP
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
}
// 更新或新增薪资人员
// 2024-11-6 16:56:46 新逻辑:在项人员,要更新薪资人员,及时卡号为空也要更新
if (Common.isNotNull(tPreEmployeeInfo.getBankNo()) || isMustUpdateSalary) {
......
......@@ -134,4 +134,10 @@ public class SalaryAccountExportVo{
*/
@ExcelProperty("结算月")
private String settlementMonth;
/**
* 个税金额(个人承担)
*/
@ExcelProperty("个税金额")
private BigDecimal salaryTax;
}
......@@ -234,7 +234,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
response.setCharacterEncoding("utf-8");
response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName, "UTF-8"));
//非管理员导出 大于100W 提示“导出量过大,请选择更多查询条件!如果确定要导出这些数据请联系系统管理员操作”
if (count > 600000) {
if (count > 1000000) {
out.write(CommonConstants.SOCIAL_EXPORT_LIMIT.getBytes("GBK"));
out.close();
return;
......
......@@ -1584,7 +1584,7 @@
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY
a.ACTUAL_SALARY,a.SALARY_TAX
FROM
<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
t_salary_account a
......@@ -1652,7 +1652,7 @@
case a.FORM_TYPE when '0' then '薪资' when '1' then '绩效' when '3' then '劳务费' when '4' then '稿酬' else '其他' end as FORM_TYPE,
a.SALARY_MONTH,
if(a.RELAY_SALARY_UNIT is not null and a.RELAY_SALARY_UNIT != 0,a.RELAY_SALARY_UNIT,ifnull(a.RELAY_SALARY,0)) RELAY_SALARY,
a.ACTUAL_SALARY
a.ACTUAL_SALARY,a.SALARY_TAX
FROM
<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
t_salary_account a
......
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