Commit 6ccb8629 authored by qiyaxin's avatar qiyaxin

项目费用报销-审批-通过

parent 69d633f4
...@@ -2,6 +2,7 @@ package com.ruoyi.controller; ...@@ -2,6 +2,7 @@ package com.ruoyi.controller;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ProjectCostReimbursementApproval;
import com.ruoyi.domain.ProjectCostRequestApproval; import com.ruoyi.domain.ProjectCostRequestApproval;
import com.ruoyi.domain.ProjectCostRequestApprovalReject; import com.ruoyi.domain.ProjectCostRequestApprovalReject;
import com.ruoyi.service.IExpenseApprovalService; import com.ruoyi.service.IExpenseApprovalService;
...@@ -36,4 +37,10 @@ public class ExpenseApprovalController extends BaseController { ...@@ -36,4 +37,10 @@ public class ExpenseApprovalController extends BaseController {
public AjaxResult projectCostRequestApprovalReject(@RequestBody List<ProjectCostRequestApprovalReject> fyglProjectCostDTO) { public AjaxResult projectCostRequestApprovalReject(@RequestBody List<ProjectCostRequestApprovalReject> fyglProjectCostDTO) {
return AjaxResult.success(expenseApprovalService.updateStatusReject(fyglProjectCostDTO)); return AjaxResult.success(expenseApprovalService.updateStatusReject(fyglProjectCostDTO));
} }
//项目费用报销-审批通过
@PostMapping("/projectCostReimbursementApproval")
public AjaxResult projectCostReimbursementApproval(@RequestBody List<ProjectCostReimbursementApproval> FyglProjectCostReimbursementDTO) {
return AjaxResult.success(expenseApprovalService.updateReimbursementStatus(FyglProjectCostReimbursementDTO));
}
} }
package com.ruoyi.domain;
import lombok.Data;
//项目费用报销审批实体
@Data
public class ProjectCostReimbursementApproval {
//项目费用id
private Integer projectCostId;
//下一个节点nodeId
private Integer nextNodeId;
//是否终审
private Boolean isEndApproval;
//整体审核状态
private Integer approveStatus;
}
package com.ruoyi.mapper; package com.ruoyi.mapper;
import com.ruoyi.domain.ProjectCostReimbursementApproval;
import com.ruoyi.domain.ProjectCostRequestApproval; import com.ruoyi.domain.ProjectCostRequestApproval;
import com.ruoyi.domain.ProjectCostRequestApprovalReject; import com.ruoyi.domain.ProjectCostRequestApprovalReject;
import com.ruoyi.domain.RoleNameAndId; import com.ruoyi.domain.RoleNameAndId;
...@@ -19,4 +20,8 @@ public interface ExpenseApprovalMapper{ ...@@ -19,4 +20,8 @@ public interface ExpenseApprovalMapper{
//项目费用审批-审核驳回 //项目费用审批-审核驳回
int updateStatusReject(ProjectCostRequestApprovalReject projectCostRequestApprovalRejects); int updateStatusReject(ProjectCostRequestApprovalReject projectCostRequestApprovalRejects);
//修改项目费用报销的审核状态
int updateReimbursementStatus(ProjectCostReimbursementApproval ProjectCostReimbursementApproval);
} }
package com.ruoyi.service; package com.ruoyi.service;
import com.ruoyi.domain.ProjectCostReimbursementApproval;
import com.ruoyi.domain.ProjectCostRequestApproval; import com.ruoyi.domain.ProjectCostRequestApproval;
import com.ruoyi.domain.ProjectCostRequestApprovalReject; import com.ruoyi.domain.ProjectCostRequestApprovalReject;
import com.ruoyi.domain.RoleNameAndId; import com.ruoyi.domain.RoleNameAndId;
...@@ -17,4 +18,8 @@ public interface IExpenseApprovalService { ...@@ -17,4 +18,8 @@ public interface IExpenseApprovalService {
//项目费用审批-审核驳回 //项目费用审批-审核驳回
int updateStatusReject(List<ProjectCostRequestApprovalReject> projectCostRequestApprovalRejects); int updateStatusReject(List<ProjectCostRequestApprovalReject> projectCostRequestApprovalRejects);
//项目于费用报销-审核通过
int updateReimbursementStatus(List<ProjectCostReimbursementApproval> ProjectCostReimbursementApproval);
} }
package com.ruoyi.service.impl; package com.ruoyi.service.impl;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.domain.ProjectCostReimbursementApproval;
import com.ruoyi.domain.ProjectCostRequestApproval; import com.ruoyi.domain.ProjectCostRequestApproval;
import com.ruoyi.domain.ProjectCostRequestApprovalReject; import com.ruoyi.domain.ProjectCostRequestApprovalReject;
import com.ruoyi.domain.RoleNameAndId; import com.ruoyi.domain.RoleNameAndId;
...@@ -48,4 +49,18 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService { ...@@ -48,4 +49,18 @@ public class IExpenseApprovalServiceImpl implements IExpenseApprovalService {
} }
return 1; return 1;
} }
@Override
public int updateReimbursementStatus(List<ProjectCostReimbursementApproval> ProjectCostReimbursementApproval) {
for(ProjectCostReimbursementApproval p : ProjectCostReimbursementApproval){
//如果是最终审批,那么项目整体审批状态为已通过
if(p.getIsEndApproval()){
p.setApproveStatus(3);
}
expenseApprovalMapper.updateReimbursementStatus(p);
}
return 1;
}
} }
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</update> </update>
<select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId"> <select id="getRolesByUserId" resultType="com.ruoyi.domain.RoleNameAndId">
SELECT SELECT
ru.role_id as roleId, ru.role_id as roleId,
...@@ -33,4 +34,14 @@ ...@@ -33,4 +34,14 @@
ru.user_id = #{userId} ru.user_id = #{userId}
AND ru.role_id = r.role_id AND ru.role_id = r.role_id
</select> </select>
<update id="updateReimbursementStatus" parameterType="com.ruoyi.domain.ProjectCostReimbursementApproval">
update fygl_project_cost_reimbursement
<trim prefix="SET" suffixOverrides=",">
<if test="approveStatus != null">reimbursment_approve_status = #{approveStatus},</if>
<if test="nextNodeId != null">current_audit_node_id = #{nextNodeId}</if>
</trim>
where id = #{projectCostId}
</update>
</mapper> </mapper>
\ No newline at end of file
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