1、修改任务新建接口

2、修改获取组织机构下的人员接口

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -107,14 +107,14 @@ public class RiskPlanAppController extends BaseController {
     }
 
     /**
-     * 获取项目下的人员
+     * 获取组织机构下的人员
      *
-     * @param projectId 项目id
+     * @param deptId 组织机构id
      * @real_return {@link R<List<SysUser>>}
      */
-    @GetMapping("/user/list/{projectId}")
-    public R<List<SysUser>> getUserListByProjectId(@PathVariable("projectId") Long projectId) {
-        return R.ok(ledgerProjectService.getUserListByProjectId(projectId));
+    @GetMapping("/user/list/{deptId}")
+    public R<List<SysUser>> getUserListByProjectId(@PathVariable("deptId") Long deptId) {
+        return R.ok(ledgerProjectService.getUserListByDeptId(deptId));
     }
 
     /**
@@ -125,6 +125,7 @@ public class RiskPlanAppController extends BaseController {
      */
     @PostMapping()
     public R<Integer> saveRiskPlan(@RequestBody RiskPlan riskPlan) {
+        riskPlan.setApproveUserId(getUserId());
         riskPlan.setCreateUserId(getUserId());
         riskPlan.setCreateDeptId(getDeptId());
         return R.ok(riskPlanService.saveRiskPlan(riskPlan));

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java

@@ -44,6 +44,10 @@ public class RiskPlan extends BaseEntity
     @Excel(name = "创建单位")
     private Long createDeptId;
 
+    /** 评估小组id */
+    @Excel(name = "评估小组id")
+    private Long deptId;
+
     /** 负责人id */
     @Excel(name = "负责人id")
     private Long leaderUserId;
@@ -199,6 +203,14 @@ public class RiskPlan extends BaseEntity
         this.approveUserId = approveUserId;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java

@@ -70,10 +70,10 @@ public interface ILedgerProjectService
     public List<LedgerProject>  getProjectListByDeptId(LedgerProject ledgerProject);
 
     /**
-     * 获取项目所在部门下的所有人员
+     * 获取部门下的所有人员
      *
-     * @param projectId 项目id
+     * @param deptId 项目id
      * @return 人员list
      */
-    public List<SysUser>  getUserListByProjectId(Long projectId);
+    public List<SysUser>  getUserListByDeptId(Long deptId);
 }

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

@@ -109,8 +109,7 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService
     }
 
     @Override
-    public List<SysUser> getUserListByProjectId(Long projectId) {
-        LedgerProject ledgerProject = selectLedgerProjectById(projectId);
-        return userService.getListByDeptIdUnder(ledgerProject.getDeptId());
+    public List<SysUser> getUserListByDeptId(Long deptId) {
+        return userService.getListByDeptIdUnder(deptId);
     }
 }

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="buildingIds"    column="building_ids"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createDeptId"    column="create_dept_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="leaderUserId"    column="leader_user_id"    />
         <result property="workUserIds"    column="work_user_ids"    />
         <result property="approveUserId"    column="approve_user_id"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRiskPlanVo">
-        select id, name, no, project_id, building_ids, create_user_id, create_dept_id, leader_user_id, work_user_ids,approve_user_id, start_time, end_time, status, del_flag, create_by, create_time, update_by, update_time from risk_plan
+        select id, name, no, project_id, building_ids, create_user_id, create_dept_id,dept_id, leader_user_id, work_user_ids,approve_user_id, start_time, end_time, status, del_flag, create_by, create_time, update_by, update_time from risk_plan
     </sql>
 
     <select id="selectRiskPlanList" parameterType="com.censoft.censoftrongtong.domain.RiskPlan" resultMap="RiskPlanResult">
@@ -213,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="buildingIds != null">building_ids,</if>
             <if test="createUserId != null">create_user_id,</if>
             <if test="createDeptId != null">create_dept_id,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="leaderUserId != null">leader_user_id,</if>
             <if test="workUserIds != null">work_user_ids,</if>
             <if test="approveUserId != null">approve_user_id,</if>
@@ -232,6 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="buildingIds != null">#{buildingIds},</if>
             <if test="createUserId != null">#{createUserId},</if>
             <if test="createDeptId != null">#{createDeptId},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="leaderUserId != null">#{leaderUserId},</if>
             <if test="workUserIds != null">#{workUserIds},</if>
             <if test="approveUserId != null">#{approveUserId},</if>
@@ -255,6 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="buildingIds != null">building_ids = #{buildingIds},</if>
             <if test="createUserId != null">create_user_id = #{createUserId},</if>
             <if test="createDeptId != null">create_dept_id = #{createDeptId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="leaderUserId != null">leader_user_id = #{leaderUserId},</if>
             <if test="workUserIds != null">work_user_ids = #{workUserIds},</if>
             <if test="approveUserId != null">approve_user_id = #{approveUserId},</if>