qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

昂立，工资单审批

This commit is contained in:
Harryxzy 2023-09-01 11:19:56 +08:00
parent 8446d96b86
commit 89734ae022
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryacct/param/SalaryAcctApprovalWorkflowParam.java
View File

@ -20,7 +20,7 @@ public class SalaryAcctApprovalWorkflowParam {
// 薪资核算记录id
@DataCheck(require = true, message = "核算记录id不能为空")
private Long salaryAcctRecordId;
private String salaryAcctRecordId;
// 审批流程requestid
@DataCheck(require = true, message = "requestid不能为空")

3
src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
View File

@ -389,6 +389,9 @@
<if test="backCalcStatus != null">
back_calc_status=#{backCalcStatus},
</if>
<if test="approvalRequestId != null">
approval_request_id=#{approvalRequestId},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>

8
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -33,6 +33,7 @@ import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.hrm.User;
@ -811,8 +812,11 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
@Override
public void setApprovalRequestId(SalaryAcctApprovalWorkflowParam param) {
ValidUtil.doValidator(param);
SalaryAcctRecordPO po = getSalaryAcctRecordMapper().getById(param.getSalaryAcctRecordId());
po.setApprovalRequestId(po.getApprovalRequestId());
SalaryAcctRecordPO po = getSalaryAcctRecordMapper().getById(Long.valueOf(param.getSalaryAcctRecordId()));
if (ObjectUtils.isEmpty(po)) {
return;
}
po.setApprovalRequestId(param.getRequestId());
getSalaryAcctRecordMapper().updateIgnoreNull(po);
}
}

1
src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
View File

@ -96,6 +96,7 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
List<SalarySendCheckDTO> salarySendCheckResult = getSalarySendService(user).getSalarySendCheckResult(salaryAcctRecordIds);
// TODO查询审批流程状态
Set<String> requestIds = SalaryEntityUtil.properties(list, SalaryAcctRecordPO::getApprovalRequestId);
requestIds.remove(null);
// 获取流程状态 key:流程请求id value:流程状态
Map<String, String> workflowStatusMap = getWorkflowStatusMap(requestIds);
// 转换成列表dto