Commit 25edab62 authored by 周昊's avatar 周昊

1、现有风险列表添加风险等级、风险因素字段

parent a225d919
...@@ -35,4 +35,10 @@ public class RiskPlanAppExistingListDto { ...@@ -35,4 +35,10 @@ public class RiskPlanAppExistingListDto {
/** 评估人头像 */ /** 评估人头像 */
private String avatar; private String avatar;
/** 风险等级 */
private String level;
/** 风险因素 */
private String factor;
} }
...@@ -239,6 +239,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService { ...@@ -239,6 +239,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle()); riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
riskPlanTask1.setStatus("running"); riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date()); riskPlanTask1.setStartTime(new Date());
riskPlanTask1.setApprovalUserId(appApproveDto.getUserId());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1); riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//修改计划状态 //修改计划状态
...@@ -290,6 +291,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService { ...@@ -290,6 +291,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
riskPlanTask1.setStatus("completed"); riskPlanTask1.setStatus("completed");
riskPlanTask1.setStartTime(new Date()); riskPlanTask1.setStartTime(new Date());
riskPlanTask1.setCompletedTime(new Date()); riskPlanTask1.setCompletedTime(new Date());
riskPlanTask1.setApprovalUserId(appApproveDto.getUserId());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1); riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//插入任务表 已完成 //插入任务表 已完成
...@@ -300,6 +302,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService { ...@@ -300,6 +302,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
riskPlanTask2.setStatus("completed"); riskPlanTask2.setStatus("completed");
riskPlanTask2.setStartTime(new Date()); riskPlanTask2.setStartTime(new Date());
riskPlanTask2.setCompletedTime(new Date()); riskPlanTask2.setCompletedTime(new Date());
riskPlanTask2.setApprovalUserId(appApproveDto.getUserId());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask2); riskPlanTaskService.insertRiskPlanTask(riskPlanTask2);
} }
...@@ -326,6 +329,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService { ...@@ -326,6 +329,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getTitle()); riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getTitle());
riskPlanTask1.setStatus("completed"); riskPlanTask1.setStatus("completed");
riskPlanTask1.setStartTime(new Date()); riskPlanTask1.setStartTime(new Date());
riskPlanTask1.setApprovalUserId(userId);
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1); riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//修改计划状态 //修改计划状态
......
...@@ -144,7 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -144,7 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
reil.`describe`, reil.`describe`,
su.user_id AS userId, su.user_id AS userId,
su.nick_name AS userName, su.nick_name AS userName,
su.avatar su.avatar,
reil.level,
reil.factor
FROM FROM
risk_plan_existing_list reil risk_plan_existing_list reil
LEFT JOIN sys_user su ON su.user_id = reil.user_id LEFT JOIN sys_user su ON su.user_id = reil.user_id
......
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