Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into dev-yf

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppListDto.java

@@ -27,6 +27,9 @@ public class RiskPlanAppListDto {
     /** 处理人员 */
     private String leaderUserName;
 
+    /** 创建人员 */
+    private String createUserName;
+
     /** 显示状态 */
     private String state;
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -121,6 +121,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         //插入任务表 已完成任务发起
         RiskPlanTask riskPlanTask = new RiskPlanTask();
         riskPlanTask.setPlanId(riskPlan.getId());
+        riskPlanTask.setApprovalUserId(riskPlan.getCreateUserId());
         riskPlanTask.setTaskKey(RiskPlanStatusType.CREATE_TASK.getStatus());
         riskPlanTask.setTaskName(RiskPlanStatusType.CREATE_TASK.getTitle());
         riskPlanTask.setStatus("completed");

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -59,10 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rp.`name`,
             rp.start_time AS startTime,
             rp.`status`,
-            su.nick_name AS leaderUserName
+            su.nick_name AS leaderUserName,
+            su2.nick_name AS createUserName
         FROM
             risk_plan rp
                 LEFT JOIN sys_user su ON su.user_id = rp.leader_user_id
+                LEFT JOIN sys_user su2 ON su2.user_id = rp.create_user_id
         <where>
             <if test="createUserId != null"> and rp.create_user_id = #{createUserId}</if>
             <if test="leaderUserId != null"> and rp.leader_user_id = #{leaderUserId}</if>