新增部门树接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/common/ZsyzCommonController.java

@@ -99,7 +99,7 @@ public class ZsyzCommonController extends BaseController {
      */
     @PostMapping("/xszp")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xszp')")
-    public AjaxResult xszp(ZsyzSbbzb zsyzSbbzb) {
+    public AjaxResult xszp(@RequestBody ZsyzSbbzb zsyzSbbzb) {
         String zpType = zsyzSbbzb.getZpType();
         if (ONE.equals(zpType)){
             ArrayList<SysDept> deptList = zsyzSbbzb.getDeptList();
@@ -115,7 +115,7 @@ public class ZsyzCommonController extends BaseController {
                     zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
                 }
             }
-            zsyzSbbzb.setProgress("3");
+            zsyzSbbzb.setProgress(THR);
             zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
         }else if (TWO.equals(zpType)){
             //判断该项目是否已经被指派
@@ -127,6 +127,7 @@ public class ZsyzCommonController extends BaseController {
                 }
             }
             //指派给承接地
+            zsyzSbbzb.setProgress(FOR);
             zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
         }else if (THR.equals(zpType)){
             //两个都发先去发承接地,承接地发送成功再去发要素部门
@@ -151,6 +152,8 @@ public class ZsyzCommonController extends BaseController {
                     zsyzProjectDeptService.insertZsyzProjectDept(zsyzProjectDept);
                 }
             }
+            zsyzSbbzb.setProgress(FOR);
+            zsyzSbbzbService.updateZsyzSbbzbCjd(zsyzSbbzb);
         }
         return AjaxResult.success();
     }
@@ -161,7 +164,7 @@ public class ZsyzCommonController extends BaseController {
      */
     @PostMapping("/xszc")
     @PreAuthorize("@ss.hasPermi('projectV2:common:xszc')")
-    public AjaxResult xszc(ZsyzSbbzb zsyzSbbzb) {
+    public AjaxResult xszc(@RequestBody ZsyzSbbzb zsyzSbbzb) {
         return  toAjax(zsyzSbbzbService.updateZsyzSbbzbForZc(zsyzSbbzb));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -55,6 +55,19 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    /**
+     * 加载对应角色部门列表树
+     */
+    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
+    public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
+    {
+        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+        return ajax;
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzSbbzbMapper.xml

@@ -313,9 +313,11 @@
         s.strq, s.phone, s.zw, s.user_id, s.create_by, s.type, s.progress, s.dept_id, s.create_time, s.update_by,
         s.is_del, s.update_time, s.remark, s.cjd_id,
         s.cjd_name, s.is_meet, s.meet_remark,
-        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze, q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
+        q.id, q.xm_id, q.xmbh, q.xmmc, q.dfqyr, q.wfqyr, q.tbrq, q.qyrq,q.xytzely, q.xytze, q.swzj, q.gdzctze,
+        q.xmgjrxm,q.xmgjrzw,q.xmgjrsjh,
         q.xmszd, q.sshy, q.tzfs, q.jsfs, q.sfys, q.jsnr,
-        q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by, q.create_time,
+        q.zlcf,q.gdmj, q.zcqymc, q.zcrq, q.zczb, q.frdb, q.lxfs, q.jyfw, q.lxrq, q.nkgrq,q. path, q.create_by,
+        q.create_time,
         q.update_by, q.update_time, q.remark,
         k.id, k.xm_id, k.xmbh, k.xmmc, k.kgrq, k.njgrq, k.sscrq, k.ntcsj, k.rtsj, k.nrtsj, k.kggjrsjh, k.create_by,
         k.create_time, k.update_by,
@@ -760,8 +762,11 @@
     </update>
     <update id="updateZsyzSbbzbCjd" parameterType="ZsyzSbbzb">
         update zsyz_sbbzb
-        set cjd_id   = #{cjdId},
-            cjd_name = #{cjdName}
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="progress != null">progress = #{progress},</if>
+            <if test="cjdId != null">cjd_id = #{cjdId},</if>
+            <if test="cjdName != null">cjd_name = #{cjdName},</if>
+        </trim>
         where id = #{id}
     </update>
     <update id="updateZsyzSbbzbForZc" parameterType="ZsyzSbbzb">