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